Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r364c00d074d23989f2d714189a8c89964e32b458
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 364c00d074d23989f2d714189a8c89964e32b458)
@@ -439,7 +439,7 @@
         heatersStatus[ heater ].startHeaterSignal = FALSE;
 
         // Depending on which heater is called, go to different states
-        state = ( heater == DG_PRIMARY_HEATER ? HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET : HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET );
+        state = ( DG_PRIMARY_HEATER == heater ? HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET : HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET );
     }
 
     return state;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r364c00d074d23989f2d714189a8c89964e32b458
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 364c00d074d23989f2d714189a8c89964e32b458)
@@ -35,7 +35,6 @@
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
-#include "DialysateFlow.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
 #include "RTC.h"
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r364c00d074d23989f2d714189a8c89964e32b458
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 364c00d074d23989f2d714189a8c89964e32b458)
@@ -32,7 +32,6 @@
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
-#include "DialysateFlow.h"
 #include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"