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