Index: firmware/App/Modes/ModePostTreat.h
===================================================================
diff -u -red21c935443549b87ab6665e76ce1d32d9867082 -ree2499c1609be043990ff01c0af98f3005022780
--- firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision ed21c935443549b87ab6665e76ce1d32d9867082)
+++ firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision ee2499c1609be043990ff01c0af98f3005022780)
@@ -34,6 +34,9 @@
 void initPostTreatmentMode( void );                                 // Initialize this module
 U32  transitionToPostTreatmentMode( void );                         // Prepares for transition to post-treatment mode
 U32  execPostTreatmentMode( void );                                 // Execute the post-treatment mode state machine (call from OperationModes)
+
+TD_POST_TREATMENT_STATE_T getPostTreatmentState( void );
+
 void signalUserConfirmPatientDisconnection( void );
 void signalUserConfirmDisposableRemoval( void );
 void signalUserConfirmDisinfection( void );
Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -red21c935443549b87ab6665e76ce1d32d9867082 -ree2499c1609be043990ff01c0af98f3005022780
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision ed21c935443549b87ab6665e76ce1d32d9867082)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision ee2499c1609be043990ff01c0af98f3005022780)
@@ -144,9 +144,6 @@
 BOOL handleTesterLogInRequest( MESSAGE_T *message );
 BOOL handleUpdateAvailable( MESSAGE_T *message );
 BOOL handleUIVersionResponse( MESSAGE_T *message );
-static BOOL handlePatientDisconnectionConfirmCmd( MESSAGE_T *message );
-static BOOL handleDisposableRemovalConfirmCmd( MESSAGE_T *message );
-static BOOL handleDisinfectionConfirmCmd( MESSAGE_T *message );
 
 // Test send message helper functions
 BOOL sendEvent( TD_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );