Index: DGDefs.h
===================================================================
diff -u -r6d51694764e2068371cf75166a64ae0d3ad88161 -r4f1573ce81a48891fd8d62ac18102b40072fa30b
--- DGDefs.h	(.../DGDefs.h)	(revision 6d51694764e2068371cf75166a64ae0d3ad88161)
+++ DGDefs.h	(.../DGDefs.h)	(revision 4f1573ce81a48891fd8d62ac18102b40072fa30b)
@@ -25,7 +25,7 @@
  */
 
 /// Enumeration of operation modes.  These are in order of priority (highest to lowest).
-typedef enum DG_Op_Modes
+enum DG_Op_Modes
 {
     DG_MODE_FAUL = 0,                                   ///< Fault mode.
     DG_MODE_SERV,                                       ///< Service mode.
@@ -40,7 +40,8 @@
     DG_MODE_CHEM,                                       ///< Chemical Disinfect mode.
     DG_MODE_NLEG,                                       ///< Not legal - an illegal mode transition occurred.
     NUM_OF_DG_MODES                                     ///< Number of DG operation modes.
-} DG_OP_MODE_T;
+};
+typedef enum DG_Op_Modes DG_OP_MODE_T;
 
 /**@}*/
 
@@ -50,15 +51,16 @@
  */
 
 /// Enumeration of init & POST mode states.
-typedef enum DG_POST_States
+enum DG_POST_States
 {
     DG_POST_STATE_START = 0,                            ///< Start initialize & POST mode state.
     DG_POST_STATE_FPGA,                                 ///< FPGA POST test state.
     DG_POST_STATE_WATCHDOG,                             ///< Watchdog POST test state.
     DG_POST_STATE_COMPLETED,                            ///< POST completed successfully state.
     DG_POST_STATE_FAILED,                               ///< POST failed state.
     NUM_OF_DG_POST_STATES                               ///< Number of initialize & POST mode states.
-} DG_POST_STATE_T;
+};
+typedef enum DG_POST_States DG_POST_STATE_T;
 
 /**@}*/
 
@@ -68,11 +70,12 @@
  */
 
 /// Enumeration of fault mode states.
-typedef enum DG_Fault_States
+enum DG_Fault_States
 {
     DG_FAULT_STATE_START = 0,                           ///< Start fault state.
     NUM_OF_DG_FAULT_STATES                              ///< Number of fault mode states.
-} DG_FAULT_STATE_T;
+};
+typedef enum DG_Fault_States DG_FAULT_STATE_T;
 
 /**@}*/
 
@@ -82,11 +85,12 @@
  */
 
 /// Enumeration of solo standby mode states.
-typedef enum DG_Solo_States
+enum DG_Solo_States
 {
     DG_SOLO_STANDBY_STATE_START = 0,                    ///< Start solo standby mode state.
     NUM_OF_DG_SOLO_STANDBY_STATES                       ///< Number of solo standby mode states.
-} DG_SOLO_STANDBY_STATE_T;
+};
+typedef enum DG_Solo_States DG_SOLO_STANDBY_STATE_T;
 
 /**@}*/
 
@@ -96,13 +100,14 @@
  */
 
 /// Enumeration of standby mode states.
-typedef enum DG_Standby_Mode_States
+enum DG_Standby_Mode_States
 {
     DG_STANDBY_MODE_STATE_START = 0,                    ///< Start standby mode state.
     DG_STANDBY_MODE_STATE_IDLE,                         ///< Idle standby mode state.
     DG_STANDBY_MODE_STATE_SAMPLE_WATER,                 ///< Sample water standby mode state.
     NUM_OF_DG_STANDBY_MODE_STATES                       ///< Number of standby mode states.
-} DG_STANDBY_MODE_STATE_T;
+};
+typedef enum DG_Standby_Mode_States DG_STANDBY_MODE_STATE_T;
 
 /**@}*/
 
@@ -112,14 +117,15 @@
  */
 
 /// Enumeration of re-circulation mode states.
