Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -rf99f8b365af2274d68d7f424cc9be9815b4db19c -r8c27b2bb935abb76879e865bbf66ac46c32589fe
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision f99f8b365af2274d68d7f424cc9be9815b4db19c)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 8c27b2bb935abb76879e865bbf66ac46c32589fe)
@@ -72,10 +72,10 @@
 void setCurrent4thLevelState( U32 state );                          // Set the current 4th level state.
 
 void sendOperationStatusEvent( void );                              // Constructs and sends operation status event
+BOOL handleUIConfirmationResponse( MESSAGE_T *message );            // Handles the confirmation response received from the UI
 
 BOOL testSetOperationMode( MESSAGE_T *message );                    // Force transition to a given mode (if allowed)
 BOOL testSetOpModePublishIntervalOverride( MESSAGE_T *message );    // Override op mode data publish interval
-BOOL handleUIConfirmationResponse( MESSAGE_T *message );
 
 /**@}*/
 
Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r78e398b1ebe614a95cc931325d314ae6cbf52285 -r8c27b2bb935abb76879e865bbf66ac46c32589fe
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 78e398b1ebe614a95cc931325d314ae6cbf52285)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 8c27b2bb935abb76879e865bbf66ac46c32589fe)
@@ -128,6 +128,7 @@
 
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
+BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack );
 
 // Handle version request message
 BOOL handleVersionRequestMessage( MESSAGE_T *message );
@@ -144,16 +145,14 @@
 BOOL handleUpdateAvailable( MESSAGE_T *message );
 BOOL handleUIVersionResponse( MESSAGE_T *message );
 
-BOOL testTDSoftwareResetRequest( MESSAGE_T *message );
-
 // Test send message helper functions
 BOOL sendEvent( TD_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
-BOOL sendPOSTTestResult( TD_POST_STATE_T test, BOOL passed );
-BOOL sendPOSTFinalResult( BOOL passed );
 BOOL sendUIVersionRequest( void );
 BOOL sendRequestForDDResendAlarms( void );
-BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack );
+BOOL sendPOSTTestResult( TD_POST_STATE_T test, BOOL passed );
+BOOL sendPOSTFinalResult( BOOL passed );
 
+BOOL testTDSoftwareResetRequest( MESSAGE_T *message );
 BOOL testSetTestConfiguration( MESSAGE_T *message );
 BOOL testGetTestConfiguration( MESSAGE_T *message );
 BOOL testResetAllTestConfigurations( MESSAGE_T *message );