Index: AlarmDefs.h
===================================================================
diff -u -rf606f965d8d2e93c0eede2243b0ff56993177408 -r35fc1f8fb75aba11213f3bf0fe74847e7125686c
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision f606f965d8d2e93c0eede2243b0ff56993177408)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 35fc1f8fb75aba11213f3bf0fe74847e7125686c)
@@ -251,7 +251,7 @@
 
 /**@}*/
 
-#ifdef __ALARM_MGMT_C__
+#if defined(__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_RO_C__)
 
 /**
  *  @addtogroup AlarmManagement
@@ -289,6 +289,9 @@
 };
 typedef struct AlarmsRankRecord ALARM_RANK_T;
 
+#endif
+#ifdef __ALARM_MGMT_C__
+
 /// Table of alarms and their static properties.
 const ALARM_T ALARM_TABLE[] =
 {   //   Priority            Rank  Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr ClrOnly TxLog  ID
Index: MsgDefs.h
===================================================================
diff -u -r126eafbc531912f6e2e537ea7631ae98d413e670 -r35fc1f8fb75aba11213f3bf0fe74847e7125686c
--- MsgDefs.h	(.../MsgDefs.h)	(revision 126eafbc531912f6e2e537ea7631ae98d413e670)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 35fc1f8fb75aba11213f3bf0fe74847e7125686c)
@@ -88,7 +88,7 @@
     MSG_ID_DD_RO_START_STOP_CMD_REQUEST = 0x38,                                     ///< DD requests RO to start/stop delivering the purified water.
     MSG_ID_RO_TEMPERATURE_DATA = 0x39,                                              ///< RO temperatures data broadcast
     MSG_ID_RO_HEATER_DATA = 0x3A,                                                   ///< RO heater data broadcast
-    MSG_ID_RO_GEN_PERMEATE_MODE_DATA = 0x3B,                                        ///< RO Gen Permeate data broadcast
+    MSG_ID_RO_GEN_WATER_MODE_DATA = 0x3B,                                           ///< RO Gen Water data broadcast
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0x3B,                                      ///< DD piston pump data
 #endif
Index: RODefs.h
===================================================================
diff -u -r21041cd399be0887ff2506a45d59a4cbbb406c30 -r35fc1f8fb75aba11213f3bf0fe74847e7125686c
--- RODefs.h	(.../RODefs.h)	(revision 21041cd399be0887ff2506a45d59a4cbbb406c30)
+++ RODefs.h	(.../RODefs.h)	(revision 35fc1f8fb75aba11213f3bf0fe74847e7125686c)
@@ -64,19 +64,19 @@
 /**@}*/
 
 /**
- *  @addtogroup ROGenPermeateMode
+ *  @addtogroup ROGenWaterMode
  *  @{
  */
 
-/// Enumeration of Gen Permeate mode states.
-enum RO_GenP_Mode_States
+/// Enumeration of Gen Water mode states.
+enum RO_GenW_Mode_States
 {
-    RO_GENP_STATE_START = 0,                                     ///< Gen Permeate start state
-    RO_GENP_WATER_LOW_STATE,                                     ///< Gen Permeate tank low state
-    RO_GENP_WATER_FULL_STATE,                                    ///< Gen Permeate tank full state
-    NUM_OF_RO_GENP_MODE_STATES                                   ///< Number of gen dialysate states
+    RO_GENW_STATE_START = 0,                                     ///< Gen Water start state
+    RO_GENW_TANK_LOW_STATE,                                     ///< Gen Water tank low state
+    RO_GENW_TANK_FULL_STATE,                                    ///< Gen Water tank full state
+    NUM_OF_RO_GENP_MODE_STATES                                   ///< Number of gen water states
 };
-typedef enum RO_GenP_Mode_States RO_GENP_MODE_STATE_T;          ///< Type for RO Gen Permate mode states enumeration
+typedef enum RO_GenW_Mode_States RO_GENW_MODE_STATE_T;          ///< Type for RO Gen Water mode states enumeration
 
 /**@}*/