Index: FPGA.c
===================================================================
diff -u -rad34e60dc683a40b5c47387c2a66017b06f9da31 -rf77e7c2b1dab61807f21f25c793afc063d43907c
--- FPGA.c	(.../FPGA.c)	(revision ad34e60dc683a40b5c47387c2a66017b06f9da31)
+++ FPGA.c	(.../FPGA.c)	(revision f77e7c2b1dab61807f21f25c793afc063d43907c)
@@ -27,7 +27,7 @@
 #include "FpgaTD.h"
 #endif
 #ifdef _DD_
-#include <FpgaDD.h>
+#include "FpgaDD.h"
 #endif
 #ifdef _RO_
 #include "FpgaRO.h"
Index: MessageSupport.c
===================================================================
diff -u -r9512aac6feeb1379d6d425361fa78d58f75c86f6 -rf77e7c2b1dab61807f21f25c793afc063d43907c
--- MessageSupport.c	(.../MessageSupport.c)	(revision 9512aac6feeb1379d6d425361fa78d58f75c86f6)
+++ MessageSupport.c	(.../MessageSupport.c)	(revision f77e7c2b1dab61807f21f25c793afc063d43907c)
@@ -15,7 +15,7 @@
 *
 ***************************************************************************/
 
-#include <App/Services/Messaging.h>
+#include "Messaging.h"
 #include "Utilities.h"
 
 /**
Index: SystemComm.c
===================================================================
diff -u -r36a1b6d023b48c376f6a244b1ba716e04faf1550 -rf77e7c2b1dab61807f21f25c793afc063d43907c
--- SystemComm.c	(.../SystemComm.c)	(revision 36a1b6d023b48c376f6a244b1ba716e04faf1550)
+++ SystemComm.c	(.../SystemComm.c)	(revision f77e7c2b1dab61807f21f25c793afc063d43907c)
@@ -14,16 +14,16 @@
 * @date    (original)  30-Jul-2024
 *
 ***************************************************************************/
-
-#include <App/Services/Messaging.h>
+
 #include <string.h>     // For memcpy()
 
 #include "can.h"
 #include "sci.h"
 #include "sys_dma.h"
 
 #include "Comm.h"
-#include "Interrupts.h"
+#include "Interrupts.h"
+#include "Messaging.h"
 #include "OperationModes.h"
 #include "SystemComm.h"
 #ifdef _TD_
Index: WatchdogMgmt.c
===================================================================
diff -u -r7370a0375ac4cfdcdbd9a5b2d1851bc12a05ab67 -rf77e7c2b1dab61807f21f25c793afc063d43907c
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 7370a0375ac4cfdcdbd9a5b2d1851bc12a05ab67)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f77e7c2b1dab61807f21f25c793afc063d43907c)
@@ -20,7 +20,7 @@
 #include "FpgaTD.h"
 #endif
 #ifdef _DD_
-#include <FpgaDD.h>
+#include "FpgaDD.h"
 #include "SafetyShutdown.h"
 #endif
 #ifdef _RO_