Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf1b45e81c0198b55cb04cb247140138a414fcf43 -r0589eeee132373075cccc56eab04db2b5160ae81
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f1b45e81c0198b55cb04cb247140138a414fcf43)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 0589eeee132373075cccc56eab04db2b5160ae81)
@@ -63,28 +63,6 @@
 #define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 #define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 
-/// TODO - should this be in HDDefs? MsgDefs or other common?.
-#define CONFIRMATION_REQUEST_TIMEOUT_MS    ( SEC_PER_MIN * MS_PER_SECOND )
-/// List of confirmation status.
-typedef enum Confirmation_Status
-{
-    CONFIRMATION_REQUEST_STATUS_REJECTED = 0,          ///< Confirmation status rejected
-    CONFIRMATION_REQUEST_STATUS_ACCEPTED,              ///< Confirmation status accepted
-    CONFIRMATION_REQUEST_STATUS_TIMEOUT,               ///< Confirmation status timeout
-    CONFIRMATION_REQUEST_STATUS_PENDING,               ///< Confirmation status pending response
-    CONFIRMATION_REQUEST_STATUS_UNUSED,                ///< Confirmation status Unused
-    NUM_OF_CONFIRMATION_REQUEST_STATUS                 ///< Number of confirmation status
-} CONFIRMATION_REQUEST_STATUS_T;
-
-/// Structure for confirmation request.
-typedef struct
-{
-    U32 requestID;                                      ///< Request ID
-    GENERIC_CONFIRM_COMMAND_T requestType;              ///< Request Type
-    U32 timeStamp;                                      ///< Timestamp for request
-    CONFIRMATION_REQUEST_STATUS_T status;               ///< Request status (pending, accepted, rejected)
-} CONFIRMATION_REQUEST_T;
-
 // ********** public function prototypes **********
 
 // Serialize message
@@ -453,7 +431,14 @@
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
+// MSG_ID_HD_SEND_ALARMS_COMMAND
+void handleResendAllAlarmsCommand(  MESSAGE_T* message );
 
+// MSG_ID_UI_CONFIRMATION_RESULT
+void handleUIConfirmationResponse( MESSAGE_T *message );
+void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );
+
+
 // MSG_ID_HD_REQUEST_DG_ALARMS
 BOOL sendRequestForDGResendAlarms( void );
 
@@ -844,9 +829,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );
 
@@ -856,11 +838,6 @@
 // MSG_ID_HD_DIAL_OUT_SET_PWM
 void handleTestDialOutSetPWM( MESSAGE_T* message );
 
-// MSG_ID_UI_CONFIRMATION_RESULT
-void handleUIConfirmationResponse( MESSAGE_T *message );
-CONFIRMATION_REQUEST_STATUS_T checkConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id );
-GENERIC_CONFIRM_ID_T sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );
-
 /**@}*/
 
 #endif