Index: AlarmMgmt.c
===================================================================
diff -u -r842d6d28b1f88d07b9aedfec86e6dc0b677ad669 -rcc8db062292cdcbdb29e4174af5976ccf150d0c0
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 842d6d28b1f88d07b9aedfec86e6dc0b677ad669)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision cc8db062292cdcbdb29e4174af5976ccf150d0c0)
@@ -19,8 +19,12 @@
 
 #define __ALARM_MGMT_C__
 
-#include "Messaging.h"
+#ifdef _RO_
+#include "FPOperationModes.h"
+#else
 #include "OperationModes.h"
+#endif
+#include "Messaging.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
 
Index: FPGA.c
===================================================================
diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -rcc8db062292cdcbdb29e4174af5976ccf150d0c0
--- FPGA.c	(.../FPGA.c)	(revision 809103b805b84e80dda7e3dd1e77a52330610666)
+++ FPGA.c	(.../FPGA.c)	(revision cc8db062292cdcbdb29e4174af5976ccf150d0c0)
@@ -25,15 +25,17 @@
 #include "FPGA.h"
 #ifdef _TD_
 #include "FpgaTD.h"
+#include "OperationModes.h"
 #endif
 #ifdef _DD_
 #include "FpgaDD.h"
+#include "OperationModes.h"
 #endif
 #ifdef _RO_
 #include "FpgaFP.h"
+#include "FPOperationModes.h"
 #endif
 #include "Messaging.h"
-#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "Timers.h"
 #include "Utilities.h"
Index: SystemComm.c
===================================================================
diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -rcc8db062292cdcbdb29e4174af5976ccf150d0c0
--- SystemComm.c	(.../SystemComm.c)	(revision 809103b805b84e80dda7e3dd1e77a52330610666)
+++ SystemComm.c	(.../SystemComm.c)	(revision cc8db062292cdcbdb29e4174af5976ccf150d0c0)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+
 #include <string.h>     // For memcpy()
 
 #include "can.h"
@@ -24,16 +25,18 @@
 #include "Comm.h"
 #include "Interrupts.h"
 #include "Messaging.h"
-#include "OperationModes.h"
 #include "SystemComm.h"
 #ifdef _TD_
 #include "SystemCommTD.h"
+#include "OperationModes.h"
 #endif
 #ifdef _DD_
 #include "SystemCommDD.h"
+#include "OperationModes.h"
 #endif
 #ifdef _RO_
 #include "SystemCommFP.h"
+#include "FPOperationModes.h"
 #endif
 #include "Timers.h"
 #include "Utilities.h"
Index: WatchdogMgmt.c
===================================================================
diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -rcc8db062292cdcbdb29e4174af5976ccf150d0c0
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 809103b805b84e80dda7e3dd1e77a52330610666)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision cc8db062292cdcbdb29e4174af5976ccf150d0c0)
@@ -18,18 +18,20 @@
 #ifdef _TD_
 #include "CpldInterface.h"
 #include "FpgaTD.h"
+#include "OperationModes.h"
 #endif
 #ifdef _DD_
 #include "FpgaDD.h"
 #include "SafetyShutdown.h"
+#include "OperationModes.h"
 #endif
 #ifdef _RO_
 #include "FpgaFP.h"
 #include "SafetyShutdown.h"
+#include "FPOperationModes.h"
 #endif
 //#include "InternalADC.h"
 #include "Messaging.h"
-#include "OperationModes.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"