Index: Utilities.h
===================================================================
diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -re8dab6f6027e0e1d8deec121b609c15c2c331d12
--- Utilities.h	(.../Utilities.h)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
+++ Utilities.h	(.../Utilities.h)	(revision e8dab6f6027e0e1d8deec121b609c15c2c331d12)
@@ -24,9 +24,6 @@
 #ifdef _DD_
 #include "DDCommon.h"
 #endif
-#ifdef _RO_
-#include "FPCommon.h"
-#endif
 
 /**
  *  @defgroup Utilities Utilities
@@ -61,12 +58,8 @@
     TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES,                 ///< FPGA communication failure (NAK, CRC, timeout)
     TIME_WINDOWED_COUNT_FPGA_D12_PUMP_HALL_SENSOR_ERROR,    ///< FPGA fresh dialysate pump hall sensor failure
     TIME_WINDOWED_COUNT_FPGA_D48_PUMP_HALL_SENSOR_ERROR,    ///< FPGA spent dialysate pump hall sensor failure
-#endif
-#ifdef _RO_
     TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR,     ///< FPGA Conductivity sensor error
     TIME_WINDOWED_COUNT_FPGA_TEMPERATURE_SENSOR_ERROR,      ///< FPGA Temperature sensor error
-    TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES,                 ///< FPGA communication failure (NAK, CRC, timeout)
-    TIME_WINDOWED_COUNT_FPGA_DRAIN_PUMP_HALL_SENSOR_ERROR,  ///< FPGA Drain pump hall sensor failure
 #endif
     NUM_OF_TIME_WINDOWED_COUNTS                             ///< Number of pressure sensors
 } TIME_WINDOWED_COUNT_T;