Index: FPGA.c
===================================================================
diff -u -r02636db73e2012d4ef5524028ddedb5511b18faf -r4b2d745f569ce6192dc485c389042faf12489d1e
--- FPGA.c	(.../FPGA.c)	(revision 02636db73e2012d4ef5524028ddedb5511b18faf)
+++ FPGA.c	(.../FPGA.c)	(revision 4b2d745f569ce6192dc485c389042faf12489d1e)
@@ -30,9 +30,6 @@
 #ifdef _DD_
 #include "FpgaDD.h"
 #include "OperationModes.h"
-#endif
-#ifdef _RO_
-#include "FpgaFP.h"
 #include "FPOperationModes.h"
 #endif
 #include "Messaging.h"
@@ -378,9 +375,6 @@
 #ifdef _DD_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, fpgaState )
 #endif
-#ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, fpgaState )
-#endif
             break;
     }
 
@@ -678,9 +672,6 @@
 #ifdef _DD_
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit );
 #endif
-#ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit );
-#endif
     }
 }
 
@@ -724,9 +715,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive )
-#endif
     }
 }
 
@@ -770,9 +758,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit )
-#endif
     }
 }
 
@@ -816,9 +801,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive )
-#endif
     }
 }
 
Index: MessagePayloads.h
===================================================================
diff -u -rd1b83b6f2db65e239c9bd17f0f75646ebbb070be -r4b2d745f569ce6192dc485c389042faf12489d1e
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision d1b83b6f2db65e239c9bd17f0f75646ebbb070be)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision 4b2d745f569ce6192dc485c389042faf12489d1e)
@@ -23,8 +23,6 @@
 #endif
 #ifdef _DD_
 #include "DDCommon.h"
-#endif
-#ifdef _RO_
 #include "FPCommon.h"
 #endif