Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r4fc093ea280a0bdb47c20d25efb7c840b9f9867a -r2991b6731ff88740f29ea2f19411115d4f8a4aa4
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4fc093ea280a0bdb47c20d25efb7c840b9f9867a)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2991b6731ff88740f29ea2f19411115d4f8a4aa4)
@@ -398,6 +398,15 @@
 // MSG_ID_DG_START_STOP_CHEM_DISINFECT
 BOOL sendDGStartChemicalDisinfectModeCommand( BOOL start );
 
+// MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST
+void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
+
+// MSG_ID_HD_REQUEST_DG_SERVICE_MODE
+BOOL sendDGServiceModeRequest( void );
+
+// MSG_ID_UI_REQUEST_SERVICE_MODE
+void handleUIServiceModeRequest( MESSAGE_T *message );
+
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
@@ -425,9 +434,6 @@
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
-// MSG_ID_UI_REQUEST_SERVICE_MODE
-void handleUIServiceModeRequest( MESSAGE_T *message );
-void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
 
 // MSG_ID_HD_REQUEST_DG_ALARMS
 BOOL sendRequestForDGResendAlarms( void );