diff --git a/build/BUILD.ada-url b/build/BUILD.ada-url
index f49fa4073e7..9ffc4c61883 100644
--- a/build/BUILD.ada-url
+++ b/build/BUILD.ada-url
@@ -1,12 +1,9 @@
-
 cc_library(
     name = "ada-url",
-    hdrs = ["ada.h", "ada_c.h"],
     srcs = ["ada.cpp"],
+    hdrs = [
+        "ada.h",
+        "ada_c.h",
+    ],
     visibility = ["//visibility:public"],
-    include_prefix = ".",
-    copts = ["-w"],
-    defines = [
-      "ADA_SSE2=1"
-    ]
 )
diff --git a/src/workerd/api/BUILD.bazel b/src/workerd/api/BUILD.bazel
index 1263c790cbf..86a1d6f2474 100644
--- a/src/workerd/api/BUILD.bazel
+++ b/src/workerd/api/BUILD.bazel
@@ -61,15 +61,17 @@ wd_cc_library(
     name = "rtti",
     srcs = ["rtti.c++"],
     hdrs = [
-        "rtti.h",
         "modules.h",
+        "rtti.h",
         "//src/pyodide:generated/pyodide_extra.capnp.h"
     ],
     visibility = ["//visibility:public"],
     deps = [
         ":html-rewriter",
-        "//src/workerd/io",
+        "//src/pyodide",
         "//src/pyodide:pyodide_extra_capnp",
+        "//src/workerd/io",
+        "//src/workerd/jsg:rtti",
     ],
 )
 
@@ -79,22 +81,27 @@ wd_cc_library(
     name = "html-rewriter",
     srcs = ["html-rewriter.c++"],
     hdrs = ["html-rewriter.h"],
+    implementation_deps = [
+        "@com_cloudflare_lol_html//:lolhtml",
+    ],
     visibility = ["//visibility:public"],
     deps = [
         "//src/workerd/io",
-        "@com_cloudflare_lol_html//:lolhtml",
     ],
 )
 
 wd_cc_library(
     name = "pyodide",
     srcs = ["pyodide.c++"],
-    hdrs = ["pyodide.h", "//src/pyodide:generated/pyodide_extra.capnp.h"],
+    hdrs = [
+        "pyodide.h",
+        "//src/pyodide:generated/pyodide_extra.capnp.h",
+    ],
     visibility = ["//visibility:public"],
     deps = [
-        "//src/workerd/server:workerd_capnp",
-        "//src/pyodide:pyodide",
+        "//src/pyodide",
         "//src/pyodide:pyodide_extra_capnp",
+        "//src/workerd/server:workerd_capnp",
     ],
 )
 
@@ -130,7 +137,7 @@ kj_test(
     deps = [
         "//src/workerd/io",
         "//src/workerd/tests:test-fixture",
-    ]
+    ],
 )
 
 kj_test(
@@ -159,5 +166,3 @@ kj_test(
 ) for f in glob(
     ["**/*.wd-test"],
 )]
-
-
diff --git a/src/workerd/io/BUILD.bazel b/src/workerd/io/BUILD.bazel
index 7c02e3fb143..dce0c6581e4 100644
--- a/src/workerd/io/BUILD.bazel
+++ b/src/workerd/io/BUILD.bazel
@@ -55,6 +55,10 @@ wd_cc_library(
         ":set_enable_experimental_webgpu": ["WORKERD_EXPERIMENTAL_ENABLE_WEBGPU"],
         "//conditions:default": [],
     }),
+    implementation_deps = [
+        "@capnp-cpp//src/kj/compat:kj-brotli",
+        "@capnp-cpp//src/kj/compat:kj-gzip",
+    ],
     visibility = ["//visibility:public"],
     deps = [
         ":capnp",
@@ -63,18 +67,13 @@ wd_cc_library(
         ":worker-interface",
         "//src/cloudflare",
         "//src/node",
-        "//src/pyodide",
-        "//src/pyodide:pyodide_extra_capnp",
         "//src/workerd/api:analytics-engine_capnp",
         "//src/workerd/api:r2-api_capnp",
         "//src/workerd/jsg",
-        "//src/workerd/jsg:rtti",
         "//src/workerd/util:sqlite",
         "@capnp-cpp//src/capnp:capnp-rpc",
         "@capnp-cpp//src/capnp/compat:http-over-capnp",
         "@capnp-cpp//src/kj:kj-async",
-        "@capnp-cpp//src/kj/compat:kj-brotli",
-        "@capnp-cpp//src/kj/compat:kj-gzip",
     ] + select({
         ":set_enable_experimental_webgpu": ["@dawn"],
         "//conditions:default": [],
@@ -88,8 +87,8 @@ wd_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":capnp",
-        "//src/workerd/util:perfetto",
         "//src/workerd/util:own-util",
+        "//src/workerd/util:perfetto",
         "//src/workerd/util:thread-scopes",
         "@capnp-cpp//src/kj:kj-async",
         "@capnp-cpp//src/kj/compat:kj-http",
@@ -109,7 +108,7 @@ wd_cc_library(
 wd_cc_library(
     name = "limit-enforcer",
     hdrs = ["limit-enforcer.h"],
-    visibility = ["//visibility:public"]
+    visibility = ["//visibility:public"],
 )
 
 wd_cc_library(
diff --git a/src/workerd/jsg/url.c++ b/src/workerd/jsg/url.c++
index e331346de31..587ce2788e5 100644
--- a/src/workerd/jsg/url.c++
+++ b/src/workerd/jsg/url.c++
@@ -2,7 +2,7 @@
 #include <kj/hash.h>
 
 extern "C" {
-  #include <ada_c.h>
+  #include "ada_c.h"
 }
 
 #include <kj/debug.h>
diff --git a/src/workerd/util/BUILD.bazel b/src/workerd/util/BUILD.bazel
index 23e42438245..35268dd595d 100644
--- a/src/workerd/util/BUILD.bazel
+++ b/src/workerd/util/BUILD.bazel
@@ -61,11 +61,13 @@ wd_cc_library(
         "sqlite.h",
         "sqlite-kv.h",
     ],
+    implementation_deps = [
+        "@sqlite3",
+    ],
     visibility = ["//visibility:public"],
     deps = [
-        "@capnp-cpp//src/kj:kj-async",
-        "@sqlite3",
         "//src/workerd/util:sentry",
+        "@capnp-cpp//src/kj:kj-async",
     ],
 )