Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -ra34d98a4021d683b0272ecfc741bf8567e28ab61 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision a34d98a4021d683b0272ecfc741bf8567e28ab61)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799)
@@ -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