Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision c2f474ff07c98aa350c445a2474976a3cf985f40)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision becdb453874007323459a9afe9fe581b6c158902)
@@ -49,13 +49,14 @@
 #include "VDateTime.h"
 #include "VAdjustmentAlarmVolume.h"
 #include "VBluetooth.h"
-#include "VDuetRoWaterDG.h"
+#include "VRoWaterMode.h"
 #include "VCloudSync.h"
 #include "VHDUsageInfo.h"
 #include "VAdjustmentInstitutionalRecord.h"
 #include "VInstitutionalRecord.h"
 #include "VAdjustmentAdvancedInstitutionalRecord.h"
 #include "VAdvancedInstitutionalRecord.h"
+#include "VCalibrationSettings.h"
 // states data
 #include "VTDOpModeData.h"
 #include "VPreTreatmentStatesData.h"
@@ -92,7 +93,7 @@
 #include "VTreatmentBloodPrimeData.h"
 #include "VTreatmentStopData.h"
 #include "VHDAccelerometerData.h"
-#include "VHDSyringePumpData.h"
+#include "VTDSyringePumpData.h"
 #include "VHDBloodLeakData.h"
 #include "VTDAirBubbleData.h"
 #include "VTDAirPumpData.h"
@@ -104,7 +105,9 @@
 #include "VTDEjectorData.h"
 #include "VTDTemperatureData.h"
 #include "VTreatmentTrends.h"
+#include "VTreatmentDryBicartDisconnect.h"
 #include "VWaterSampleData.h"
+#include "VTreatmentHDFData.h"
 // DG data
 #include "VDGDrainPumpData.h"
 #include "VDDHeatersData.h"
@@ -158,8 +161,13 @@
 #include "VTreatmentAdjustmentIsolatedUFConfirm.h"
 #include "VTreatmentAdjustmentIsolatedUFDurationEdit.h"
 #include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h"
+#include "VTreatmentAdjustmentIsolatedUFState.h"
 #include "VTreatmentAdjustmentSetPoints.h"
 #include "VTreatmentAdjustmentVitalsAlarmLimits.h"
+#include "VTreatmentAdjustmentAutoSub.h"
+#include "VTreatmentAdjustmentHDFState.h"
+#include "VTreatmentAdjustmentHDF.h"
+#include "VTreatmentAdjustmentDryBicartDisconnect.h"
 // ----- Post-Treatment Adjustments
 #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h"
 #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h"