Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -rfa356a2bce909141f45c6832659fa1ceea5bfbba
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision fa356a2bce909141f45c6832659fa1ceea5bfbba)
@@ -96,12 +96,6 @@
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
 
-// MSG_ID_UI_TREATMENT_END_REQUEST
-void handleUIUserEndTreatmentRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_TREATMENT_END_RESPONSE
-BOOL sendTreatmentEndResponseMsg( BOOL accepted );
-
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
 
@@ -220,7 +214,7 @@
 BOOL broadcastTreatmentTime( U32 secsTotTreatment, U32 secsElapsed, U32 secsRemaining );
 
 // MSG_ID_TREATMENT_STATE
-BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState );
+BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState, U32 hepState, U32 rinsebackState, U32 txRecircState );
 
 // MSG_ID_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );