Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -re0c45c725884d780b76dd54a617ab6ed333d7ba2 -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision e0c45c725884d780b76dd54a617ab6ed333d7ba2)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -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