diff --git a/src/main/build/build_config.h b/src/main/build/build_config.h
index e396983f9f..56f82ddb5f 100644
--- a/src/main/build/build_config.h
+++ b/src/main/build/build_config.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#define UNUSED(x) (void)(x)
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
 #ifdef UNIT_TEST
diff --git a/src/main/common/printf.c b/src/main/common/printf.c
index 39d072dbe6..2a00c4a9e3 100644
--- a/src/main/common/printf.c
+++ b/src/main/common/printf.c
@@ -38,6 +38,8 @@
 
 #include "build/build_config.h"
 
+#include "common/utils.h"
+
 #include "drivers/serial.h"
 #include "io/serial.h"
 
diff --git a/src/main/common/utils.h b/src/main/common/utils.h
index 2b9d7d66e4..6958902b3e 100644
--- a/src/main/common/utils.h
+++ b/src/main/common/utils.h
@@ -43,8 +43,6 @@ http://resnet.uoregon.edu/~gurney_j/jmpc/bitwise.html
 #define BITCOUNT(x) (((BX_(x)+(BX_(x)>>4)) & 0x0F0F0F0F) % 255)
 #define BX_(x) ((x) - (((x)>>1)&0x77777777) - (((x)>>2)&0x33333333) - (((x)>>3)&0x11111111))
 
-#define UNUSED(x) (void)(x)
-
 /*
  * https://groups.google.com/forum/?hl=en#!msg/comp.lang.c/attFnqwhvGk/sGBKXvIkY3AJ
  * Return (v ? floor(log2(v)) : 0) when 0 <= v < 1<<[8, 16, 32, 64].
diff --git a/src/main/drivers/accgyro_mpu6050.c b/src/main/drivers/accgyro_mpu6050.c
index 5d2198524b..0bc1ba276e 100644
--- a/src/main/drivers/accgyro_mpu6050.c
+++ b/src/main/drivers/accgyro_mpu6050.c
@@ -21,10 +21,10 @@
 
 #include "platform.h"
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "nvic.h"
 
diff --git a/src/main/drivers/compass_ak8963.c b/src/main/drivers/compass_ak8963.c
index d8e8fa6d52..1f7da6aa90 100644
--- a/src/main/drivers/compass_ak8963.c
+++ b/src/main/drivers/compass_ak8963.c
@@ -22,11 +22,11 @@
 
 #include "platform.h"
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
 #include "common/axis.h"
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "system.h"
 #include "bus_i2c.h"
diff --git a/src/main/drivers/compass_ak8975.c b/src/main/drivers/compass_ak8975.c
index df6cfd4f10..0145148650 100644
--- a/src/main/drivers/compass_ak8975.c
+++ b/src/main/drivers/compass_ak8975.c
@@ -24,10 +24,9 @@
 
 #ifdef USE_MAG_AK8975
 
-#include "build/build_config.h"
-
 #include "common/axis.h"
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "system.h"
 #include "gpio.h"
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 531afe6053..0f0cb06751 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -21,7 +21,7 @@
 
 #include <platform.h>
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/gpio.h"
 #include "drivers/sound_beeper.h"
@@ -392,7 +392,7 @@ int beeperTableEntryCount(void)
 /*
  * Returns true if the beeper is on, false otherwise
  */
-bool isBeeperOn(void) 
+bool isBeeperOn(void)
 {
     return beeperIsOn;
 }
diff --git a/src/main/rx/ibus.c b/src/main/rx/ibus.c
index b84b5a44d4..e4e87e758d 100755
--- a/src/main/rx/ibus.c
+++ b/src/main/rx/ibus.c
@@ -29,7 +29,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 
diff --git a/src/main/rx/msp.c b/src/main/rx/msp.c
index 6bf1fb52f9..0d183c9123 100644
--- a/src/main/rx/msp.c
+++ b/src/main/rx/msp.c
@@ -22,7 +22,7 @@
 
 #ifndef SKIP_RX_MSP
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 #include "drivers/serial.h"
diff --git a/src/main/rx/nrf24_h8_3d.c b/src/main/rx/nrf24_h8_3d.c
index 8bffc39c52..c5bb10230e 100644
--- a/src/main/rx/nrf24_h8_3d.c
+++ b/src/main/rx/nrf24_h8_3d.c
@@ -26,8 +26,7 @@
 
 #ifdef USE_RX_H8_3D
 
