Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -18,8 +18,8 @@
 #ifndef __CONDUCTIVITY_H__
 #define __CONDUCTIVITY_H__
 
-#include "ROCommon.h"
-#include "ConductivitySensors.h"
+#include "ConductivitySensor.h"
+#include "FPCommon.h"
 
 /**
  *  @defgroup Conductivity Conductivity