Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -re0c45c725884d780b76dd54a617ab6ed333d7ba2 -rae31b4c999dccae70fb40fb9d98a4380ce2c7415
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision e0c45c725884d780b76dd54a617ab6ed333d7ba2)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision ae31b4c999dccae70fb40fb9d98a4380ce2c7415)
@@ -19,11 +19,9 @@
 #define __CONDUCTIVITY_H__
 
 #include "DDCommon.h"
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+#include "DDDefs.h"
 #include "ConductivityTeensy.h"
-#else
 #include "ConductivitySensors.h"
-#endif
 
 /**
  *  @defgroup Conductivity Conductivity
@@ -87,6 +85,8 @@
 BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
 BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message );
+BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message );
+BOOL testConductivitySensorTemperatureOverride( MESSAGE_T *message );
 
 /**@}*/