diff --git a/config/nxp/lib/pw_rpc/BUILD.gn b/config/nxp/lib/pw_rpc/BUILD.gn
index 05962da9299912..e8dc620d233dfb 100644
--- a/config/nxp/lib/pw_rpc/BUILD.gn
+++ b/config/nxp/lib/pw_rpc/BUILD.gn
@@ -24,7 +24,6 @@ static_library("pw_rpc") {
     "$dir_pw_rpc:server",
     "$dir_pw_rpc/nanopb:echo_service",
     "${chip_root}/examples/platform/nxp/pw_sys_io:pw_sys_io_nxp",
-    "${dir_pigweed}/pw_hdlc:pw_rpc",
     dir_pw_assert,
     dir_pw_hdlc,
     dir_pw_log,
diff --git a/examples/platform/nxp/Rpc.cpp b/examples/platform/nxp/Rpc.cpp
index d9bf744382627c..262825386ed13c 100644
--- a/examples/platform/nxp/Rpc.cpp
+++ b/examples/platform/nxp/Rpc.cpp
@@ -66,7 +66,7 @@ class NxpButton final : public Button
 class NxpDevice final : public Device
 {
 public:
-    pw::Status Reboot(const pw_protobuf_Empty & request, pw_protobuf_Empty & response) override
+    pw::Status Reboot(const chip_rpc_RebootRequest & request, pw_protobuf_Empty & response) override
     {
         mRebootTimer = xTimerCreate("Reboot", kRebootTimerPeriodTicks, false, nullptr, RebootHandler);
         xTimerStart(mRebootTimer, pdMS_TO_TICKS(0));
diff --git a/examples/platform/nxp/pw_sys_io/BUILD.gn b/examples/platform/nxp/pw_sys_io/BUILD.gn
index ed3d35246093f1..a46ce9d4e4add4 100644
--- a/examples/platform/nxp/pw_sys_io/BUILD.gn
+++ b/examples/platform/nxp/pw_sys_io/BUILD.gn
@@ -27,15 +27,12 @@ config("default_config") {
 }
 
 pw_source_set("pw_sys_io_nxp") {
-  sources = [
-    "${chip_root}/src/lib/shell/streamer_nxp.cpp",
-    "sys_io_nxp.cc",
-  ]
+  sources = [ "sys_io_nxp.cc" ]
 
   deps = [
     "$dir_pw_sys_io:default_putget_bytes",
     "$dir_pw_sys_io:facade",
-    "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_sdk",
+    "${chip_root}/src/lib/shell:shell",
   ]
 
   public_configs = [ ":default_config" ]