Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358)
@@ -49,13 +49,15 @@
 #include "VDateTime.h"
 #include "VAdjustmentAlarmVolume.h"
 #include "VBluetooth.h"
-#include "VDuetRoWaterDG.h"
+#include "VAdjustRoWaterMode.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"
@@ -106,6 +108,7 @@
 #include "VTreatmentTrends.h"
 #include "VTreatmentDryBicartDisconnect.h"
 #include "VWaterSampleData.h"
+#include "VTreatmentHDFData.h"
 // DG data
 #include "VDGDrainPumpData.h"
 #include "VDDHeatersData.h"
@@ -159,8 +162,12 @@
 #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"