Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r754427f339e660b7fa688e5e3becc587b30518a8 -r1a45eaee5e57add6f852e190a10cc8cf42672dc9
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 754427f339e660b7fa688e5e3becc587b30518a8)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 1a45eaee5e57add6f852e190a10cc8cf42672dc9)
@@ -20,7 +20,8 @@
 #include "DGDefs.h"
 #include "DGInterface.h"
 #include "ModeInitPOST.h"
-#include "ModeTreatment.h"
+#include "ModeTreatment.h"
+#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
 #include "Timers.h"
Index: firmware/App/HDCommon.h
===================================================================
diff -u -rc05775820109b5e83596c58a3b4248ac6cdb1d65 -r1a45eaee5e57add6f852e190a10cc8cf42672dc9
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision c05775820109b5e83596c58a3b4248ac6cdb1d65)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 1a45eaee5e57add6f852e190a10cc8cf42672dc9)
@@ -73,6 +73,8 @@
 //    #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
+//    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
+    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
 //    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute