Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "CPLD.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
Index: firmware/App/Controllers/AlarmLamp.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/AlarmLamp.h	(.../AlarmLamp.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Controllers/AlarmLamp.h	(.../AlarmLamp.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __ALARM_LAMP_H__
 #define __ALARM_LAMP_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r48278ac6fa3738a97349ed7f3278773daf1d8004 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 48278ac6fa3738a97349ed7f3278773daf1d8004)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -21,7 +21,6 @@
 #include "can.h"
 #include "etpwm.h"
 
-#include "Common.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "OperationModes.h"
Index: firmware/App/Controllers/BloodFlow.h
===================================================================
diff -u -ra74a984a7059f75d86ad87d6d9499bd8f94cc976 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision a74a984a7059f75d86ad87d6d9499bd8f94cc976)
+++ firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __BLOOD_FLOW_H__
 #define __BLOOD_FLOW_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "Buttons.h"
 #include "CPLD.h"
 #include "OperationModes.h"
Index: firmware/App/Controllers/Buttons.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __BUTTONS_H__
 #define __BUTTONS_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r8dfdaca983c36456b0e067a20ef6c003da3758ac -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 8dfdaca983c36456b0e067a20ef6c003da3758ac)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -22,7 +22,6 @@
 #include "gio.h"
 #include "mibspi.h"
 
-#include "Common.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "OperationModes.h"
Index: firmware/App/Controllers/DialInFlow.h
===================================================================
diff -u -ra74a984a7059f75d86ad87d6d9499bd8f94cc976 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/DialInFlow.h	(.../DialInFlow.h)	(revision a74a984a7059f75d86ad87d6d9499bd8f94cc976)
+++ firmware/App/Controllers/DialInFlow.h	(.../DialInFlow.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __DIALYSATE_IN_FLOW_H__
 #define __DIALYSATE_IN_FLOW_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -22,7 +22,6 @@
 #include "gio.h"
 #include "mibspi.h"
 
-#include "Common.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "OperationModes.h"
Index: firmware/App/Controllers/DialOutFlow.h
===================================================================
diff -u -r926afe9b1d9cc6931cbca48080e4a66385a20239 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision 926afe9b1d9cc6931cbca48080e4a66385a20239)
+++ firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __DIALYSATE_OUT_FLOW_H__
 #define __DIALYSATE_OUT_FLOW_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 /**
  *  @defgroup DialysateOutlet DialysateOutlet
Index: firmware/App/Controllers/PresOccl.h
===================================================================
diff -u -r926afe9b1d9cc6931cbca48080e4a66385a20239 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 926afe9b1d9cc6931cbca48080e4a66385a20239)
+++ firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __PRESSURE_OCCLUSION_H__
 #define __PRESSURE_OCCLUSION_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 /**
  *  @defgroup PressureOcclusion PressureOcclusion
Index: firmware/App/Drivers/CPLD.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __CPLD_H__
 #define __CPLD_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public function prototypes **********
 
