Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r84cde45256941a13f2c826cd35f0e0ba58a83df4 -r9f7c5de17f8e3d832da0888f138fb7602cc33a78
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 84cde45256941a13f2c826cd35f0e0ba58a83df4)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9f7c5de17f8e3d832da0888f138fb7602cc33a78)
@@ -28,17 +28,12 @@
 #include "Flow.h"
 #include "FlowSensor.h"
 #include "FluidPump.h"
-#include "FlushConcentrate.h"
-#include "FlushFilter.h"
-#include "FlushFilterDefeatured.h"
-#include "FlushPermeate.h"
 #include "FpgaDD.h"
 #include "FPModeFault.h"
 #include "FPModeInitPOST.h"
 #include "FPModeStandby.h"
 #include "FPOperationModes.h"
 #include "Heaters.h"
-#include "InletPressureCheck.h"
 #include "Level.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
@@ -58,6 +53,11 @@
 #include "ROPump.h"
 #include "SafetyShutdown.h"
 #include "SpentChamberFill.h"
+#include "StateFlushConcentrate.h"
+#include "StateFlushFilter.h"
+#include "StateFlushFilterDefeatured.h"
+#include "StateFlushPermeate.h"
+#include "StateInletPressureCheck.h"
 #include "SystemCommDD.h"
 #include "Temperature.h"
 #include "TestSupport.h"