Index: CommBuffers.h
===================================================================
diff -u -r423aa34698d30a44e3b12b74e4243c3a8b5821de -r3ca022103ce50b39e5d805b7577c7f360730412d
--- CommBuffers.h	(.../CommBuffers.h)	(revision 423aa34698d30a44e3b12b74e4243c3a8b5821de)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
@@ -49,8 +49,6 @@
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages
 #endif
 #ifdef _DD_
-typedef enum Comm_Buffers
-{
     COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages
     COMM_BUFFER_OUT_CAN_DD_ALARM,                          ///< Buffer for outgoing DD alarm messages
     COMM_BUFFER_IN_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
@@ -63,7 +61,6 @@
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,                      ///< Buffer for outgoing DD broadcast messages
     COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages
-} COMM_BUFFER_T;
 #endif
 #ifdef _RO_
     // TODO - Dara to populate
Index: FPGA.c
===================================================================
diff -u -r09c50d9ad4a2743520c3fe6a213663d4fb54b27f -r3ca022103ce50b39e5d805b7577c7f360730412d
--- FPGA.c	(.../FPGA.c)	(revision 09c50d9ad4a2743520c3fe6a213663d4fb54b27f)
+++ FPGA.c	(.../FPGA.c)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
@@ -27,7 +27,7 @@
 #include "FpgaTD.h"
 #endif
 #ifdef _DD_
-#include "FPGADD.h"
+#include "FpgaDD.h"
 #endif
 #ifdef _RO_
 #include "FpgaRO.h"
Index: PressureCommon.h
===================================================================
diff -u -ra6e50d961f79536e62469297ce39f3fb258a25e1 -r3ca022103ce50b39e5d805b7577c7f360730412d
--- PressureCommon.h	(.../PressureCommon.h)	(revision a6e50d961f79536e62469297ce39f3fb258a25e1)
+++ PressureCommon.h	(.../PressureCommon.h)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
@@ -17,9 +17,17 @@
 
 #ifndef __PRESSURE_COMMON_H__
 #define __PRESSURE_COMMON_H__
+
+#ifdef _TD_
+#include "TDCommon.h"
+#endif
+#ifdef _DD_
+#include "DDCommon.h"
+#endif
+#ifdef _RO_
+#include "ROCommon.h"
+#endif
 
-#include "TDCommon.h"
-
 /**
  *  @defgroup PressureCommon PressureCommon
  *  @brief The Pressure Sensor unit provides common conversion functions for
Index: SystemComm.c
===================================================================
diff -u -r227aeae11fc50b8128ff937c37a908d1e7d183ec -r3ca022103ce50b39e5d805b7577c7f360730412d
--- SystemComm.c	(.../SystemComm.c)	(revision 227aeae11fc50b8128ff937c37a908d1e7d183ec)
+++ SystemComm.c	(.../SystemComm.c)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
@@ -14,16 +14,16 @@
 * @date    (original)  30-Jul-2024
 *
 ***************************************************************************/
-
+
 #include <string.h>     // For memcpy()
 
 #include "can.h"
 #include "sci.h"
 #include "sys_dma.h"
 
 #include "Comm.h"
-#include "Interrupts.h"
-#include "Messaging.h"
+#include "Interrupts.h"
+#include "Messaging.h"
 #include "OperationModes.h"
 #include "SystemComm.h"
 #ifdef _TD_
Index: WatchdogMgmt.c
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -r3ca022103ce50b39e5d805b7577c7f360730412d
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
@@ -20,7 +20,7 @@
 #include "FpgaTD.h"
 #endif
 #ifdef _DD_
-#include "FPGADD.h"
+#include "FpgaDD.h"
 #include "SafetyShutdown.h"
 #endif
 #ifdef _RO_
@@ -110,6 +110,8 @@
  * @details \b Inputs: watchdogTaskCheckedIn[]
  * @details \b Outputs: watchdogTaskCheckedIn[]
  * @details \b Alarm: ALARM_ID_XX_WATCHDOG_EXPIRED if safety activated
+ * @warning: It may be necessary to comment out the alarm activation lines to
+ * prevent the  alarm occurring while debugging.
  * @return none
  *************************************************************************/
 void execWatchdogMgmt( void )
@@ -143,15 +145,14 @@
 #ifdef _DD_
     // Check to see if watchdog has expired or safety shutdown feedback does not match s/w command (only after POST completed)
     if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != DD_MODE_INIT ) )
+#endif
+#ifdef _RO_
+    // Check to see if watchdog has expired or safety shutdown feedback does not match s/w command (only after POST completed)
+    if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != RO_MODE_INIT ) )
 #endif
     {
         if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) )
         {
-            /* DEBUG WARNING
-             * It may be necessary to comment out the following
-             * line to prevent the  alarm from occurring while
-             * debugging.
-             */
 #ifdef _TD_
             activateAlarmNoData( ALARM_ID_TD_WATCHDOG_EXPIRED );
 #endif