Index: AlarmDefs.h
===================================================================
diff -u -rfc70939a0d02c63ebe0ca039c17320014304136b -r29bd4f5f91cab7323920f732ce5b6d8e4f934e64
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision fc70939a0d02c63ebe0ca039c17320014304136b)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 29bd4f5f91cab7323920f732ce5b6d8e4f934e64)
@@ -250,9 +250,11 @@
     ALARM_ID_DG_FPGA_POST_TEST_FAILED = 212,                        ///< DG FPGA POST failure
     ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE = 213,            ///< HD arterial air bubble detector self-test failure
     ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT = 214,               ///< HD arterial air bubble detector fault
-    ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 215,              ///< HD venous air bubble detector self-test failure
-    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT = 216,       ///< HD venous air bubble detector treatment fault
-    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT = 217,       ///< HD venous air bubble detector rinseback fault
+    ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE = 215,                    ///< DG heaters failed POST
+    ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 216,              ///< HD venous air bubble detector self-test failure
+    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT = 217,       ///< HD venous air bubble detector treatment fault
+    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT = 218,       ///< HD venous air bubble detector rinseback fault
+
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -333,6 +335,8 @@
 };
 typedef enum Alarm_State_Flag_Bit_Positions ALARM_STATE_FLAG_BIT_POSITIONS_T;
 
+#ifdef __ALARM_MGMT_C__
+
 /// Record defining the properties of each individual alarm.
 struct AlarmsStateRecord
 {
@@ -353,13 +357,6 @@
 };
 typedef struct AlarmsStateRecord ALARM_T;
 
-#ifndef __ALARM_MGMT_C__
-
-/// Only alarm mgmt module should include the populated alarm table.
-extern const ALARM_T ALARM_TABLE[];
-
-#else
-
 #define ALARM_NO_RESUME       ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME
 #define ALARM_NO_RINSEBACK    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK
 #define ALARM_PRIME_DONE_MED  ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY
@@ -583,6 +580,7 @@
     { ALARM_PRIORITY_HIGH,     1,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_FPGA_POST_TEST_FAILED
     { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE
     { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE
     { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE
     { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT
     { ALARM_PRIORITY_HIGH,    10,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT