4 files changed, 8 insertions, 4 deletions
diff --git a/firmware/usrp3/lib/CMakeLists.txt b/firmware/usrp3/lib/CMakeLists.txt
index 9d9ee3c6c..cd1a82c3f 100644
--- a/firmware/usrp3/lib/CMakeLists.txt
+++ b/firmware/usrp3/lib/CMakeLists.txt
@@ -30,7 +30,6 @@ add_library(usrp3fw STATIC
     print_addrs.c
     link_state_route_proto.c
     cron.c
-    fw_comm_protocol.c
     flash/spi_flash.c
     flash/spif_spsn_s25flxx.c
 )
diff --git a/firmware/usrp3/n230/CMakeLists.txt b/firmware/usrp3/n230/CMakeLists.txt
index 6247477f0..5787fbb7d 100644
--- a/firmware/usrp3/n230/CMakeLists.txt
+++ b/firmware/usrp3/n230/CMakeLists.txt
@@ -19,7 +19,12 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/../../host/lib/usrp/n230)
 
-list(APPEND n230_sources n230_eeprom.c n230_eth_handlers.c n230_init.c n230_main.c)
+list(APPEND n230_sources
+    n230_eeprom.c
+    n230_fw_comm_protocol.c
+    n230_eth_handlers.c
+    n230_init.c
+    n230_main.c)
 
 ########################################################################
 set(GEN_OUTPUTS_BIN_SIZE 0x7fff)
diff --git a/firmware/usrp3/n230/n230_eth_handlers.c b/firmware/usrp3/n230/n230_eth_handlers.c
index b291bb39f..f5c319681 100644
--- a/firmware/usrp3/n230/n230_eth_handlers.c
+++ b/firmware/usrp3/n230/n230_eth_handlers.c
@@ -22,7 +22,7 @@
 #include <u3_net_stack.h>
 #include <print_addrs.h>
 #include <trace.h>
-#include "../../../host/lib/usrp/common/fw_comm_protocol.h"
+#include "../../../host/lib/usrp/n230/n230_fw_comm_protocol.h"
 #include "../../../host/lib/usrp/n230/n230_fw_defs.h"
 #include "../n230/n230_fw_host_iface.h"
 #include "../../../host/lib/usrp/n230/n230_eeprom.h"
diff --git a/firmware/usrp3/lib/fw_comm_protocol.c b/firmware/usrp3/n230/n230_fw_comm_protocol.c
index 0cc931a76..d6f6dff5a 100644
--- a/firmware/usrp3/lib/fw_comm_protocol.c
+++ b/firmware/usrp3/n230/n230_fw_comm_protocol.c
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include "../../../host/lib/usrp/common/fw_comm_protocol.h"
+#include "../../../host/lib/usrp/n230/n230_fw_comm_protocol.h"
 
 #include <trace.h>
 #include <string.h> //memcmp