Index: AlarmDefs.h
===================================================================
diff -u -r68a17e52574cb3864d68d683b0b549fe79cd1178 -rf141c4b3acce90dcaa9e192914f3550bec646004
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 68a17e52574cb3864d68d683b0b549fe79cd1178)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision f141c4b3acce90dcaa9e192914f3550bec646004)
@@ -20,7 +20,7 @@
 // ********** public definitions **********
 
 /// Enumeration of alarm IDs.
-typedef enum Alarm_List
+enum Alarm_List
 {
     ALARM_ID_NO_ALARM = 0,                                          ///< Indication for when no alarms is a possible situation.
     ALARM_ID_SOFTWARE_FAULT = 1,                                    ///< Software fault.  Software found itself in an unexpected state.
@@ -70,15 +70,19 @@
     ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 45,                   ///< HW usage data (treatment time in HD and total consumed water in DG) failure.
     AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR = 46,               ///< Last disinfection date CRC error
     NUM_OF_ALARM_IDS                                                ///< Total # of alarms.
-} ALARM_ID_T;
+};
+/// Type for alarm list enumeration.
+typedef enum Alarm_List ALARM_ID_T;
 
-typedef enum Alarm_Priorities
+enum Alarm_Priorities
 {
     ALARM_PRIORITY_NONE = 0,                                        ///< Indicates not an alarm or no alarms active at this time.
     ALARM_PRIORITY_LOW = 1,                                         ///< Low priority alarm.
     ALARM_PRIORITY_MEDIUM = 2,                                      ///< Medium priority alarm.
     ALARM_PRIORITY_HIGH = 3,                                        ///< High priority alarm.
     NUM_OF_ALARM_PRIORITIES                                         ///< Total # of alarm priorities.
-} ALARM_PRIORITY_T;
+};
+/// Type for alarm priorities enumeration.
+typedef enum Alarm_Priorities ALARM_PRIORITY_T;
 
 #endif
Index: MsgDefs.h
===================================================================
diff -u -r68a17e52574cb3864d68d683b0b549fe79cd1178 -rf141c4b3acce90dcaa9e192914f3550bec646004
--- MsgDefs.h	(.../MsgDefs.h)	(revision 68a17e52574cb3864d68d683b0b549fe79cd1178)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f141c4b3acce90dcaa9e192914f3550bec646004)
@@ -20,7 +20,7 @@
 // ********** public definitions **********
 
 /// Enumeration of system message IDs.
-typedef enum Msg_IDs
+enum Msg_IDs
 {   // normal CAN messages
     MSG_ID_UNUSED = 0,                                                  ///< Zero is an undefined (un-used) message ID).
     MSG_ID_OFF_BUTTON_PRESS = 1,                                        ///< HD/UI off button interactions.
@@ -103,10 +103,12 @@
     MSG_ID_DG_SET_RTC_DATE_TIME = 0xA004,
     MSG_ID_LOAD_CELL_OVERRIDE = 0xA005,
     END_OF_MSG_IDS                                                      ///< # of system message IDs.
-} MSG_ID_T;
+};
+/// Type for message IDs enumeration.
+typedef enum Msg_IDs MSG_ID_T;
 
-/// Settings change rejection reason codes.
-typedef enum Request_Reject_Reasons
+/// Enumeration of settings change rejection reason codes.
+enum Request_Reject_Reasons
 {
     REQUEST_REJECT_REASON_NONE = 0,                                     ///< Used when there is no rejection.
     REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE,                  ///< Request is not allowed in the current operating mode.
@@ -122,6 +124,8 @@
     REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE,                       ///< Ultrafiltration volume is out of range.
     REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE,                         ///< Ultrafiltration rate is out of range.
     NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes.
-} REQUEST_REJECT_REASON_CODE_T;
+};
+/// Type for settings change rejection reason codes enumeration.
+typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;
 
 #endif