Index: WatchdogMgmt.c
===================================================================
diff -u -r4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7 -rcc8db062292cdcbdb29e4174af5976ccf150d0c0
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision cc8db062292cdcbdb29e4174af5976ccf150d0c0)
@@ -18,18 +18,20 @@
 #ifdef _TD_
 #include "CpldInterface.h"
 #include "FpgaTD.h"
+#include "OperationModes.h"
 #endif
 #ifdef _DD_
 #include "FpgaDD.h"
 #include "SafetyShutdown.h"
+#include "OperationModes.h"
 #endif
 #ifdef _RO_
-#include "FpgaRO.h"
+#include "FpgaFP.h"
 #include "SafetyShutdown.h"
+#include "FPOperationModes.h"
 #endif
 //#include "InternalADC.h"
 #include "Messaging.h"
-#include "OperationModes.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"
 
@@ -153,7 +155,7 @@
 #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 ) )
+    if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != FP_MODE_INIT ) )
 #endif
     {
         if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) )