diff --git a/src/camera/drivers/test_utils/BUILD.gn b/src/camera/drivers/test_utils/BUILD.gn
index a830eda..a15975d 100644
--- a/src/camera/drivers/test_utils/BUILD.gn
+++ b/src/camera/drivers/test_utils/BUILD.gn
@@ -40,7 +40,7 @@
   ]
   public_deps = [
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/system/fidl/fuchsia-hardware-input",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
diff --git a/src/ui/input/bin/hid/BUILD.gn b/src/ui/input/bin/hid/BUILD.gn
index be249ea..2144692 100644
--- a/src/ui/input/bin/hid/BUILD.gn
+++ b/src/ui/input/bin/hid/BUILD.gn
@@ -28,9 +28,9 @@
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/fdio",
     "//zircon/public/lib/fzl",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/zx",
     "//zircon/system/fidl/fuchsia-hardware-input:llcpp",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
diff --git a/src/ui/input/drivers/hid-input-report/BUILD.gn b/src/ui/input/drivers/hid-input-report/BUILD.gn
index 7cf43e7..e156c06 100644
--- a/src/ui/input/drivers/hid-input-report/BUILD.gn
+++ b/src/ui/input/drivers/hid-input-report/BUILD.gn
@@ -19,9 +19,9 @@
     "//zircon/public/lib/ddktl",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/zx",
     "//zircon/system/fidl/fuchsia-hardware-input:c",
+    "//zircon/system/ulib/hid-parser",
   ]
   configs -= [ "//build/config/fuchsia:no_cpp_standard_library" ]
   configs += [ "//build/config/fuchsia:static_cpp_standard_library" ]
@@ -43,11 +43,11 @@
     "//zircon/public/lib/fake_ddk",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/sync",
     "//zircon/public/lib/zx",
     "//zircon/public/lib/zxtest",
     "//zircon/system/fidl/fuchsia-hardware-input:c",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   # TODO(46730): Fix the leaks and remove this.
diff --git a/src/ui/input/drivers/hid/BUILD.gn b/src/ui/input/drivers/hid/BUILD.gn
index b71635d..bcfd689 100644
--- a/src/ui/input/drivers/hid/BUILD.gn
+++ b/src/ui/input/drivers/hid/BUILD.gn
@@ -25,10 +25,10 @@
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/trace-driver",
     "//zircon/system/banjo/ddk.protocol.hidbus",
     "//zircon/system/fidl/fuchsia-hardware-input:llcpp",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
@@ -47,11 +47,11 @@
     "//zircon/public/lib/fake_ddk",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/trace-driver",
     "//zircon/public/lib/zxtest",
     "//zircon/system/banjo/ddk.protocol.hidbus",
     "//zircon/system/fidl/fuchsia-hardware-input:llcpp",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   # TODO(47416): Fix the leaks and remove this.
diff --git a/src/ui/input/drivers/virtio/BUILD.gn b/src/ui/input/drivers/virtio/BUILD.gn
index 31ff0b9..253f2d2 100644
--- a/src/ui/input/drivers/virtio/BUILD.gn
+++ b/src/ui/input/drivers/virtio/BUILD.gn
@@ -54,10 +54,10 @@
     "//zircon/public/lib/fake-bti",
     "//zircon/public/lib/fake_ddk",
     "//zircon/public/lib/fidl-async-cpp",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/unittest",
     "//zircon/public/lib/zxtest",
     "//zircon/system/fidl/fuchsia-hardware-pty:c",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   # TODO(47498): Fix the leaks and remove this.
diff --git a/src/ui/input/lib/hid-input-report/BUILD.gn b/src/ui/input/lib/hid-input-report/BUILD.gn
index 1e700e4..277d674 100644
--- a/src/ui/input/lib/hid-input-report/BUILD.gn
+++ b/src/ui/input/lib/hid-input-report/BUILD.gn
@@ -22,7 +22,7 @@
     "//src/ui/lib/key_util",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
@@ -52,10 +52,10 @@
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/hid",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/zxtest",
     "//zircon/public/lib/zxtest",
+    "//zircon/system/ulib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   # TODO(46730): Fix the leaks and remove this.
diff --git a/src/ui/lib/input_reader/BUILD.gn b/src/ui/lib/input_reader/BUILD.gn
index dab7256..5440a0a 100644
--- a/src/ui/lib/input_reader/BUILD.gn
+++ b/src/ui/lib/input_reader/BUILD.gn
@@ -16,8 +16,8 @@
     "//sdk/fidl/fuchsia.ui.scenic",
     "//zircon/public/lib/async-default",
     "//zircon/public/lib/fdio",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/trace",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   configs += [ "//src/ui/scenic/lib/gfx:swapchain" ]
