diff --git a/applications/rpc/BUILD.gn b/applications/rpc/BUILD.gn
index ecdcc1a..ba221b8 100644
--- a/applications/rpc/BUILD.gn
+++ b/applications/rpc/BUILD.gn
@@ -35,7 +35,8 @@
     dir_pw_span,
 
     # RPC related dependencies.
-    "$dir_pw_hdlc:pw_rpc",
+    "$dir_pw_hdlc",
+    "$dir_pw_hdlc:default_addresses",
     "$dir_pw_hdlc:rpc_channel_output",
     "$dir_pw_rpc:server",
     "$dir_pw_stream:sys_io_stream",
diff --git a/applications/rpc/main.cc b/applications/rpc/main.cc
index b55553c..2064349 100644
--- a/applications/rpc/main.cc
+++ b/applications/rpc/main.cc
@@ -16,9 +16,10 @@
 #include <string_view>
 
 #include "pw_board_led/led.h"
+#include "pw_hdlc/decoder.h"
+#include "pw_hdlc/default_addresses.h"
 #include "pw_hdlc/encoder.h"
 #include "pw_hdlc/rpc_channel.h"
-#include "pw_hdlc/rpc_packets.h"
 #include "pw_log/log.h"
 #include "pw_rpc/echo_service_nanopb.h"
 #include "pw_rpc/server.h"