Index: CommBuffers.h
===================================================================
diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -rfda4bccdf45587c11d07cdb5f87f755de644d394
--- CommBuffers.h	(.../CommBuffers.h)	(revision 809103b805b84e80dda7e3dd1e77a52330610666)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision fda4bccdf45587c11d07cdb5f87f755de644d394)
@@ -18,6 +18,14 @@
 #ifndef __COMM_BUFFERS_H__
 #define __COMM_BUFFERS_H__
 
+#ifdef _TD_
+#include "TDCommon.h"
+#endif
+#ifdef _DD_
+#include "DDCommon.h"
+#include "FPCommon.h"
+#endif
+
 /**
  *  @defgroup CommBuffers CommBuffers
  *  @brief The communication buffers unit provides buffering services for
@@ -47,50 +55,30 @@
     COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages (channel 101)
     COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages (channel 102)
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages (channel 103)
+    COMM_BUFFER_IN_CAN_PC,                                 ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
+    COMM_BUFFER_OUT_CAN_PC,                                ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
 #endif
 #ifdef _DD_
     COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages (channel 1)
     COMM_BUFFER_OUT_CAN_DD_ALARM,                          ///< Buffer for outgoing DD alarm messages (channel 2)
-    COMM_BUFFER_IN_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages (channel 4)
+    COMM_BUFFER_OUT_CAN_FP_ALARM,                          ///< Buffer for incoming FP alarm messages (channel 4)
     COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages (channel 8)
     COMM_BUFFER_IN_CAN_TD_2_DD,                            ///< Buffer for incoming TD to DD messages (channel 10)
     COMM_BUFFER_OUT_CAN_DD_2_TD,                           ///< Buffer for outgoing DD to TD messages (channel 11)
-    COMM_BUFFER_OUT_CAN_DD_2_RO,                           ///< Buffer for outgoing DD to RO messages (channel 20)
-    COMM_BUFFER_IN_CAN_RO_2_DD,                            ///< Buffer for incoming RO to DD messages (channel 21)
     COMM_BUFFER_IN_CAN_TD_BROADCAST,                       ///< Buffer for incoming TD broadcast messages (channel 100)
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,                      ///< Buffer for outgoing DD broadcast messages (channel 101)
-    COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages (channel 102)
+    COMM_BUFFER_OUT_CAN_FP_BROADCAST,                      ///< Buffer for outgoing FP broadcast messages (channel 102)
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages (channel 103)
+    COMM_BUFFER_IN_DD_CAN_PC,                              ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
+    COMM_BUFFER_OUT_DD_CAN_PC,                             ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
+    COMM_BUFFER_IN_FP_CAN_PC,                              ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
+    COMM_BUFFER_OUT_FP_CAN_PC,                             ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
 #endif
-#ifdef _RO_
-    COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages (channel 1)
-    COMM_BUFFER_IN_CAN_DD_ALARM,                           ///< Buffer for incoming DD alarm messages (channel 2)
-    COMM_BUFFER_OUT_CAN_FP_ALARM,                          ///< Buffer for outgoing RO alarm messages (channel 4)
-    COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages (channel 8)
-    COMM_BUFFER_IN_CAN_DD_2_FP,                            ///< Buffer for incoming DD to RO messages (channel 20)
-    COMM_BUFFER_OUT_CAN_FP_2_DD,                           ///< Buffer for outgoing RO to DD messages (channel 21)
-    COMM_BUFFER_IN_CAN_TD_BROADCAST,                       ///< Buffer for incoming TD broadcast messages (channel 100)
-    COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages (channel 101)
-    COMM_BUFFER_OUT_CAN_FP_BROADCAST,                      ///< Buffer for incoming RO broadcast messages (channel 102)
-    COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages (channel 103)
-#endif
-    COMM_BUFFER_IN_CAN_PC,                                 ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
-    COMM_BUFFER_OUT_CAN_PC,                                ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
     NUM_OF_COMM_BUFFERS                                    ///< Number of CAN communication buffers
 } COMM_BUFFER_T;
 
 /**@}*/
 
-#ifdef _TD_
-#include "TDCommon.h"
-#endif
-#ifdef _DD_
-#include "DDCommon.h"
-#endif
-#ifdef _RO_
-#include "FPCommon.h"
-#endif
-
 /**
  *  @addtogroup CommBuffers
  *  @{