Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r3c30d57c6cba7595b1e1d6b806d90ca151bc8db2 -r8f45330e0b1af61e029bece73c9f23669ada56c1
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 3c30d57c6cba7595b1e1d6b806d90ca151bc8db2)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 8f45330e0b1af61e029bece73c9f23669ada56c1)
@@ -32,13 +32,15 @@
 #include "VAdjustmentVersions.h"
 #include "VDateTime.h"
 #include "VNetworkModel.h"
+// Power on self test
+#include "VUIPowerOnSelfTest.h"
+#include "VHDPostFinalResultData.h"
 // states data
 #include "VHDOperationModeData.h"
 #include "VPreTreatmentStatesData.h"
 #include "VHDTreatmentStatesData.h"
 #include "VPostTreatmentStatesData.h"
 #include "VDisinfectStatesData.h"
-#include "VUIPostSingleResultData.h"
 // Pre-treatment
 #include "VPreTreatmentAdjustmentInitTreatment.h"
 #include "VDGFilterFlushData.h"
@@ -66,8 +68,6 @@
 #include "VTreatmentRecirculateData.h"
 #include "VTreatmentBloodPrimeData.h"
 #include "VHDAccelerometerData.h"
-#include "VHDPostSingleResultData.h"
-#include "VHDPostFinalResultData.h"
 // DG data
 #include "VDGDrainPumpData.h"
 #include "VDGHeatersData.h"
@@ -79,8 +79,6 @@
 #include "VDGTemperaturesData.h"
 #include "VDGValvesStatesData.h"
 #include "VDGAccelerometerData.h"
-#include "VDGPostSingleResultData.h"
-#include "VDGPostFinalResultData.h"
 // -----
 #include "VTreatmentCreate.h"
 // ----- In-Treatment Adjustments