Index: AlarmDefs.h
===================================================================
diff -u -re42ee6229ed8530bc3aa875909a1dbb52b61b118 -rf7e2d74e5150f6673792fdbedb2fa37556fe56d7
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision e42ee6229ed8530bc3aa875909a1dbb52b61b118)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision f7e2d74e5150f6673792fdbedb2fa37556fe56d7)
@@ -322,30 +322,6 @@
 
 /**@}*/
 
-/// Alarm properties request payload for CAN broadcast
-struct AlarmTableResponsePayload
-{
-    U08    alarmPriority;              ///< Priority of alarm
-    U16    alarmSubRank;               ///< Alarm's rank within it's priority
-    U08    alarmSource;                ///< Alarm's sub system source
-    U08    alarmIsFault;               ///< Alarm is a system fault?
-    U08    alarmIsDDFault;             ///< Alarm is a fault for DD?
-    U08    alarmStops;                 ///< Alarm activation should cause a controlled stop
-    U08    alarmConditionClearImmed;   ///< Alarm condition is cleared immediately (does not persist after alarm triggered)
-    U08    alarmNoClear;               ///< Alarm cannot be cleared (unrecoverable)?
-    U08    alarmNoResume;              ///< Alarm prevents treatment resume
-    U08    alarmNoRinseback;           ///< Alarm prevents rinseback
-    U08    alarmNoEndTreatment;        ///< Alarm prevents ending treatment
-    U08    alarmBlockRinseback;        ///< Alarm should not trigger while in rinseback states
-    U08    alarmBlockEndTx;            ///< Alarm should not trigger while in post-treatment mode
-    U08    alarmNoBloodRecirc;         ///< Alarm prevents blood re-circulation
-    U08    alarmNoDialysateRecirc;     ///< Alarm prevents dialysate re-circulation
-    U08    alarmAutoResume;            ///< Alarm should resume automatically once the condition is cleared
-    U08    alarmClearOnly;             ///< Clear only this alarm on user acknowledgment
-    U08    alarmTreatmentLog;          ///< Log alarm to treatment log if active during treatment
-    U16    alarmID;                    ///< Alarm ID
-};
-typedef struct AlarmTableResponsePayload ALARM_PROP_T;
 
 #if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_FP_C__)
 
@@ -379,6 +355,30 @@
 };
 typedef struct AlarmsStateRecord ALARM_T;
 
+/// Alarm properties request payload for CAN broadcast
+struct AlarmTableResponsePayload
+{
+    U08    alarmPriority;              ///< Priority of alarm
+    U16    alarmSubRank;               ///< Alarm's rank within it's priority
+    U08    alarmSource;                ///< Alarm's sub system source
+    U08    alarmIsFault;               ///< Alarm is a system fault?
+    U08    alarmIsDDFault;             ///< Alarm is a fault for DD?
+    U08    alarmStops;                 ///< Alarm activation should cause a controlled stop
+    U08    alarmConditionClearImmed;   ///< Alarm condition is cleared immediately (does not persist after alarm triggered)
+    U08    alarmNoClear;               ///< Alarm cannot be cleared (unrecoverable)?
+    U08    alarmNoResume;              ///< Alarm prevents treatment resume
+    U08    alarmNoRinseback;           ///< Alarm prevents rinseback
+    U08    alarmNoEndTreatment;        ///< Alarm prevents ending treatment
+    U08    alarmBlockRinseback;        ///< Alarm should not trigger while in rinseback states
+    U08    alarmBlockEndTx;            ///< Alarm should not trigger while in post-treatment mode
+    U08    alarmNoBloodRecirc;         ///< Alarm prevents blood re-circulation
+    U08    alarmNoDialysateRecirc;     ///< Alarm prevents dialysate re-circulation
+    U08    alarmAutoResume;            ///< Alarm should resume automatically once the condition is cleared
+    U08    alarmClearOnly;             ///< Clear only this alarm on user acknowledgment
+    U08    alarmTreatmentLog;          ///< Log alarm to treatment log if active during treatment
+    U16    alarmID;                    ///< Alarm ID
+};
+typedef struct AlarmTableResponsePayload ALARM_PROP_T;
 
 
 /// Record defining the ranking of each individual alarm.