Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r4c32cadadd4c8abdee1eab4ef6425f356f863547
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 4c32cadadd4c8abdee1eab4ef6425f356f863547)
@@ -49,7 +49,8 @@
 #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"
@@ -93,7 +94,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"
@@ -105,7 +106,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"
@@ -162,6 +165,10 @@
 #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"