Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rad6b3443575d3f6bbac52237866e19a212d36bc1 -r608780a6e5449b5a9710ac07299ec028117c9f4d
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ad6b3443575d3f6bbac52237866e19a212d36bc1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 608780a6e5449b5a9710ac07299ec028117c9f4d)
@@ -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"
@@ -176,6 +175,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -186,6 +186,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -219,6 +220,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )