Index: HDDefs.h
===================================================================
diff -u -r75d62d058dac89809b0f3d8f08f2eeed65a38e62 -r580269454e953f797f5bdc58d76431cd5db2bce1
--- HDDefs.h	(.../HDDefs.h)	(revision 75d62d058dac89809b0f3d8f08f2eeed65a38e62)
+++ HDDefs.h	(.../HDDefs.h)	(revision 580269454e953f797f5bdc58d76431cd5db2bce1)
@@ -17,8 +17,6 @@
 #ifndef __HD_DEFS_H__
 #define __HD_DEFS_H__
 
-#include "Common.h"
-
 // ********** public definitions **********
 
 /**
@@ -204,20 +202,22 @@
 } UF_STATE_T;
 
 /// Enumeration of system message IDs.
-typedef enum UF_Commands
+enum UF_Commands
 {
     UF_CMD_PAUSE = 0,                                   ///< Pause UF command.
     UF_CMD_RESUME,                                      ///< Resume UF command.
     NUM_OF_UF_CMDS                                      ///< Number of UF commands.
-} UF_CMD_T;
+};
+typedef enum UF_Commands UF_CMD_T;
 
 /// Enumeration of system message IDs.
-typedef enum UF_Adjustments
+enum UF_Adjustments
 {
     UF_ADJ_TREATMENT_TIME = 0,                          ///< Adjust treatment time to achieve new ultrafiltration volume.
     UF_ADJ_UF_RATE,                                     ///< Adjust UF rate to achieve new ultrafiltration volume.
     NUM_OF_UF_ADJS                                      ///< Number of UF adjustments.
-} UF_ADJ_T;
+};
+typedef enum UF_Adjustments UF_ADJ_T;
 
 /**@}*/