Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r0994065cce7875df917e6f96e7a0b78109980752
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0994065cce7875df917e6f96e7a0b78109980752)
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "AlarmMgmt.h"
+#include "Buttons.h"
 #include "ConsumableSelfTest.h"
 #include "FPGA.h"
 #include "ModePreTreat.h"
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5d13922ee2e8c851bc5db67ef4d0120b47de6f07 -r0994065cce7875df917e6f96e7a0b78109980752
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5d13922ee2e8c851bc5db67ef4d0120b47de6f07)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0994065cce7875df917e6f96e7a0b78109980752)
@@ -23,15 +23,10 @@
 #include "AlarmLamp.h"
 #include "Buttons.h"
 #include "ConsumableSelfTest.h"
-#include "DGInterface.h"
 #include "FPGA.h"
-#include "ModePostTreat.h"
-#include "ModePreTreat.h"
 #include "ModeStandby.h"
-#include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
 #include "OperationModes.h"
-#include "PresOccl.h"
 #include "RTC.h"
 #include "SampleWater.h"
 #include "SafetyShutdown.h"
@@ -40,7 +35,6 @@
 #include "TreatmentEnd.h"
 #include "TreatmentRecirc.h"
 #include "Utilities.h"
-#include "Valves.h"
 #include "WatchdogMgmt.h"
 
 /**
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5d13922ee2e8c851bc5db67ef4d0120b47de6f07 -r0994065cce7875df917e6f96e7a0b78109980752
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5d13922ee2e8c851bc5db67ef4d0120b47de6f07)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 0994065cce7875df917e6f96e7a0b78109980752)
@@ -18,15 +18,15 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "HDCommon.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "BloodPrime.h"
 #include "DGInterface.h"
-#include "DialInFlow.h"
+#include "DialInFlow.h"
 #include "DialOutFlow.h"
-#include "Dialysis.h"
+#include "Dialysis.h"
 #include "FluidLeak.h"
+#include "HDCommon.h"
 #include "Prime.h"
 #include "ModePostTreat.h"
 #include "ModePreTreat.h"