Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -re69a109cc497124ac5f438264647666b17276bf4 -r059eb49a6f8fd2e2277b98b4aee986eb4519820a
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e69a109cc497124ac5f438264647666b17276bf4)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 059eb49a6f8fd2e2277b98b4aee986eb4519820a)
@@ -32,7 +32,6 @@
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
-#include "DialysateFlow.h"
 #include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
@@ -95,7 +94,7 @@
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleDGSerialNumberRequest( void );
 
-// MSG_ID_UI_REQUEST_SERVICE_INFO
+// MSG_ID_HD_REQUEST_DG_SERVICE_RECORD
 void handleDGServiceScheduleRequest( MESSAGE_T *message );
 
 // MSG_ID_HD_REQUEST_DG_CONCENTRATE_RATIOS
@@ -155,15 +154,18 @@
 // MSG_ID_DG_SCHEDULED_RUNS_INFO
 void handleDGScheduledRunsRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_OP_MODE
-BOOL handleSetHDOperationMode( MESSAGE_T *message );
-
 // MSG_ID_UI_REQUEST_SERVICE_MODE
 void handleServiceModeRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST
 BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode );
 
+// MSG_ID_HD_OP_MODE
+BOOL handleSetHDOperationMode( MESSAGE_T *message );
+
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+void handleHDRequestDGUsageInfo( MESSAGE_T * message );
+
 // MSG_ID_REQUEST_CPLD_STATUS
 void handleCpldStatusRequest( MESSAGE_T *message );
 
@@ -200,17 +202,14 @@
 // MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
 void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
-void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
-void handleTestDialysateMeasuredFlowOverrideRequest( MESSAGE_T *message );
+void handleTestMeasuredFlowOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
-void handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+void handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
 void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );
@@ -374,6 +373,12 @@
 // MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE
 void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD
+void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET
 void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message );
 
@@ -395,15 +400,18 @@
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
 void handleTestHDCommunicationStatusOverrideRequest(MESSAGE_T *message);
 
+// MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE
+void handleTestUsedAcidVolumeMLOverrideRequest(MESSAGE_T *message);
+
+// MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE
+void handleTestUsedBicarbVolumeMLOverrideRequest(MESSAGE_T *message);
+
 // MSG_ID_DG_GET_USAGE_INFO_RECORD
 void handleGetDGUsageInfoRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_USAGE_INFO_RECORD
 void handleSetDGUsageInfoRecord( MESSAGE_T *message );
 
-// MSG_ID_HD_REQUEST_DG_ALARMS
-void handleResendAllAlarmsCommand( MESSAGE_T *message );
-
 // MSG_ID_DG_SET_OP_MODE_REQUEST
 void handleTestSetOpModeRequest( MESSAGE_T *message );
 
@@ -413,6 +421,9 @@
 // MSG_ID_HD_OP_MODE
 BOOL handleSetHDOperationMode( MESSAGE_T *message );
 
+// MSG_ID_HD_REQUEST_DG_ALARMS
+void handleResendAllAlarmsCommand( MESSAGE_T *message );
+
 /**@}*/
 
 #endif