Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r73113d51d6ca20fd4e34d69d241fbb18bb70dc1e -r20ce73bfe54746972da5dbd43652f631cb4a58a8
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 73113d51d6ca20fd4e34d69d241fbb18bb70dc1e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 20ce73bfe54746972da5dbd43652f631cb4a58a8)
@@ -61,6 +61,12 @@
 // MSG_ID_DG_RESERVOIR_DATA
 BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol );
 
+// MSG_ID_HEATERS_READINGS
+BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
+
+// MSG_ID_TEMPERATURE_SENSORS_READINGS
+BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength );
+
 // MSG_ID_POWER_OFF_WARNING
 void handlePowerOffWarning( MESSAGE_T *message );
 
@@ -85,15 +91,12 @@
 // MSG_ID_DG_SAMPLE_WATER_CMD
 void handleSampleWaterCmd( MESSAGE_T *message );
 
+// MSG_ID_START_STOP_PRIMARY_HEATER
+BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
+
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
 void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
 
-// MSG_ID_HEATERS_READINGS
-BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
-
-// MSG_ID_TEMPERATURE_SENSORS_READINGS
-BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength );
-
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
@@ -162,9 +165,6 @@
 // MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
 void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_START_STOP_PRIMARY_HEATER
-BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
-
 // MSG_ID_DG_ACCEL_OVERRIDE:
 void handleTestDGAccelOverrideRequest( MESSAGE_T *message );