Index: HDDefs.h
===================================================================
diff -u -r580269454e953f797f5bdc58d76431cd5db2bce1 -r48357c6e369134cd8aff591644cfc49725f367e2
--- HDDefs.h	(.../HDDefs.h)	(revision 580269454e953f797f5bdc58d76431cd5db2bce1)
+++ HDDefs.h	(.../HDDefs.h)	(revision 48357c6e369134cd8aff591644cfc49725f367e2)
@@ -25,7 +25,7 @@
  */
 
 /// Enumeration of operation modes.  These are in order of priority (highest to lowest).
-typedef enum HD_Op_Modes
+enum HD_Op_Modes
 {
     MODE_FAUL = 0,            ///< Fault mode.
     MODE_SERV,                ///< Service mode.
@@ -37,7 +37,8 @@
     MODE_POST,                ///< Post-Treatment mode.
     MODE_NLEG,                ///< Not legal - an illegale mode transition occurred.
     NUM_OF_MODES              ///< Number of HD operation modes.
-} HD_OP_MODE_T;
+};
+typedef enum HD_Op_Modes HD_OP_MODE_T;
 
 /**@}*/
 
@@ -47,7 +48,7 @@
  */
 
 /// Enumeration of init & POST mode states.
-typedef enum HD_POST_States
+enum HD_POST_States
 {
     POST_STATE_START = 0,                               ///< Start initialize & POST mode state.
     POST_STATE_WATCHDOG,                                ///< Run watchdog test mode state.
@@ -59,7 +60,8 @@
     POST_STATE_COMPLETED,                               ///< POST self tests completed mode state.
     POST_STATE_FAILED,                                  ///< POST self tests failed mode state.
     NUM_OF_POST_STATES                                  ///< Number of initialize & POST mode states.
-} HD_POST_STATE_T;
+};
+typedef enum HD_POST_States HD_POST_STATE_T;
 
 /**@}*/
 
@@ -69,11 +71,12 @@
  */
 
 /// Enumeration of fault mode states.
-typedef enum HD_Fault_States
+enum HD_Fault_States
 {
     HD_FAULT_STATE_START = 0,                           ///< Start fault state.
     NUM_OF_HD_FAULT_STATES                              ///< Number of fault mode states.
-} HD_FAULT_STATE_T;
+};
+typedef enum HD_Fault_States HD_FAULT_STATE_T;
 
 /**@}*/
 
@@ -83,7 +86,7 @@
  */
 
 /// Sub-mode states while in standby mode
-typedef enum HD_Standby_States
+enum HD_Standby_States
 {
     STANDBY_START_STATE = 0,                            ///< Start standby
     STANDBY_FLUSH_DG_LINES_STATE,                       ///<
@@ -92,7 +95,8 @@
     STANDBY_FILL_RESERVOIR_STATE,                       ///<
     STANDBY_WAIT_FOR_TREATMENT_STATE,                   ///<
     NUM_OF_STANDBY_STATES                               ///< Number of standby states (sub-modes).
-} HD_STANDBY_STATE_T;
+};
+typedef enum HD_Standby_States HD_STANDBY_STATE_T;
 
 /**@}*/
 
@@ -102,11 +106,12 @@
  */
 
 /// Enumeration of treatment parameters mode states.
-typedef enum HD_Treatment_Parameters_Mode_States
+enum HD_Treatment_Parameters_Mode_States
 {
     HD_TREATMENT_PARAMS_MODE_STATE_START = 0,           ///< Start treatment params mode state.
     NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES              ///< Number of treatment params mode states.
-} HD_TREATMENT_PARAMS_MODE_STATE_T;
+};
+typedef enum HD_Treatment_Parameters_Mode_States HD_TREATMENT_PARAMS_MODE_STATE_T;
 
 /**@}*/
 
@@ -116,11 +121,12 @@
  */
 
 /// Enumeration of pre-treatment mode states.
