Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -28,11 +28,16 @@
 
 #include "VAlarmStatus.h"
 #include "VPowerOff.h"
-
+// states data
 #include "VHDOperationModeData.h"
 #include "VPreTreatmentStatesData.h"
 #include "VHDTreatmentStatesData.h"
-
+// Pre-treatment
+#include "VDGFilterFlushData.h"
+#include "VPreTreatmentSelfTestNoCartridgeData.h"
+#include "VPreTreatmentSelfTestDryData.h"
+#include "VPreTreatmentPrimeData.h"
+// In-treatment - Data
 #include "VTreatmentBloodFlow.h"
 #include "VTreatmentDialysateFlow.h"
 #include "VTreatmentUltrafiltration.h"
@@ -45,7 +50,7 @@
 #include "VTreatmentRecirculateData.h"
 #include "VTreatmentBloodPrimeData.h"
 #include "VHDAccelerometerData.h"
-
+// DG data
 #include "VDGDrainPumpData.h"
 #include "VDGHeatersData.h"
 #include "VDGLoadCellReadingsData.h"
@@ -56,10 +61,10 @@
 #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"
@@ -70,8 +75,9 @@
 #include "VTreatmentAdjustmentHeparin.h"
 #include "VTreatmentAdjustmentRinseback.h"
 #include "VTreatmentAdjustmentRecirculate.h"
-#include "VTreatmentAdjustmentEnd.h"
 #include "VTreatmentAdjustmentPressuresLimits.h"
+// -----
+#include "VTreatmentAdjustmentEnd.h"
 #include "VTreatmentAdjustmentVersions.h"
 
 namespace Gui {