Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r1dbf106beb5d056601ee9f296e165d993d683ce0 -ra3417a09a4ff03a8f62d10ff938ca9ad27212217
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1dbf106beb5d056601ee9f296e165d993d683ce0)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a3417a09a4ff03a8f62d10ff938ca9ad27212217)
@@ -18,16 +18,17 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "HDCommon.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "BloodPrime.h"
 #include "DGInterface.h"
-#include "DialInFlow.h"
+#include "DialInFlow.h"
 #include "DialOutFlow.h"
-#include "Dialysis.h"
+#include "Dialysis.h"
 #include "FluidLeak.h"
-#include "Prime.h"
+#include "HDCommon.h"
+#include "Prime.h"
+#include "ModePostTreat.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
@@ -235,6 +236,21 @@
 // MSG_ID_HD_RECIRC_CMD_RESPONSE
 BOOL sendTreatmentEndCmdResponse( BOOL accepted, U32 rejReason );
 
+// MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM
+void handlePatientDisconnectionConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM
+void handleDisposableRemovalConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE
+BOOL sendDisposableRemovalConfirmResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST
+void handleUITreatmentLogDataRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE
+BOOL sendTreatmentLogData( BOOL accepted, U32 reason, TREATMENT_LOG_DATA_PAYLOAD_T *logDataPtr );
+
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
@@ -320,6 +336,9 @@
 // MSG_ID_TREATMENT_STATE
 BOOL broadcastTreatmentState( TREATMENT_STATE_DATA_T payload );
 
+// MSG_ID_HD_POST_TREATMENT_STATE
+BOOL broadcastPostTreatmentState( U32 postTreatmentSubMode );
+
 // MSG_ID_PRE_TREATMENT_STATE
 BOOL broadcastPreTreatmentState( PRE_TREATMENT_STATE_DATA_T *preTreatmentDataPtr );