Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r4e4ab946c0bc4b668cf5b197c7f841355814ccf5 -r647f8950c1a9f936e16a7b51e36f582c3d03a40e
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4e4ab946c0bc4b668cf5b197c7f841355814ccf5)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 647f8950c1a9f936e16a7b51e36f582c3d03a40e)
@@ -395,6 +395,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 );
 
@@ -422,9 +431,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 );