-typedef enum HD_Pre_Treatment_Mode_States
+enum HD_Pre_Treatment_Mode_States
 {
     HD_PRE_TREATMENT_STATE_START = 0,                   ///< Start pre-treatment mode state.
     NUM_OF_HD_PRE_TREATMENT_STATES                      ///< Number of pre-treatment mode states.
-} HD_PRE_TREATMENT_MODE_STATE_T;
+};
+typedef enum HD_Pre_Treatment_Mode_States HD_PRE_TREATMENT_MODE_STATE_T;
 
 /**@}*/
 
@@ -130,7 +136,7 @@
  */
 
 /// Sub-mode states while in treatment mode
-typedef enum Treatment_States
+enum Treatment_States
 {
     TREATMENT_START_STATE = 0,              ///< Start treatment, prime blood side with gradual ramp for 1 min. while dialyzer is bypassed.  No dialysis or UF taking place.
     TREATMENT_DIALYSIS_STATE,               ///< Perform dialysis.  Deliver Heparin as prescribed.  Deliver UF as prescribed.  Handle saline boluses as requested.
@@ -144,7 +150,8 @@
     TREATMENT_DIALYSIS_END_STATE,           ///< Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback.
     TREATMENT_END_STATE,                    ///< Treatment has ended.  All pumps off.  Dialyzer is bypassed.  Blood lines are closed.  User to disconnect.
     NUM_OF_TREATMENT_STATES                 ///< Number of treatment states (sub-modes).
-} TREATMENT_STATE_T;
+};
+typedef enum Treatment_States TREATMENT_STATE_T;
 
 /**@}*/
 
@@ -154,11 +161,12 @@
  */
 
 /// Enumeration of post-treatment mode states.
-typedef enum HD_Post_Treatment_Mode_States
+enum HD_Post_Treatment_Mode_States
 {
     HD_POST_TREATMENT_STATE_START = 0,                  ///< Start post-treatment mode state.
     NUM_OF_HD_POST_TREATMENT_STATES                     ///< Number of post-treatment mode states.
-} HD_POST_TREATMENT_STATE_T;
+};
+typedef enum HD_Post_Treatment_Mode_States HD_POST_TREATMENT_STATE_T;
 
 /**@}*/
 
@@ -168,11 +176,12 @@
  */
 
 /// Enumeration of service mode states.
-typedef enum HD_Service_States
+enum HD_Service_States
 {
     HD_SERVICE_STATE_START = 0,                         ///< Start service mode state.
     NUM_OF_HD_SERVICE_STATES                            ///< Number of service mode states.
-} HD_SERVICE_STATE_T;
+};
+typedef enum HD_Service_States HD_SERVICE_STATE_T;
 
 /**@}*/
 
@@ -182,24 +191,26 @@
  */
 
 /// Enumeration of dialysis sub-mode states.
-typedef enum Dialysis_States
+enum Dialysis_States
 {
     DIALYSIS_START_STATE = 0,                           ///< Start state of the dialysis sub-mode state machine.
     DIALYSIS_UF_STATE,                                  ///< Ultrafiltration state of the dialysis sub-mode state machine.
     DIALYSIS_SOLUTION_INFUSION_STATE,                   ///< Solution infusion state of the dialysis sub-mode state machine.
     NUM_OF_DIALYSIS_STATES                              ///< Number of dialysis sub-mode states.
-} DIALYSIS_STATE_T;
+};
+typedef enum Dialysis_States DIALYSIS_STATE_T;
 
 /// Enumeration of ultrafiltration states.
-typedef enum UF_States
+enum UF_States
 {
     UF_START_STATE = 0,                                 ///< Start state of the ultrafiltration state machine.
     UF_PAUSED_STATE,                                    ///< Paused state of the ultrafiltration state machine.
     UF_RUNNING_STATE,                                   ///< Running state of the ultrafiltration state machine.
     UF_OFF_STATE,                                       ///< Completed/off state of the ultrafiltration state machine.
     UF_COMPLETED_STATE,                                 ///< Completed state of ultrafiltration state machine.
     NUM_OF_UF_STATES                                    ///< Number of ultrafiltration states.
-} UF_STATE_T;
+};
+typedef enum UF_States UF_STATE_T;
 
 /// Enumeration of system message IDs.
 enum UF_Commands