Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -17,21 +17,27 @@
 #ifndef __COMM_BUFFERS_H__
 #define __COMM_BUFFERS_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 // ********** public definitions **********
 
 typedef enum Comm_Buffers
 {
     COMM_BUFFER_NOT_USED = 0,           // CAN message boxes start at 1
+    COMM_BUFFER_IN_CAN_HD_ALARM,
     COMM_BUFFER_OUT_CAN_DG_ALARM,
+    COMM_BUFFER_IN_CAN_UI_ALARM,
     COMM_BUFFER_IN_CAN_HD_2_DG,
     COMM_BUFFER_OUT_CAN_DG_2_HD,
+    COMM_BUFFER_IN_CAN_HD_BROADCAST,
     COMM_BUFFER_OUT_CAN_DG_BROADCAST,
-    COMM_BUFFER_IN_CAN_PC_2_DG,
-    COMM_BUFFER_OUT_CAN_DG_2_PC,
+    COMM_BUFFER_IN_CAN_UI_BROADCAST,
+    COMM_BUFFER_IN_CAN_PC,
+    COMM_BUFFER_OUT_CAN_PC,
+#ifdef DEBUG_ENABLED
     COMM_BUFFER_IN_UART_PC,
     COMM_BUFFER_OUT_UART_PC,
+#endif
     NUM_OF_COMM_BUFFERS
 } COMM_BUFFER_T;