Index: firmware/App/Drivers/Comm.h
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Drivers/Comm.h	(.../Comm.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __COMM_H__
 #define __COMM_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Drivers/InternalADC.h
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __INT_ADC_H__
 #define __INT_ADC_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -16,7 +16,6 @@
 
 #include "gio.h"
 
-#include "Common.h"
 #include "SafetyShutdown.h"
 
 // ********** private definitions **********
Index: firmware/App/Drivers/SafetyShutdown.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Drivers/SafetyShutdown.h	(.../SafetyShutdown.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Drivers/SafetyShutdown.h	(.../SafetyShutdown.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __SAFETY_SHUTDOWN_H__
 #define __SAFETY_SHUTDOWN_H__
 
+#include "HDCommon.h"
+
 // ********** public function prototypes **********
 
 void initSafetyShutdown( void );
Index: firmware/App/HDCommon.h
===================================================================
diff -u
--- firmware/App/HDCommon.h	(revision 0)
+++ firmware/App/HDCommon.h	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -0,0 +1,67 @@
+/**********************************************************************//**
+*
+*  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 HDCommon.h
+*
+*  @date 27-Feb-2019
+*  @author S. Nash
+*
+*  @brief Header file for common definitions, types and macros for HD firmware.
+*
+**************************************************************************/
+
+#ifndef __HD_COMMON_H__
+#define __HD_COMMON_H__
+
+#include "hal_stdtypes.h"
+
+// ********** build switches **********
+
+#ifndef _VECTORCAST_
+//    #define RM46_EVAL_BOARD_TARGET          1
+    #define BREADBOARD2_TARGET              1
+    #define SIMULATE_UI                     1
+    #define DEBUG_ENABLED                   1
+    #define DISABLE_CRC_ERROR               1
+    #define DISABLE_MOTOR_CURRENT_ERRORS    1
+    #define SHOW_RAW_FLOW_VALUES            1
+//    #define CAN_TEST                        1
+
+    #ifdef DEBUG_ENABLED
+        #include <stdio.h>
+        #include <strings.h>
+    #endif
+#endif
+#define UF_TEST_ENABLED                 1
+
+#include "Common.h"
+
+/**
+ *  @defgroup CommonHDHeader CommonHDHeader
+ *  @brief Provides commonly used definitions and macros for HD firmware.
+ *
+ *  @addtogroup CommonHDHeader
+ *  @{
+ */
+
+// **** Common Definitions ****
+
+
+// **** Common Macros ****
+
+
+/**@}*/
+
+
+// **** VectorCAST Definitions ****
+
+#ifdef _VECTORCAST_
+
+
+#endif
+
+#endif
Index: firmware/App/Modes/Dialysis.h
===================================================================
diff -u -r7a14f1cc62ad1cb1d7d694f632ff3ddb90ca4717 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/Dialysis.h	(.../Dialysis.h)	(revision 7a14f1cc62ad1cb1d7d694f632ff3ddb90ca4717)
+++ firmware/App/Modes/Dialysis.h	(.../Dialysis.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __DIALYSIS_H__
 #define __DIALYSIS_H__
 
+#include "HDCommon.h"
+
 /**
  *  @defgroup Dialysis Dialysis
  *  @brief Dialysis sub-mode of treatment mode.
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,7 @@
  *
  **************************************************************************/
 
-#include "Common.h"
+
 #include "AlarmLamp.h"
 #include "OperationModes.h"
 #include "ModeFault.h"
Index: firmware/App/Modes/ModeFault.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeFault.h	(.../ModeFault.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModeFault.h	(.../ModeFault.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_FAULT_H__
 #define __MODE_FAULT_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initFaultMode( void );         // initialize this module
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "Buttons.h"
 #include "CPLD.h"
Index: firmware/App/Modes/ModeInitPOST.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeInitPOST.h	(.../ModeInitPOST.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModeInitPOST.h	(.../ModeInitPOST.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_INIT_POST_H__
 #define __MODE_INIT_POST_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initInitAndPOSTMode( void );           // initialize this module
Index: firmware/App/Modes/ModeOpParams.c
===================================================================
diff -u -r57ee0134869672b53ab5b7146b8988ede8f828d6 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeOpParams.c	(.../ModeOpParams.c)	(revision 57ee0134869672b53ab5b7146b8988ede8f828d6)
+++ firmware/App/Modes/ModeOpParams.c	(.../ModeOpParams.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "DialInFlow.h"
Index: firmware/App/Modes/ModeOpParams.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeOpParams.h	(.../ModeOpParams.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModeOpParams.h	(.../ModeOpParams.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_OP_PARAMS_H__
 #define __MODE_OP_PARAMS_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initOpParamsMode( void );         // initialize this module
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r57ee0134869672b53ab5b7146b8988ede8f828d6 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 57ee0134869672b53ab5b7146b8988ede8f828d6)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "DialInFlow.h"
Index: firmware/App/Modes/ModePostTreat.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_POST_TREATMENT_H__
 #define __MODE_POST_TREATMENT_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initPostTreatmentMode( void );          // initialize this module
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r57ee0134869672b53ab5b7146b8988ede8f828d6 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 57ee0134869672b53ab5b7146b8988ede8f828d6)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  *************************************************************************/
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "DialInFlow.h"
Index: firmware/App/Modes/ModePreTreat.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_PRE_TREAT_H__
 #define __MODE_PRE_TREAT_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initPreTreatmentMode( void );           // initialize this module
Index: firmware/App/Modes/ModePrescription.c
===================================================================
diff -u -r57ee0134869672b53ab5b7146b8988ede8f828d6 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModePrescription.c	(.../ModePrescription.c)	(revision 57ee0134869672b53ab5b7146b8988ede8f828d6)
+++ firmware/App/Modes/ModePrescription.c	(.../ModePrescription.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "DialInFlow.h"
Index: firmware/App/Modes/ModePrescription.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModePrescription.h	(.../ModePrescription.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModePrescription.h	(.../ModePrescription.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_PRESCRIPTION_H__
 #define __MODE_PRESCRIPTION_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initPrescriptionMode( void );         // initialize this module
Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "OperationModes.h"
 #include "ModeService.h"
 
Index: firmware/App/Modes/ModeService.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeService.h	(.../ModeService.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModeService.h	(.../ModeService.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_SERVICE_H__
 #define __MODE_SERVICE_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initServiceMode( void );          // initialize this module
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r48278ac6fa3738a97349ed7f3278773daf1d8004 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 48278ac6fa3738a97349ed7f3278773daf1d8004)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "DialInFlow.h"
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_STANDBY_H__
 #define __MODE_STANDBY_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initStandbyMode( void );          // initialize this module
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __MODE_TREATMENT_H__
 #define __MODE_TREATMENT_H__
 
+#include "HDCommon.h"
+
 // ********** private function prototypes **********
 
 void initTreatmentMode( void );           // initialize this module
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -16,7 +16,6 @@
 
 #include "gio.h"
 
-#include "Common.h"
 #include "OperationModes.h"
 
 #include "ModeInitPOST.h"
Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __OP_MODES_H__
 #define __OP_MODES_H__
 
+#include "HDCommon.h"
+
 // ********** public definitions **********
 
 typedef enum Op_Modes        // These are in order of priority (highest to lowest)
Index: firmware/App/Modes/TreatmentStop.h
===================================================================
diff -u -r7a14f1cc62ad1cb1d7d694f632ff3ddb90ca4717 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Modes/TreatmentStop.h	(.../TreatmentStop.h)	(revision 7a14f1cc62ad1cb1d7d694f632ff3ddb90ca4717)
+++ firmware/App/Modes/TreatmentStop.h	(.../TreatmentStop.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __TREATMENT_STOP_H__
 #define __TREATMENT_STOP_H__
 
+#include "HDCommon.h"
+
 /**
  *  @defgroup TreatmentStop TreatmentStop
  *  @brief Treatment stop sub-mode of treatment mode.
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -ra673b3fdaed36dc1e30bce51c8d90218cc96fccb -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision a673b3fdaed36dc1e30bce51c8d90218cc96fccb)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __ALARM_MGMT_H__
 #define __ALARM_MGMT_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 /**
  *  @defgroup AlarmManagement AlarmManagement
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -rb1844e1006587e698d34d1ee4a584f78dbb3c269 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision b1844e1006587e698d34d1ee4a584f78dbb3c269)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -22,7 +22,7 @@
 
 #include <string.h>     // for memcpy()
 
-#include "Common.h"
+#include "HDCommon.h"
 #include "CommBuffers.h"
 
 // ********** private definitions **********
Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __COMM_BUFFERS_H__
 #define __COMM_BUFFERS_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -r07a5add2dff254f7be3699e4efac2b99d3554847 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 07a5add2dff254f7be3699e4efac2b99d3554847)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __FPGA_H__
 #define __FPGA_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 #include "Interrupts.h"
 
 // ********** public definitions **********
Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -19,8 +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 -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/Interrupts.h	(.../Interrupts.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Services/Interrupts.h	(.../Interrupts.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __INTERRUPTS_H__
 #define __INTERRUPTS_H__
 
+#include "HDCommon.h"
+
 // ********** public definitions **********
 
 // ********** public function prototypes **********
Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -r9864b14f76782f1e68bf266dcd843451748715a0 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 9864b14f76782f1e68bf266dcd843451748715a0)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "MsgQueues.h"
 
 // ********** private definitions **********
Index: firmware/App/Services/MsgQueues.h
===================================================================
diff -u -r169b72cc9c959b53b40b48e9ce0a5f4aeca1de97 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/MsgQueues.h	(.../MsgQueues.h)	(revision 169b72cc9c959b53b40b48e9ce0a5f4aeca1de97)
+++ firmware/App/Services/MsgQueues.h	(.../MsgQueues.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __MSG_QUEUES_H__
 #define __MSG_QUEUES_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Services/PIControllers.h
===================================================================
diff -u -r926afe9b1d9cc6931cbca48080e4a66385a20239 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision 926afe9b1d9cc6931cbca48080e4a66385a20239)
+++ firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __PICONTROLLERS_H__
 #define __PICONTROLLERS_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 /**
  *  @defgroup PIControllers PIControllers
Index: firmware/App/Services/SystemComm.h
===================================================================
diff -u -r169b72cc9c959b53b40b48e9ce0a5f4aeca1de97 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 169b72cc9c959b53b40b48e9ce0a5f4aeca1de97)
+++ firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __SYSTEM_COMM_H__
 #define __SYSTEM_COMM_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 #include "CommBuffers.h"
 #include "MsgQueues.h"
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r169b72cc9c959b53b40b48e9ce0a5f4aeca1de97 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 169b72cc9c959b53b40b48e9ce0a5f4aeca1de97)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -18,7 +18,6 @@
 
 #include <string.h>     // for memcpy()
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r169b72cc9c959b53b40b48e9ce0a5f4aeca1de97 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 169b72cc9c959b53b40b48e9ce0a5f4aeca1de97)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 #include "MsgQueues.h"
 #include "DialOutFlow.h"
 
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "CPLD.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
Index: firmware/App/Services/WatchdogMgmt.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Services/WatchdogMgmt.h	(.../WatchdogMgmt.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Services/WatchdogMgmt.h	(.../WatchdogMgmt.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,7 +17,7 @@
 #ifndef __WATCHDOG_MGMT_H__
 #define __WATCHDOG_MGMT_H__
 
-#include "Common.h"
+#include "HDCommon.h"
 
 // ********** public definitions **********
 
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r2e6c750c202b7361d79488ce383e34f380e75413 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 2e6c750c202b7361d79488ce383e34f380e75413)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -16,7 +16,6 @@
 
 //#include "gio.h"
 
-#include "Common.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "DialInFlow.h"
Index: firmware/App/Tasks/TaskGeneral.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/App/Tasks/TaskGeneral.h	(.../TaskGeneral.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Tasks/TaskGeneral.h	(.../TaskGeneral.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -17,6 +17,8 @@
 #ifndef __TASK_GENERAL_H__
 #define __TASK_GENERAL_H__
 
+#include "HDCommon.h"
+
 // public definitions
 
 #define TASK_GENERAL_INTERVAL    (50)
Index: firmware/source/sys_main.c
===================================================================
diff -u -r57ee0134869672b53ab5b7146b8988ede8f828d6 -r9b262ba08e3180f121c3cf19d8d25e565183f87d
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 57ee0134869672b53ab5b7146b8988ede8f828d6)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
@@ -60,7 +60,7 @@
 #include "sci.h"
 #include "rti.h"
 
-#include "Common.h"
+#include "HDCommon.h"
 #include "AlarmLamp.h"
 #include "BloodFlow.h"
 #include "Buttons.h"