Index: WatchdogMgmt.c
===================================================================
diff -u -r3ca022103ce50b39e5d805b7577c7f360730412d -rb16fb44ffe64e6ceb3e182d11485c3bb75dbad8f
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b16fb44ffe64e6ceb3e182d11485c3bb75dbad8f)
@@ -24,7 +24,8 @@
 #include "SafetyShutdown.h"
 #endif
 #ifdef _RO_
-#include "FpgaRo.h"
+#include "FpgaRO.h"
+#include "SafetyShutdown.h"
 #endif
 //#include "InternalADC.h"
 #include "Messaging.h"
@@ -124,6 +125,10 @@
 // TODO : clean up once we get the clarity
     PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
 #endif
+#ifdef _RO_
+// TODO : clean up once we get the clarity
+    PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
+#endif
     PIN_SIGNAL_STATE_T safetyShutdownSoftwareCmd    = ( TRUE == isSafetyShutdownActivated() ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH );
 
     // Called by background task, so give bg task credit for checking in
@@ -148,7 +153,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() != MODE_INIT ) )
 #endif
     {
         if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) )