Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r1fb58baf6e7e3d1f054b2a3634e233da7609dad9
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1fb58baf6e7e3d1f054b2a3634e233da7609dad9)
@@ -21,7 +21,8 @@
 #include "HDCommon.h"
 #include "MsgQueues.h"
 #include "DialOutFlow.h"
-#include "DGInterface.h"
+#include "DGInterface.h"
+#include "Valves.h"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -188,7 +189,13 @@
 BOOL broadcastPowerOffWarning( void );
 
 // MSG_ID_HD_OP_MODE
-BOOL broadcastHDOperationMode( U32 mode, U32 subMode );
+BOOL broadcastHDOperationMode( U32 mode, U32 subMode );
+
+// MSG_ID_HD_VALVES_DATA
+BOOL broadcastHDValves( HD_VALVE_DATA_T *valveData );
+
+// MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER
+BOOL broadcastFastTempHDValves( HD_VALVE_FAST_DATA_T *fastDataRemoveLater ); //TODO remove this function
 
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
@@ -341,6 +348,23 @@
 // MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION:
 void handleSetDialysateFlowCalibration( MESSAGE_T *message );
 
+// MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE
+void handleTestHDValvesBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_HOME_VALVE
+void handleHomeHDValve( MESSAGE_T *message );
+
+// MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE
+void handleSetAirTrapValve( MESSAGE_T *message );
+
+// MSG_ID_HD_VALVES_SET_POSITION
+void handleSetHDValvePositionOverrideRequest( MESSAGE_T *message );
+
+#ifdef DEBUG_ENABLED
+// MSG_ID_HD_VALVES_SET_PWM_OVERRIDE
+void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
+#endif
+
 // MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
 void handleTestSetTreatmentParameter( MESSAGE_T *message );