-#include "build/build_config.h"
-
+#include "common/utils.h"
 
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/rx_xn297.h"
diff --git a/src/main/rx/nrf24_inav.c b/src/main/rx/nrf24_inav.c
index 673a150b98..5b7b98ad99 100644
--- a/src/main/rx/nrf24_inav.c
+++ b/src/main/rx/nrf24_inav.c
@@ -23,9 +23,10 @@
 
 #ifdef USE_RX_INAV
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
+#include "common/utils.h"
+
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/system.h"
 
diff --git a/src/main/rx/nrf24_v202.c b/src/main/rx/nrf24_v202.c
index 2fca7fd5f1..a744e964d8 100644
--- a/src/main/rx/nrf24_v202.c
+++ b/src/main/rx/nrf24_v202.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 
 #include <platform.h>
-#include "build/build_config.h"
 
+#include "common/utils.h"
 
 #ifdef USE_RX_V202
 
diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c
index 7bc5618836..b18b704928 100644
--- a/src/main/rx/sbus.c
+++ b/src/main/rx/sbus.c
@@ -23,7 +23,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 
diff --git a/src/main/rx/sumd.c b/src/main/rx/sumd.c
index 1393b8f6a5..37799aaba5 100644
--- a/src/main/rx/sumd.c
+++ b/src/main/rx/sumd.c
@@ -23,7 +23,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 #include "drivers/serial.h"
diff --git a/src/main/rx/sumh.c b/src/main/rx/sumh.c
index 74404c2f2b..3aebec42b4 100644
--- a/src/main/rx/sumh.c
+++ b/src/main/rx/sumh.c
@@ -29,7 +29,7 @@
 
 #ifdef SERIAL_RX
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 
diff --git a/src/main/scheduler/scheduler.c b/src/main/scheduler/scheduler.c
index 3a30d4a925..9edabadb60 100755
--- a/src/main/scheduler/scheduler.c
+++ b/src/main/scheduler/scheduler.c
@@ -23,12 +23,12 @@
 
 #include "platform.h"
 
-#include "build/build_config.h"
 #include "build/debug.h"
 
 #include "scheduler/scheduler.h"
 
 #include "common/maths.h"
+#include "common/utils.h"
 
 #include "drivers/system.h"
 
diff --git a/src/main/vcp/hw_config.c b/src/main/vcp/hw_config.c
index bb29148bf6..e72d7dc8a3 100644
--- a/src/main/vcp/hw_config.c
+++ b/src/main/vcp/hw_config.c
@@ -39,7 +39,7 @@
 #include "drivers/system.h"
 #include "drivers/nvic.h"
 
-#include "build/build_config.h"
+#include "common/utils.h"
 
 
 /* Private typedef -----------------------------------------------------------*/
@@ -68,7 +68,7 @@ void Set_System(void)
 {
 #if !defined(STM32L1XX_MD) && !defined(STM32L1XX_HD) && !defined(STM32L1XX_MD_PLUS)
     GPIO_InitTypeDef GPIO_InitStructure;
-#endif /* STM32L1XX_MD && STM32L1XX_XD */ 
+#endif /* STM32L1XX_MD && STM32L1XX_XD */
 
 #if defined(USB_USE_EXTERNAL_PULLUP)
     GPIO_InitTypeDef GPIO_InitStructure;
@@ -277,7 +277,7 @@ static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len)
 
 /*******************************************************************************
  * Function Name  : Send DATA .
- * Description    : send the data received from the STM32 to the PC through USB 
+ * Description    : send the data received from the STM32 to the PC through USB
  * Input          : None.
  * Output         : None.
  * Return         : None.