Index: CommBuffers.h
===================================================================
diff -u -r6145aa3d5ad75342f087f36b1fcd41af213f95f8 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de
--- CommBuffers.h	(.../CommBuffers.h)	(revision 6145aa3d5ad75342f087f36b1fcd41af213f95f8)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de)
@@ -66,20 +66,6 @@
     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)
-    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
     NUM_OF_COMM_BUFFERS                                    ///< Number of CAN communication buffers
 } COMM_BUFFER_T;
 
@@ -90,8 +76,6 @@
 #endif
 #ifdef _DD_
 #include "DDCommon.h"
-#endif
-#ifdef _RO_
 #include "FPCommon.h"
 #endif