Index: WatchdogMgmt.c
===================================================================
diff -u -rc9b16409a91c7d6943dad4400ae1858433f5adf5 -r03109dcf4d83b5d1bddbee79153a9b7bb7f028f2
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision c9b16409a91c7d6943dad4400ae1858433f5adf5)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 03109dcf4d83b5d1bddbee79153a9b7bb7f028f2)
@@ -20,7 +20,8 @@
 #include "FpgaTD.h"
 #endif
 #ifdef _DD_
-#include "FpgaDD.h"
+#include "FPGADD.h"
+#include "SafetyShutdown.h"
 #endif
 #ifdef _RO_
 #include "FpgaRo.h"
@@ -114,7 +115,13 @@
 void execWatchdogMgmt( void )
 {
     BOOL               allTasksCheckedIn;
+#ifdef _TD_
     PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = getCPLDWatchdogExpired();
+#endif
+#ifdef _DD_
+// 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
@@ -128,9 +135,15 @@
     {
         petWatchdog();
         resetWDTaskCheckIns();
-    }
+    }
+#ifdef _TD_
     // 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() != MODE_INIT ) )
+    if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != MODE_INIT ) )
+#endif
+#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
     {
         if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) )
         {