Index: firmware/App/Modes/ModeDisinfect.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeDisinfect.c	(.../ModeDisinfect.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Modes/ModeDisinfect.c	(.../ModeDisinfect.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,8 +14,7 @@
  *
  **************************************************************************/
 
-#include <ModeDisinfect.h>
-#include "Common.h"
+#include "ModeDisinfect.h"
 #include "OperationModes.h"
 
 // ********** private data **********
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,8 +14,7 @@
  *
  **************************************************************************/
 
-#include <ModeDrain.h>
-#include "Common.h"
+#include "ModeDrain.h"
 #include "OperationModes.h"
 
 // ********** private data **********
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "OperationModes.h"
 #include "ModeFault.h"
 
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r4d27576bdd7843178d9b69ffff3584ee01ec24fe -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4d27576bdd7843178d9b69ffff3584ee01ec24fe)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -15,7 +15,6 @@
  **************************************************************************/
 
 #include "ModeFill.h"
-#include "Common.h"
 #include "OperationModes.h"
 #include "Timers.h"
 
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,8 +14,7 @@
  *
  *************************************************************************/
 
-#include <ModeFlush.h>
-#include "Common.h"
+#include "ModeFlush.h"
 #include "OperationModes.h"
 
 // ********** private data **********
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r07ae59288d41511e9c28460ced5c46fb870cc627 -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 07ae59288d41511e9c28460ced5c46fb870cc627)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "CPLD.h"
 #include "FPGA.h"
 #include "OperationModes.h"
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "OperationModes.h"
 #include "ModePostTreat.h"
 
Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "OperationModes.h"
 #include "ModeService.h"
 
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,7 +14,6 @@
  *
  **************************************************************************/
 
-#include "Common.h"
 #include "OperationModes.h"
 #include "ModeStandby.h"
 #include "CPLD.h"
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -r499e5de29e706d09f79ba22511068990c4044e84
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 499e5de29e706d09f79ba22511068990c4044e84)
@@ -14,13 +14,12 @@
  *
  **************************************************************************/
 
-#include <ModeDisinfect.h>
-#include <ModeDrain.h>
-#include <ModeFill.h>
-#include <ModeFlush.h>
+#include "ModeDisinfect.h"
+#include "ModeDrain.h"
+#include "ModeFill.h"
+#include "ModeFlush.h"
 #include "gio.h"
 
-#include "Common.h"
 #include "OperationModes.h"
 
 #include "ModeFault.h"