@@ -47,9 +47,9 @@
     "//src/lib/fxl",
     "//zircon/public/lib/fdio",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/trace",
     "//zircon/system/fidl/fuchsia-hardware-input:fuchsia-hardware-input_llcpp",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   public_deps = [
@@ -96,8 +96,8 @@
     "//zircon/public/lib/fdio",
     "//zircon/public/lib/fit",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/zx",
     "//zircon/system/fidl/fuchsia-hardware-input:fuchsia-hardware-input_llcpp",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
diff --git a/src/ui/lib/input_reader/tests/BUILD.gn b/src/ui/lib/input_reader/tests/BUILD.gn
index 5b70c55d..9c742d2 100644
--- a/src/ui/lib/input_reader/tests/BUILD.gn
+++ b/src/ui/lib/input_reader/tests/BUILD.gn
@@ -53,7 +53,7 @@
     "//src/ui/lib/input_reader",
     "//src/ui/testing:mock_input_device",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
@@ -68,7 +68,7 @@
     "//sdk/fidl/fuchsia.ui.input",
     "//src/ui/testing:mock_input_device",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
@@ -82,7 +82,7 @@
 
   deps = [
     "//src/lib/fxl",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
@@ -100,7 +100,7 @@
 
   deps = [
     "//src/lib/fxl",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
@@ -122,7 +122,7 @@
     "//src/lib/fxl/test:gtest_main",
     "//src/ui/lib/input_reader",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   # TODO(46730): Fix the leaks and remove this.
diff --git a/src/ui/lib/input_report_reader/tests/BUILD.gn b/src/ui/lib/input_report_reader/tests/BUILD.gn
index ebecde4..1784f0e 100644
--- a/src/ui/lib/input_report_reader/tests/BUILD.gn
+++ b/src/ui/lib/input_report_reader/tests/BUILD.gn
@@ -40,7 +40,7 @@
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/fidl-async-cpp",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
@@ -52,7 +52,7 @@
 
   deps = [
     "//src/lib/fxl",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/zx",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
diff --git a/src/ui/lib/key_util/BUILD.gn b/src/ui/lib/key_util/BUILD.gn
index e6fba66..f6a8b4d 100644
--- a/src/ui/lib/key_util/BUILD.gn
+++ b/src/ui/lib/key_util/BUILD.gn
@@ -14,7 +14,7 @@
     "//sdk/fidl/fuchsia.ui.input",
     "//sdk/fidl/fuchsia.ui.input2",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
diff --git a/src/ui/tools/print-input-report/BUILD.gn b/src/ui/tools/print-input-report/BUILD.gn
index e1a4ac2..2ae8660 100644
--- a/src/ui/tools/print-input-report/BUILD.gn
+++ b/src/ui/tools/print-input-report/BUILD.gn
@@ -58,9 +58,9 @@
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/fidl-async-cpp",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/sync",
     "//zircon/public/lib/trace",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
diff --git a/zircon/system/core/pwrbtn-monitor/BUILD.gn b/zircon/system/core/pwrbtn-monitor/BUILD.gn
index b4cf20b..8e969b5 100644
--- a/zircon/system/core/pwrbtn-monitor/BUILD.gn
+++ b/zircon/system/core/pwrbtn-monitor/BUILD.gn
@@ -31,9 +31,9 @@
     "//zircon/public/lib/fdio",
     "//zircon/public/lib/fdio-caller",
     "//zircon/public/lib/fzl",
-    "//zircon/public/lib/hid-parser",
     "//zircon/system/fidl/fuchsia-device-manager:c",
     "//zircon/system/fidl/fuchsia-hardware-input:llcpp",
+    "//zircon/system/ulib/hid-parser",
   ]
 }
 
diff --git a/zircon/system/dev/board/x86/BUILD.gn b/zircon/system/dev/board/x86/BUILD.gn
index 49e309e..2fb8436 100644
--- a/zircon/system/dev/board/x86/BUILD.gn
+++ b/zircon/system/dev/board/x86/BUILD.gn
@@ -380,12 +380,12 @@
     "//zircon/public/lib/fake_ddk",
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/sync",
     "//zircon/public/lib/zircon-internal",
     "//zircon/public/lib/zxtest",
     "//zircon/system/banjo/ddk.protocol.hidbus",
     "//zircon/system/dev/lib/mock-hidbus-ifc",
+    "//zircon/system/ulib/hid-parser",
     "//zircon/third_party/ulib/chromiumos-platform-ec",
   ]
 }
diff --git a/zircon/system/ulib/BUILD.gn b/zircon/system/ulib/BUILD.gn
index 7225e0b..8b82330 100644
--- a/zircon/system/ulib/BUILD.gn
+++ b/zircon/system/ulib/BUILD.gn
@@ -251,7 +251,6 @@
     "hid",
 #------------------
 #------------------
-    "hid-parser",
 #------------------
 #------------------
     "hwreg",
diff --git a/zircon/system/ulib/hid-parser/BUILD.gn b/zircon/system/ulib/hid-parser/BUILD.gn
index 42d6cc7..eceba12 100644
--- a/zircon/system/ulib/hid-parser/BUILD.gn
+++ b/zircon/system/ulib/hid-parser/BUILD.gn
@@ -2,6 +2,18 @@
 # 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 fxb/36548.                         #
+##########################################
+
+assert(!defined(zx) || zx != "/",
+       "This file can only be used in the Fuchsia GN build.")
+
+import("//build/unification/zx_library.gni")
+
 zx_library("hid-parser") {
   sdk = "static"
   sdk_headers = [
@@ -17,8 +29,5 @@
     "report.cc",
     "units.cc",
   ]
-  deps = [
-    "$zx/system/ulib/fbl",
-    "$zx/system/ulib/zircon",
-  ]
+  deps = [ "//zircon/public/lib/fbl" ]
 }
diff --git a/zircon/system/ulib/hid-parser/test/BUILD.gn b/zircon/system/ulib/hid-parser/test/BUILD.gn
index 5013482..96cba10 100644
--- a/zircon/system/ulib/hid-parser/test/BUILD.gn
+++ b/zircon/system/ulib/hid-parser/test/BUILD.gn
@@ -38,8 +38,8 @@
     "//zircon/public/lib/fbl",
     "//zircon/public/lib/fdio",
     "//zircon/public/lib/hid",
-    "//zircon/public/lib/hid-parser",
     "//zircon/public/lib/zxtest",
+    "//zircon/system/ulib/hid-parser",
   ]
 
   # TODO(47348): Fix the leaks and remove this.
@@ -50,7 +50,7 @@
   sources = [ "hid-parser-fuzztest.cc" ]
   deps = [
     "//zircon/public/lib/fbl",
-    "//zircon/public/lib/hid-parser",
+    "//zircon/system/ulib/hid-parser",
   ]
 }