Index: firmware/App/Services/SystemComm.h
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r4d1572f8226f06febef4a536cdd0946d0dd0fb02
--- firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Services/SystemComm.h	(.../SystemComm.h)	(revision 4d1572f8226f06febef4a536cdd0946d0dd0fb02)
@@ -26,7 +26,9 @@
 #define MESSAGE_SYNC_BYTE           0xA5
 
 #define CAN_MESSAGE_PAYLOAD_SIZE    8
-#define PC_MESSAGE_PACKET_SIZE      8
+#ifdef DEBUG_ENABLED
+    #define PC_MESSAGE_PACKET_SIZE  8
+#endif
 
 #define MSG_ID_ACK                  0xFFFF
 #define MSG_ACK_BIT                 0x8000
@@ -42,11 +44,11 @@
 void execSystemCommRx( void );
 void execSystemCommTx( void );
 void handleCANMsgInterrupt( CAN_MESSAGE_BOX_T srcCANBox );
-void handleUARTMsgRecvPacketInterrupt( void );
-void handleUARTMsgXmitPacketInterrupt( void );
+#ifdef DEBUG_ENABLED
+    void handleUARTMsgRecvPacketInterrupt( void );
+    void handleUARTMsgXmitPacketInterrupt( void );
+#endif
 BOOL isHDCommunicating( void );
-#ifndef ACK_NOT_IMPLEMENTED
 BOOL addMsgToPendingACKList( MESSAGE_T *msg, COMM_BUFFER_T channel, U08 *msgData, U32 len );
-#endif
 
 #endif