diff --git a/docs/concepts/filesystems/zxcrypt.md b/docs/concepts/filesystems/zxcrypt.md
index fe14f80..fe26a22 100644
--- a/docs/concepts/filesystems/zxcrypt.md
+++ b/docs/concepts/filesystems/zxcrypt.md
@@ -45,9 +45,9 @@
 
 ## Technical Details
 ### DDKTL Driver
-zxcrypt is written as a DDKTL device driver.  [ulib/ddktl](/src/lib/ddktl) is a C++ framework
+zxcrypt is written as a DDKTL device driver.  [src/lib/ddktl](/src/lib/ddktl) is a C++ framework
 for writing drivers in Fuchsia.  It allows authors to automatically supply the
-[ulib/ddk](/src/lib/ddk) function pointers and callbacks by using templatized mix-ins.  In the
+[src/lib/ddk](/src/lib/ddk) function pointers and callbacks by using templatized mix-ins.  In the
 case of zxcrypt, the [device](/src/devices/block/drivers/zxcrypt/device.h) is "Messageable",
 "IotxnQueueable", "GetSizable", "UnbindableDeprecated", and implements the methods listed in DDKTL's
 [BlockProtocol](/sdk/banjo/ddk.protocol.block/block.banjo).
diff --git a/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn b/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn
index 95f568a..7e028ab 100644
--- a/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/vendor/broadcom/BUILD.gn
@@ -28,9 +28,9 @@
     "//sdk/banjo/ddk.protocol.serialimpl.async",
     "//sdk/fidl/fuchsia.hardware.bluetooth:fuchsia.hardware.bluetooth_c",
     "//src/devices/lib/driver",
+    "//src/lib/ddk",
     "//zircon/public/lib/fidl",
     "//zircon/public/lib/sync",
-    "//zircon/system/ulib/ddk",
 
     # TODO(fxb/38132): Migrate to the new bind rules and delete the below
     "//src/lib/ddk:ddk-deprecated-binding-headers",
@@ -59,14 +59,14 @@
     "//src/devices/bus/lib/device-protocol-pdev",
     "//src/devices/bus/testing/mock-sdio",
     "//src/devices/testing/fake_ddk",
+    "//src/lib/ddk",
+    "//src/lib/ddktl",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/mock-function",
     "//zircon/public/lib/sync",
     "//zircon/public/lib/zircon-internal",
     "//zircon/public/lib/zx",
     "//zircon/public/lib/zxtest",
-    "//zircon/system/ulib/ddk",
-    "//zircon/system/ulib/ddktl",
     "//zircon/system/ulib/fzl",
   ]
 
diff --git a/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn b/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn
index 308fc98..5962b8f 100644
--- a/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn
+++ b/src/connectivity/bluetooth/hci/vendor/mediatek/BUILD.gn
@@ -34,12 +34,12 @@
     "//sdk/banjo/ddk.protocol.sdio",
     "//src/devices/bus/lib/device-protocol-pdev",
     "//src/devices/lib/driver",
+    "//src/lib/ddk",
+    "//src/lib/ddktl",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/sync",
     "//zircon/public/lib/zircon-internal",
     "//zircon/public/lib/zx",
-    "//zircon/system/ulib/ddk",
-    "//zircon/system/ulib/ddktl",
     "//zircon/system/ulib/fzl",
 
     # TODO(fxb/38132): Migrate to the new bind rules and delete the below
@@ -67,14 +67,14 @@
     "//src/devices/bus/lib/device-protocol-pdev",
     "//src/devices/bus/testing/mock-sdio",
     "//src/devices/testing/fake_ddk",
+    "//src/lib/ddk",
+    "//src/lib/ddktl",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/mock-function",
     "//zircon/public/lib/sync",
     "//zircon/public/lib/zircon-internal",
     "//zircon/public/lib/zx",
     "//zircon/public/lib/zxtest",
-    "//zircon/system/ulib/ddk",
-    "//zircon/system/ulib/ddktl",
     "//zircon/system/ulib/fzl",
 
     # TODO(fxb/38132): Migrate to the new bind rules and delete the below
diff --git a/src/connectivity/network/drivers/network-device/ddk_source_split.gni b/src/connectivity/network/drivers/network-device/ddk_source_split.gni
index 12301df..75d02d6 100644
--- a/src/connectivity/network/drivers/network-device/ddk_source_split.gni
+++ b/src/connectivity/network/drivers/network-device/ddk_source_split.gni
@@ -28,8 +28,8 @@
     }
     defines += [ "NETDEV_DDK" ]
     public_deps += [
-      "//zircon/system/ulib/ddk",
-      "//zircon/system/ulib/ddktl",
+      "//src/lib/ddk",
+      "//src/lib/ddktl",
     ]
   }
 
