Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rf054fdd3579dacb03b5b41a363e259949ff63965 -rb74d08ff24839ebbea51582772ed2b9588558ea0
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f054fdd3579dacb03b5b41a363e259949ff63965)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision b74d08ff24839ebbea51582772ed2b9588558ea0)
@@ -30,8 +30,6 @@
 #include "FpgaTD.h"
 #include "LevelSensors.h"
 #include "Messaging.h"
-#include "ModePostTreat.h"
-#include "ModePreTreat.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PAL.h"
@@ -43,6 +41,8 @@
 #include "Switches.h"
 #include "SystemCommTD.h"
 #include "Temperatures.h"
+#include "StateServices/TubeSetAutoEject.h"
+#include "StateServices/TubeSetInstall.h"
 #include "TxParams.h"
 #include "Utilities.h"
 #include "Valve3Way.h"