Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r6534bec3cbe1f7938378e173df55d302f3fef70c -re0c45c725884d780b76dd54a617ab6ed333d7ba2
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 6534bec3cbe1f7938378e173df55d302f3fef70c)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision e0c45c725884d780b76dd54a617ab6ed333d7ba2)
@@ -19,9 +19,11 @@
 #define __CONDUCTIVITY_H__
 
 #include "DDCommon.h"
-#include "DDDefs.h"
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
 #include "ConductivityTeensy.h"
+#else
 #include "ConductivitySensors.h"
+#endif
 
 /**
  *  @defgroup Conductivity Conductivity
@@ -85,8 +87,6 @@
 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 );
 
 /**@}*/