Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r3518e8a088c32e75c0c8960d5e629a7401095feb -r8cbddbe34a4ffed5a4d9fac07a065799c5862611
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 3518e8a088c32e75c0c8960d5e629a7401095feb)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 8cbddbe34a4ffed5a4d9fac07a065799c5862611)
@@ -15,9 +15,6 @@
 *
 ***************************************************************************/
 
-#include <math.h> // To check for NaN
-
-#include "DDDefs.h"
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModeInitPOST.h"
@@ -40,8 +37,8 @@
 
 // DG status
 static DD_OP_MODE_T ddCurrentOpMode;                                        ///< Current DD operation mode.
-static U32 ddSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
-static BOOL ddStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
+static U32 ddSubMode;                                                       ///< Current state (sub-mode) of current DD operation mode.
+static BOOL ddStartCommandSent;                                             ///< Flag indicates command to start DD has been sent.
 static BOOL ddStarted;                                                      ///< Flag indicates whether we have commanded the DD to start or stop.
 
 static BOOL ddOpModeDataFreshFlag = FALSE;                                  ///< Flag to signal the handleDDOpMode() to process fresh dd op mode data