diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0c009c5..b218d82c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,10 +205,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	set(COMPILER_FLAGS "/permissive-")
 endif()
 
-if (TGT_BSP MATCHES "arm/q7s")
-	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -lxiphos)
-endif()
-
 if (NOT(TGT_BSP MATCHES "arm/te0720-1cfa"))
 # Not installed, so use FetchContent to download and provide Catch2
 if(NOT Catch2_FOUND)
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 240a4490..5e4c4fb5 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -13,12 +13,12 @@
 #include "bsp_q7s/callbacks/pcduSwitchCb.h"
 #include "bsp_q7s/callbacks/rwSpiCallback.h"
 #include "bsp_q7s/core/CoreController.h"
-#include "bsp_q7s/devices/ploc/PlocMemoryDumper.h"
-#include "bsp_q7s/devices/ploc/PlocSupervisorHandler.h"
-#include "bsp_q7s/devices/ploc/PlocUpdater.h"
-#include "bsp_q7s/devices/ploc/PlocMPSoCHandler.h"
-#include "bsp_q7s/devices/ploc/PlocMPSoCHelper.h"
-#include "bsp_q7s/devices/devicedefinitions/PlocMPSoCDefinitions.h"
+#include "linux/devices/ploc/PlocMemoryDumper.h"
+#include "linux/devices/ploc/PlocSupervisorHandler.h"
+#include "linux/devices/ploc/PlocUpdater.h"
+#include "linux/devices/ploc/PlocMPSoCHandler.h"
+#include "linux/devices/ploc/PlocMPSoCHelper.h"
+#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
 #include "bsp_q7s/memory/FileSystemHandler.h"
 #include "busConf.h"
 #include "ccsdsConfig.h"
diff --git a/cmake/Zynq7020CrossCompileConfig.cmake b/cmake/Zynq7020CrossCompileConfig.cmake
index 8d3dab7e..be6702a1 100644
--- a/cmake/Zynq7020CrossCompileConfig.cmake
+++ b/cmake/Zynq7020CrossCompileConfig.cmake
@@ -89,6 +89,10 @@ set(C_FLAGS
     -lgpiod
 )
 
+if (TGT_BSP MATCHES "arm/q7s")
+	set(C_FLAGS ${C_FLAGS} -lxiphos)
+endif()
+
 string (REPLACE ";" " " C_FLAGS "${C_FLAGS}")
 
 set(CMAKE_C_FLAGS