Index: AlarmMgmt.c
===================================================================
diff -u -r15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088 -r4997cacd5a1501b7da1c8a3ba71f9594ad23a603
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4997cacd5a1501b7da1c8a3ba71f9594ad23a603)
@@ -83,13 +83,13 @@
     else
     {
 #ifdef _TD_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
 #ifdef _DD_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
 #ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
     }
 
Index: Utilities.h
===================================================================
diff -u -r26199e36a0c7140d88b44aa54f3e18d27d601456 -r4997cacd5a1501b7da1c8a3ba71f9594ad23a603
--- Utilities.h	(.../Utilities.h)	(revision 26199e36a0c7140d88b44aa54f3e18d27d601456)
+++ Utilities.h	(.../Utilities.h)	(revision 4997cacd5a1501b7da1c8a3ba71f9594ad23a603)
@@ -114,6 +114,8 @@
 U08 crc8( const U08 *address, U32 len );
 U08 crc4( U16* buffer, U32 byteCount );
 
+S16 signExtend16( U16 value, U32 signBit );
+
 U32 u32DiffWithWrap( U32 start, U32 end );
 S32 u32BiDiffWithWrap( U32 start, U32 end );
 U16 u16DiffWithWrap( U16 start, U16 end );
Index: WatchdogMgmt.c
===================================================================
diff -u -r15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088 -r4997cacd5a1501b7da1c8a3ba71f9594ad23a603
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 4997cacd5a1501b7da1c8a3ba71f9594ad23a603)
@@ -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