Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rc253d3ca9ef234e04747565e500faf88b07fc04e
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision c253d3ca9ef234e04747565e500faf88b07fc04e)
@@ -54,7 +54,7 @@
 // states data
 #include "VTDOpModeData.h"
 #include "VPreTreatmentStatesData.h"
-#include "VTDTreatmentStatesData.h"
+#include "VHDTreatmentStatesData.h"
 #include "VPostTreatmentStatesData.h"
 // Common treatment
 #include "VCommonAdjustmentVitals.h"
@@ -75,10 +75,9 @@
 // In-treatment - Data
 #include "VTreatmentBloodFlow.h"
 #include "VTreatmentDialysateFlow.h"
-#include "VTreatmentUltrafiltrationData.h"
+#include "VTreatmentUltrafiltration.h"
 #include "VTreatmentPressureOcclusion.h"
 #include "VTreatmentTime.h"
-#include "VTreatmentParametersSetPointData.h"
 #include "VTreatmentRanges.h"
 #include "VTreatmentSalineData.h"
 #include "VTreatmentHeparinData.h"
@@ -92,6 +91,7 @@
 #include "VHDAirBubbleData.h"
 #include "VTDAirTrapData.h"
 #include "VTDVoltageData.h"
+#include "VTDBloodPumpData.h"
 #include "VTDValvesData.h"
 #include "VTDBatteryData.h"
 #include "VTDSwitchesData.h"
@@ -108,8 +108,8 @@
 #include "VDGTemperaturesData.h"
 #include "VDGValvesStatesData.h"
 #include "VDGAccelerometerData.h"
-#include "VDDConductivityData.h"
-#include "VDDGenDialysateData.h"
+#include "VDGConductivityData.h"
+#include "VDDLevelData.h"
 // -----
 #include "VTreatmentCreate.h"
 // ----- In-Treatment Adjustments