Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra97fcffbe7b7b2d9543358ac06868829d41cf173 -r049175cd6c514657ede645412cab05ce707d002f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a97fcffbe7b7b2d9543358ac06868829d41cf173)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 049175cd6c514657ede645412cab05ce707d002f)
@@ -36,6 +36,7 @@
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
 #include "Rinseback.h"
+#include "ModeStandby.h"
 #include "SyringePump.h"
 #include "Valves.h"
 
@@ -245,6 +246,21 @@
 // MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE
 BOOL sendTreatmentLogData( BOOL accepted, U32 reason, TREATMENT_LOG_DATA_PAYLOAD_T *logDataPtr );
 
+// MSG_ID_UI_DISINFECT_REQUEST
+void handleUIDisinfectRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_DISINFECT_RESPONSE
+BOOL sendDisinfectConfirmResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST
+void handleSetHDStandbyDisinfectSubmodeRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE
+BOOL handleSetHDStandbyDisinfectSubmodeResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_HD_DISINFECTS_UI_STATE_READINGS
+void handleDisinfectUIStatesReadingFromDG( MESSAGE_T *message );
+
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
@@ -277,6 +293,15 @@
 // MSG_ID_DG_OP_MODE
 void handleDGOpMode( MESSAGE_T *message );
 
+// MSG_ID_DG_START_STOP_FLUSH
+BOOL sendDGStartFlushModeCommand( BOOL start );
+
+// MSG_ID_DG_START_STOP_HEAT_DISINFECT
+BOOL sendDGStartHeatDisinfectModeCommand( BOOL start );
+
+// MSG_ID_DG_START_STOP_CHEM_DISINFECT
+BOOL sendDGStartChemicalDisinfectModeCommand( BOOL start );
+
 // *********** public data broad cast functions **********
 
 // MSG_ID_HD_ACCELEROMETER_DATA
@@ -381,6 +406,9 @@
 // MSG_ID_Hd_SEND_SERVICE_RECORD
 BOOL sendHDServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress );
 
+// MSG_ID_HD_DISINFECTS_UI_STATES_DATA
+BOOL broadcastDisinfectsData( DISINFECTS_DATA_T *disinfectsData );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );