Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r1285d4ad8e8335bee537d9e2a7bc7660fd52c2e9 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 1285d4ad8e8335bee537d9e2a7bc7660fd52c2e9)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -15,7 +15,6 @@
  **************************************************************************/
 
 #include "LoadCell.h"
-#include "Common.h"
 #include "SystemCommMessages.h"
 #include "FPGA.h"
 #include "TaskPriority.h"
Index: firmware/App/Controllers/LoadCell.h
===================================================================
diff -u -r1285d4ad8e8335bee537d9e2a7bc7660fd52c2e9 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision 1285d4ad8e8335bee537d9e2a7bc7660fd52c2e9)
+++ firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef APP_CONTROLLERS_LOADCELL_H_
 #define APP_CONTROLLERS_LOADCELL_H_
 
-#include "Common.h"
+#include "DGCommon.h"
 
 void execLoadCell(void);
 
Index: firmware/App/Controllers/SensorProcess.c
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Controllers/SensorProcess.c	(.../SensorProcess.c)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Controllers/SensorProcess.c	(.../SensorProcess.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -15,7 +15,6 @@
  **************************************************************************/
 
 #include "SensorProcess.h"
-#include "Common.h"
 #include "LoadCell.h"
 #include "SystemCommMessages.h"
 #include "FPGA.h"
Index: firmware/App/Controllers/SensorProcess.h
===================================================================
diff -u -r85e0c91a9f375fcf709289ec767d00e4d61e7e6f -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Controllers/SensorProcess.h	(.../SensorProcess.h)	(revision 85e0c91a9f375fcf709289ec767d00e4d61e7e6f)
+++ firmware/App/Controllers/SensorProcess.h	(.../SensorProcess.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,9 +17,10 @@
 #ifndef APP_CONTROLLERS_SENSORPROCESS_H_
 #define APP_CONTROLLERS_SENSORPROCESS_H_
 
+#include "DGCommon.h"
+
 void execSensorProcess(void);
 
-
 #endif /* APP_CONTROLLERS_SENSORPROCESS_H_ */
 
 
Index: firmware/App/DGCommon.h
===================================================================
diff -u
--- firmware/App/DGCommon.h	(revision 0)
+++ firmware/App/DGCommon.h	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -0,0 +1,63 @@
+/**********************************************************************//**
+*
+*  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+*
+*  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+*  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+*  @file DGCommon.h
+*
+*  @date 27-Feb-2019
+*  @author S. Nash
+*
+*  @brief Header file for common definitions, types and macros for DG firmware.
+*
+**************************************************************************/
+
+#ifndef __DG_COMMON_H__
+#define __DG_COMMON_H__
+
+#include "hal_stdtypes.h"
+
+// ********** build switches **********
+
+#ifndef _VECTORCAST_
+//    #define RM46_EVAL_BOARD_TARGET          1
+    #define SIMULATE_UI                     1
+    #define DEBUG_ENABLED                   1
+    #define DISABLE_CRC_ERROR               1
+//    #define CAN_TEST                        1
+
+    #ifdef DEBUG_ENABLED
+        #include <stdio.h>
+        #include <strings.h>
+    #endif
+#endif
+
+#include "Common.h"
+
+/**
+ *  @defgroup CommonDGHeader CommonDGHeader
+ *  @brief Provides commonly used definitions and macros for DG firmware.
+ *
+ *  @addtogroup CommonDGHeader
+ *  @{
+ */
+
+// **** Common Definitions ****
+
+
+// **** Common Macros ****
+
+
+/**@}*/
+
+
+// **** VectorCAST Definitions ****
+
+#ifdef _VECTORCAST_
+
+
+#endif
+
+#endif
Index: firmware/App/Drivers/CPLD.h
===================================================================
diff -u -rea562263f55f20589a8512da8c00be33a8f239b5 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision ea562263f55f20589a8512da8c00be33a8f239b5)
+++ firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __CPLD_H__
 #define __CPLD_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public function prototypes **********
 
Index: firmware/App/Drivers/Comm.h
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __COMM_H__
 #define __COMM_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Drivers/InternalADC.h
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __INT_ADC_H__
 #define __INT_ADC_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -16,7 +16,6 @@
 
 #include "gio.h"
 
-#include "Common.h"
 #include "SafetyShutdown.h"
 
 // ********** private definitions **********
Index: firmware/App/Drivers/SafetyShutdown.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Drivers/SafetyShutdown.h	(.../SafetyShutdown.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Drivers/SafetyShutdown.h	(.../SafetyShutdown.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __SAFETY_SHUTDOWN_H__
 #define __SAFETY_SHUTDOWN_H__
 
+#include "DGCommon.h"
+
 // ********** public function prototypes **********
 
 void initSafetyShutdown( void );
Index: firmware/App/Modes/ModeDisinfect.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeDisinfect.h	(.../ModeDisinfect.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeDisinfect.h	(.../ModeDisinfect.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_DISINFECT_H__
 #define __MODE_DISINFECT_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initDisinfectMode( void );           // initialize this module
Index: firmware/App/Modes/ModeDrain.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeDrain.h	(.../ModeDrain.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeDrain.h	(.../ModeDrain.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_DRAIN_H__
 #define __MODE_DRAIN_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initDrainMode( void );         // initialize this module
Index: firmware/App/Modes/ModeFault.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeFault.h	(.../ModeFault.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeFault.h	(.../ModeFault.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_FAULT_H__
 #define __MODE_FAULT_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initFaultMode( void );         // initialize this module
Index: firmware/App/Modes/ModeFill.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_FILL_H__
 #define __MODE_FILl_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initFillMode( void );          // initialize this module
Index: firmware/App/Modes/ModeFlush.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeFlush.h	(.../ModeFlush.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeFlush.h	(.../ModeFlush.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_FLUSH_H__
 #define __MODE_FLUSH_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initFlushMode( void );           // initialize this module
Index: firmware/App/Modes/ModeInitPOST.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeInitPOST.h	(.../ModeInitPOST.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeInitPOST.h	(.../ModeInitPOST.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_INIT_POST_H__
 #define __MODE_INIT_POST_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initInitAndPOSTMode( void );           // initialize this module
Index: firmware/App/Modes/ModePostTreat.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_POST_TREATMENT_H__
 #define __MODE_POST_TREATMENT_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initPostTreatmentMode( void );          // initialize this module
Index: firmware/App/Modes/ModeService.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeService.h	(.../ModeService.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeService.h	(.../ModeService.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_SERVICE_H__
 #define __MODE_SERVICE_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initServiceMode( void );          // initialize this module
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __MODE_STANDBY_H__
 #define __MODE_STANDBY_H__
 
+#include "DGCommon.h"
+
 // ********** private function prototypes **********
 
 void initStandbyMode( void );          // initialize this module
Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __OP_MODES_H__
 #define __OP_MODES_H__
 
+#include "DGCommon.h"
+
 // ********** public definitions **********
 
 typedef enum Op_Modes        // These are in order of priority (highest to lowest)
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __ALARM_MGMT_H__
 #define __ALARM_MGMT_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 /**
  *  @defgroup AlarmManagement AlarmManagement
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -22,7 +22,6 @@
 
 #include <string.h>     // for memcpy()
 
-#include "Common.h"
 #include "CommBuffers.h"
 
 // ********** private definitions **********
Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __COMM_BUFFERS_H__
 #define __COMM_BUFFERS_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -ra24665c05496241e5ba9a73e0b1831a85dfbc3c9 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision a24665c05496241e5ba9a73e0b1831a85dfbc3c9)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __FPGA_H__
 #define __FPGA_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 #include "Interrupts.h"
 
 // ********** public definitions **********
Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -19,7 +19,6 @@
 #include "sci.h"
 #include "sys_dma.h"
 
-#include "Common.h"
 #include "AlarmMgmt.h"
 #include "Comm.h"
 #include "Interrupts.h"
Index: firmware/App/Services/Interrupts.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/Interrupts.h	(.../Interrupts.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Services/Interrupts.h	(.../Interrupts.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __INTERRUPTS_H__
 #define __INTERRUPTS_H__
 
+#include "DGCommon.h"
+
 // ********** public definitions **********
 
 // ********** public function prototypes **********
Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "MsgQueues.h"
 
 // ********** private definitions **********
Index: firmware/App/Services/MsgQueues.h
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/MsgQueues.h	(.../MsgQueues.h)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Services/MsgQueues.h	(.../MsgQueues.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __MSG_QUEUES_H__
 #define __MSG_QUEUES_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Services/PIControllers.h
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __PICONTROLLERS_H__
 #define __PICONTROLLERS_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 /**
  *  @defgroup PIControllers PIControllers
Index: firmware/App/Services/SystemComm.h
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __SYSTEM_COMM_H__
 #define __SYSTEM_COMM_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 #include "CommBuffers.h"
 #include "MsgQueues.h"
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -18,7 +18,6 @@
 
 #include <string.h>     // for memcpy()
 
-#include "Common.h"
 #include "MsgQueues.h"
 #include "WatchdogMgmt.h"
 #include "SystemCommMessages.h"
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r4d1572f8226f06febef4a536cdd0946d0dd0fb02 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 #include "MsgQueues.h"
 
 // ********** public definitions **********
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r85e0c91a9f375fcf709289ec767d00e4d61e7e6f -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 85e0c91a9f375fcf709289ec767d00e4d61e7e6f)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "CPLD.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
Index: firmware/App/Services/WatchdogMgmt.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/WatchdogMgmt.h	(.../WatchdogMgmt.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Services/WatchdogMgmt.h	(.../WatchdogMgmt.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,7 @@
 #ifndef __WATCHDOG_MGMT_H__
 #define __WATCHDOG_MGMT_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Tasks/TaskBG.c
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -16,7 +16,6 @@
 
 #include "gio.h"
 
-#include "Common.h"
 #include "WatchdogMgmt.h"
 #include "TaskTimer.h"
 
Index: firmware/App/Tasks/TaskBG.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Tasks/TaskBG.h	(.../TaskBG.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Tasks/TaskBG.h	(.../TaskBG.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __TASK_BACKGROUND_H__
 #define __TASK_BACKGROUND_H__
 
+#include "DGCommon.h"
+
 // public function prototypes
 
 void taskBackground( void );
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r4d27576bdd7843178d9b69ffff3584ee01ec24fe -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 4d27576bdd7843178d9b69ffff3584ee01ec24fe)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,7 +17,6 @@
 #include "gio.h"
 #include "lin.h"
 
-#include "Common.h"
 #include "OperationModes.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
Index: firmware/App/Tasks/TaskGeneral.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Tasks/TaskGeneral.h	(.../TaskGeneral.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Tasks/TaskGeneral.h	(.../TaskGeneral.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __TASK_GENERAL_H__
 #define __TASK_GENERAL_H__
 
+#include "DGCommon.h"
+
 // public definitions
 
 #define TASK_GENERAL_INTERVAL    (50)
Index: firmware/App/Tasks/TaskPriority.h
===================================================================
diff -u -r85e0c91a9f375fcf709289ec767d00e4d61e7e6f -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Tasks/TaskPriority.h	(.../TaskPriority.h)	(revision 85e0c91a9f375fcf709289ec767d00e4d61e7e6f)
+++ firmware/App/Tasks/TaskPriority.h	(.../TaskPriority.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,6 +17,8 @@
 #ifndef __TASK_PRIORITY_H__
 #define __TASK_PRIORITY_H__
 
+#include "DGCommon.h"
+
 // public definitions
 
 #define TASK_PRIORITY_INTERVAL    (10)  // in ms
Index: firmware/source/sys_main.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -60,7 +60,7 @@
 #include "sci.h"
 #include "rti.h"
 
-#include "Common.h"
+#include "DGCommon.h"
 #include "AlarmMgmt.h"
 #include "CommBuffers.h"
 #include "CPLD.h"