-typedef enum DG_Recirculate_Mode_States
+enum DG_Recirculate_Mode_States
 {
     DG_RECIRCULATE_MODE_STATE_START = 0,                ///< Start re-circulation mode state.
     DG_RECIRCULATE_MODE_STATE_FLUSH_LINES,              ///< Flush lines state.
     DG_RECIRCULATE_MODE_STATE_RECIRC_WATER,             ///< Re-circulate water state.
     DG_RECIRCULATE_MODE_STATE_PAUSE,                    ///< Pause state (pumps, heaters, lamps off).
     NUM_OF_DG_RECIRCULATE_MODE_STATES                   ///< Number of fill mode states.
-} DG_RECIRCULATE_MODE_STATE_T;
+};
+typedef enum DG_Recirculate_Mode_States DG_RECIRCULATE_MODE_STATE_T;
 
 /**@}*/
 
@@ -129,13 +135,14 @@
  */
 
 /// Enumeration of fill mode states.
-typedef enum DG_Fill_Mode_States
+enum DG_Fill_Mode_States
 {
     DG_FILL_MODE_STATE_START = 0,                       ///< Start fill mode state.
     DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION,            ///< Dialysate production state.
     DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Deliver dialysate state.
     NUM_OF_DG_FILL_MODE_STATES                          ///< Number of fill mode states.
-} DG_FILL_MODE_STATE_T;
+};
+typedef enum DG_Fill_Mode_States DG_FILL_MODE_STATE_T;
 
 /**@}*/
 
@@ -145,12 +152,13 @@
  */
 
 /// Enumeration of drain mode states.
-typedef enum DG_Drain_States
+enum DG_Drain_States
 {
     DG_DRAIN_STATE_START = 0,                           ///< Start drain mode state.
     DG_DRAIN_STATE_DRAIN,                               ///< Drain drain mode state.
     NUM_OF_DG_DRAIN_STATES                              ///< Number of drain mode states.
-} DG_DRAIN_STATE_T;
+};
+typedef enum DG_Drain_States DG_DRAIN_STATE_T;
 
 /**@}*/
 
@@ -160,11 +168,12 @@
  */
 
 /// Enumeration of flush mode states.
-typedef enum DG_Flush_States
+enum DG_Flush_States
 {
     DG_FLUSH_STATE_START = 0,                           ///< Start flush mode state.
     NUM_OF_DG_FLUSH_STATES                              ///< Number of flush mode states.
-} DG_FLUSH_STATE_T;
+};
+typedef enum DG_Flush_States DG_FLUSH_STATE_T;
 
 /**@}*/
 
@@ -174,11 +183,12 @@
  */
 
 /// Enumeration of heat disinfection mode states.
-typedef enum DG_Heat_States
+enum DG_Heat_States
 {
     DG_HEAT_DISINFECT_STATE_START = 0,                  ///< Start heat disinfect mode state.
     NUM_OF_DG_HEAT_DISINFECT_STATES                     ///< Number of heat disinfect mode states.
-} DG_HEAT_DISINFECT_STATE_T;
+};
+typedef enum DG_Heat_States DG_HEAT_DISINFECT_STATE_T;
 
 /**@}*/
 
@@ -188,11 +198,12 @@
  */
 
 /// Enumeration of chem. disinfect mode states.
-typedef enum DG_Chem_States
+enum DG_Chem_States
 {
     DG_CHEM_DISINFECT_STATE_START = 0,                  ///< Start chemical disinfect mode state.
     NUM_OF_DG_CHEM_DISINFECT_STATES                     ///< Number of chemical disinfect mode states.
-} DG_CHEM_DISINFECT_STATE_T;
+};
+typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T;
 
 /**@}*/
 
@@ -202,11 +213,12 @@
  */
 
 /// Enumeration of service mode states.
-typedef enum DG_Service_States
+enum DG_Service_States
 {
     DG_SERVICE_STATE_START = 0,                         ///< Start service mode state.
     NUM_OF_DG_SERVICE_STATES                            ///< Number of service mode states.
-} DG_SERVICE_STATE_T;
+};
+typedef enum DG_Service_States DG_SERVICE_STATE_T;
 
 /**@}*/