diff --git a/src/graphics/lib/magma/src/magma_util/platform/zircon/BUILD.gn b/src/graphics/lib/magma/src/magma_util/platform/zircon/BUILD.gn
index 650001e..5e682af 100644
--- a/src/graphics/lib/magma/src/magma_util/platform/zircon/BUILD.gn
+++ b/src/graphics/lib/magma/src/magma_util/platform/zircon/BUILD.gn
@@ -41,9 +41,9 @@
   deps = [
     "$magma_build_root/src/magma_util:macros",
     "$magma_build_root/src/magma_util/platform:trace",
-    "$zircon_build_root/system/ulib/ddk",
     "..:logger",
     "..:object",
+    "//src/lib/ddk",
   ]
 }
 
@@ -286,7 +286,7 @@
 
   sources = [ "zircon_platform_logger_ddk.cc" ]
 
-  deps = [ "$zircon_build_root/system/ulib/ddk" ]
+  deps = [ "//src/lib/ddk" ]
 }
 
 source_set("object") {
diff --git a/src/graphics/lib/magma/src/magma_util/platform/zircon/driver_entry.gni b/src/graphics/lib/magma/src/magma_util/platform/zircon/driver_entry.gni
index 7c1f0f4..c793891 100644
--- a/src/graphics/lib/magma/src/magma_util/platform/zircon/driver_entry.gni
+++ b/src/graphics/lib/magma/src/magma_util/platform/zircon/driver_entry.gni
@@ -22,7 +22,7 @@
       deps = []
     }
 
-    deps += [ "//zircon/system/ulib/ddk" ]
+    deps += [ "//src/lib/ddk" ]
 
     if (test_entry) {
       deps += [
@@ -64,7 +64,7 @@
     }
 
     deps += [
-      "//zircon/system/ulib/ddk",
+      "//src/lib/ddk",
 
       # TODO(fxb/38132): Migrate to the new bind rules and delete the below
       "//src/lib/ddk:ddk-deprecated-binding-headers",
diff --git a/src/graphics/lib/magma/src/tools/BUILD.gn b/src/graphics/lib/magma/src/tools/BUILD.gn
index a2aa523..1482065 100644
--- a/src/graphics/lib/magma/src/tools/BUILD.gn
+++ b/src/graphics/lib/magma/src/tools/BUILD.gn
@@ -13,10 +13,10 @@
 
   deps = [
     "$magma_build_root/include:magma_abi",
-    "$zircon_build_root/system/ulib/ddk",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_llcpp",
     "//sdk/lib/fdio",
     "//src/devices/lib/driver",
+    "//src/lib/ddk",
     "//src/lib/fxl",
     "//src/zircon/lib/zircon",
   ]
diff --git a/zircon/system/ulib/ddk/BUILD.gn b/zircon/system/ulib/ddk/BUILD.gn
deleted file mode 100644
index 503ecc0..0000000
--- a/zircon/system/ulib/ddk/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-##########################################
-# Though under //zircon, this build file #
-# is meant to be used in the Fuchsia GN  #
-# build.                                 #
-# See fxbug.dev/36548.                   #
-##########################################
-
-group("ddk") {
-  public_deps = [ "//src/lib/ddk" ]
-}
diff --git a/zircon/system/ulib/ddktl/BUILD.gn b/zircon/system/ulib/ddktl/BUILD.gn
deleted file mode 100644
index fe39ecb..0000000
--- a/zircon/system/ulib/ddktl/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2020 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-##########################################
-# Though under //zircon, this build file #
-# is meant to be used in the Fuchsia GN  #
-# build.                                 #
-# See fxbug.dev/36548.                   #
-##########################################
-
-group("ddktl") {
-  public_deps = [ "//src/lib/ddktl" ]
-}
diff --git a/zircon/system/utest/bad-kernel-access/BUILD.zircon.gn b/zircon/system/utest/bad-kernel-access/BUILD.zircon.gn
index 0a94289..1e16f17 100644
--- a/zircon/system/utest/bad-kernel-access/BUILD.zircon.gn
+++ b/zircon/system/utest/bad-kernel-access/BUILD.zircon.gn
@@ -5,7 +5,6 @@
 zx_test("bad-kernel-access") {
   sources = [ "bad-kernel-access.c" ]
   deps = [
-    "$zx/system/ulib/ddk",
     "$zx/system/ulib/fdio",
     "$zx/system/ulib/zircon",
   ]
diff --git a/zircon/system/utest/bad-kernel-access/bad-kernel-access.c b/zircon/system/utest/bad-kernel-access/bad-kernel-access.c
index 2385722..98fbadf 100644
--- a/zircon/system/utest/bad-kernel-access/bad-kernel-access.c
+++ b/zircon/system/utest/bad-kernel-access/bad-kernel-access.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zircon/syscalls-ddk.h>
 #include <zircon/syscalls.h>
 
 static int val = 5;