Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f)
@@ -23,27 +23,43 @@
 #include "VEventSpy.h"
 
 // Project
-#include "MModel.h"
 #include "VView.h"
 
+#include "VSettings.h"
 #include "VAlarmStatus.h"
 #include "VPowerOff.h"
-
+// states data
+#include "VHDOperationModeData.h"
+#include "VPreTreatmentStatesData.h"
+#include "VHDTreatmentStatesData.h"
+// Pre-treatment
+#include "VPreTreatmentAdjustmentInitTreatment.h"
+#include "VDGFilterFlushData.h"
+#include "VPreTreatmentAdjustmentWaterSample.h"
+#include "VPreTreatmentAdjustmentConsumablesConfirm.h"
+#include "VPreTreatmentSelfTestNoCartridgeData.h"
+#include "VPreTreatmentAdjustmentDisposablesConfirm.h"
+#include "VPreTreatmentSelfTestDryData.h"
+#include "VPreTreatmentAdjustmentDisposablesPrime.h"
+#include "VPreTreatmentDisposablesPrimeData.h"
+#include "VPreTreatmentAdjustmentPatientConnectionBegin.h"
+#include "VPreTreatmentAdjustmentUltrafiltrationInit.h"
+#include "VPreTreatmentAdjustmentPatientConnectionConfirm.h"
+#include "VPreTreatmentAdjustmentStartTreatment.h"
+// In-treatment - Data
 #include "VTreatmentBloodFlow.h"
 #include "VTreatmentDialysateFlow.h"
 #include "VTreatmentUltrafiltration.h"
 #include "VTreatmentPressureOcclusion.h"
 #include "VTreatmentTime.h"
 #include "VTreatmentRanges.h"
-#include "VHDOperationModeData.h"
 #include "VTreatmentSalineData.h"
 #include "VTreatmentHeparinData.h"
 #include "VTreatmentRinsebackData.h"
 #include "VTreatmentRecirculateData.h"
 #include "VTreatmentBloodPrimeData.h"
-#include "VHDTreatmentStatesData.h"
 #include "VHDAccelerometerData.h"
-
+// DG data
 #include "VDGDrainPumpData.h"
 #include "VDGHeatersData.h"
 #include "VDGLoadCellReadingsData.h"
@@ -54,22 +70,21 @@
 #include "VDGTemperaturesData.h"
 #include "VDGValvesStatesData.h"
 #include "VDGAccelerometerData.h"
-
+// -----
 #include "VTreatmentCreate.h"
-#include "VPriming.h"
-#include "VTreatmentBegin.h"
+// ----- In-Treatment Adjustments
 #include "VTreatmentAdjustmentDuration.h"
 #include "VTreatmentAdjustmentFlows.h"
-#include "VTreatmentAdjustmentUltrafiltrationInit.h"
 #include "VTreatmentAdjustmentUltrafiltrationState.h"
 #include "VTreatmentAdjustmentUltrafiltrationEdit.h"
 #include "VTreatmentAdjustmentUltrafiltrationConfirm.h"
 #include "VTreatmentAdjustmentSaline.h"
 #include "VTreatmentAdjustmentHeparin.h"
 #include "VTreatmentAdjustmentRinseback.h"
 #include "VTreatmentAdjustmentRecirculate.h"
-#include "VTreatmentAdjustmentEnd.h"
 #include "VTreatmentAdjustmentPressuresLimits.h"
+// -----
+#include "VTreatmentAdjustmentEnd.h"
 #include "VTreatmentAdjustmentVersions.h"
 
 namespace Gui {