Index: firmware/App/Drivers/ConductivitySensor.c
===================================================================
diff -u -r863f8f88c73ee5dd285242f6e131a14862b4f5c4 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/App/Drivers/ConductivitySensor.c	(.../ConductivitySensor.c)	(revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4)
+++ firmware/App/Drivers/ConductivitySensor.c	(.../ConductivitySensor.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -19,10 +19,10 @@
 #include <string.h>             // For memcpy
 
 #include "ConductivitySensor.h"
-#include "FpgaRO.h"
+#include "FpgaFP.h"
+#include "FPOperationModes.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
-#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "Utilities.h"