Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r35a33f10e1c5bb5abde9d98236e7945e2ace981b -rba4d9696d4c0ac731775e0bcc5a7e50f65c90285
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 35a33f10e1c5bb5abde9d98236e7945e2ace981b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ba4d9696d4c0ac731775e0bcc5a7e50f65c90285)
@@ -52,9 +52,6 @@
 
 // ********** private definitions **********
 
-#define ACK_REQUIRED                    TRUE        ///< Require an ACK.
-#define ACK_NOT_REQUIRED                FALSE       ///< Not require an ACK.
-
 #ifdef DEBUG_ENABLED
     #define DEBUG_EVENT_MAX_TEXT_LEN    40
 #endif
@@ -78,7 +75,6 @@
 
 // ********** private function prototypes **********
 
-static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
 static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack );
 static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack );
 
@@ -96,7 +92,7 @@
  * @param ackReq is an acknowledgement from receiver required?
  * @return size (in bytes) of serialized message populated in given data array.
  *************************************************************************/
-static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
 {
     BOOL result = FALSE;
     BOOL error = FALSE;
@@ -3349,7 +3345,6 @@
 {
     BOOL status = FALSE;
     BOOL result = FALSE;
-    U08* payloadPtr = message->payload;
 
     if ( 0 == message->hdr.payloadLen )
     {
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r35a33f10e1c5bb5abde9d98236e7945e2ace981b -rba4d9696d4c0ac731775e0bcc5a7e50f65c90285
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 35a33f10e1c5bb5abde9d98236e7945e2ace981b)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ba4d9696d4c0ac731775e0bcc5a7e50f65c90285)
@@ -18,12 +18,14 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
+#include "CommBuffers.h"
 #include "DGCommon.h"
 #include "DrainPump.h"
 #include "Fans.h"
 #include "FluidLeak.h"
 #include "Heaters.h"
 #include "LoadCell.h"
+#include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFlush.h"
 #include "ModeHeatDisinfect.h"
@@ -47,8 +49,13 @@
 
 // ********** public definitions **********
 
+#define ACK_REQUIRED                    TRUE        ///< Require an ACK.
+#define ACK_NOT_REQUIRED                FALSE       ///< Not require an ACK.
+
 // ********** public function prototypes **********
 
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );