Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r740929e7f04220e1a74e1a6f8ce71129f40a7be1 -r11f666f254d9777558c332403557a3d94720b54a
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 740929e7f04220e1a74e1a6f8ce71129f40a7be1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 11f666f254d9777558c332403557a3d94720b54a)
@@ -31,7 +31,6 @@
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "Reservoirs.h"
-#include "ROPump.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -177,6 +176,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -187,6 +187,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -220,6 +221,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )