diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index f942a9cf2..a5620e92f 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -42,7 +42,7 @@
 
 #include "drivers/compass/compass.h"
 #include "drivers/sensor.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index 0edb7500a..1cb93d925 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -44,6 +44,7 @@
 #include "common/typeconversion.h"
 
 #include "drivers/system.h"
+#include "drivers/time.h"
 
 // For rcData, stopAllMotors, stopPwmAllMotors
 #include "config/feature.h"
diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c
index e86b730e7..855907816 100644
--- a/src/main/cms/cms_menu_blackbox.c
+++ b/src/main/cms/cms_menu_blackbox.c
@@ -44,7 +44,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 
diff --git a/src/main/cms/cms_menu_imu.c b/src/main/cms/cms_menu_imu.c
index dad85e2fb..046801d52 100644
--- a/src/main/cms/cms_menu_imu.c
+++ b/src/main/cms/cms_menu_imu.c
@@ -29,8 +29,6 @@
 
 #include "build/version.h"
 
-#include "drivers/system.h"
-
 #include "cms/cms.h"
 #include "cms/cms_types.h"
 #include "cms/cms_menu_imu.h"
diff --git a/src/main/cms/cms_menu_ledstrip.c b/src/main/cms/cms_menu_ledstrip.c
index c422845ff..a087d41d2 100644
--- a/src/main/cms/cms_menu_ledstrip.c
+++ b/src/main/cms/cms_menu_ledstrip.c
@@ -34,8 +34,6 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
-
 #include "fc/config.h"
 
 
diff --git a/src/main/cms/cms_menu_misc.c b/src/main/cms/cms_menu_misc.c
index b257fb25f..4a7c18561 100644
--- a/src/main/cms/cms_menu_misc.c
+++ b/src/main/cms/cms_menu_misc.c
@@ -26,7 +26,7 @@
 
 #include "build/version.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "cms/cms.h"
 #include "cms/cms_types.h"
diff --git a/src/main/drivers/accgyro/accgyro_adxl345.c b/src/main/drivers/accgyro/accgyro_adxl345.c
index e6be5fee1..da0253009 100644
--- a/src/main/drivers/accgyro/accgyro_adxl345.c
+++ b/src/main/drivers/accgyro/accgyro_adxl345.c
@@ -20,7 +20,6 @@
 
 #include <platform.h>
 
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
 
 #include "drivers/sensor.h"
diff --git a/src/main/drivers/accgyro/accgyro_l3g4200d.c b/src/main/drivers/accgyro/accgyro_l3g4200d.c
index 9b3c2fcef..b249840d5 100644
--- a/src/main/drivers/accgyro/accgyro_l3g4200d.c
+++ b/src/main/drivers/accgyro/accgyro_l3g4200d.c
@@ -20,15 +20,17 @@
 
 #include <platform.h>
 
-#include "drivers/system.h"
-#include "drivers/bus_i2c.h"
+#include "accgyro.h"
+#include "accgyro_l3g4200d.h"
 
 #include "common/maths.h"
 #include "common/axis.h"
 
+#include "drivers/bus_i2c.h"
+#include "drivers/time.h"
 #include "drivers/sensor.h"
-#include "accgyro.h"
-#include "accgyro_l3g4200d.h"
+#include "drivers/system.h"
+
 
 // L3G4200D, Standard address 0x68
 #define L3G4200D_ADDRESS         0x68
diff --git a/src/main/drivers/accgyro/accgyro_l3gd20.c b/src/main/drivers/accgyro/accgyro_l3gd20.c
index b3f46e313..55a6191f3 100644
--- a/src/main/drivers/accgyro/accgyro_l3gd20.c
+++ b/src/main/drivers/accgyro/accgyro_l3gd20.c
@@ -24,7 +24,7 @@
 
 #include "common/maths.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/io.h"
 #include "drivers/bus_spi.h"
 
diff --git a/src/main/drivers/accgyro/accgyro_lsm303dlhc.c b/src/main/drivers/accgyro/accgyro_lsm303dlhc.c
index ae7ce191e..924f2ab61 100644
--- a/src/main/drivers/accgyro/accgyro_lsm303dlhc.c
+++ b/src/main/drivers/accgyro/accgyro_lsm303dlhc.c
@@ -27,7 +27,7 @@
 #include "common/maths.h"
 #include "common/axis.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/io.h"
 #include "drivers/bus_i2c.h"
 
diff --git a/src/main/drivers/accgyro/accgyro_mma845x.c b/src/main/drivers/accgyro/accgyro_mma845x.c
index 47be311e6..9cf7ec6ec 100644
--- a/src/main/drivers/accgyro/accgyro_mma845x.c
+++ b/src/main/drivers/accgyro/accgyro_mma845x.c
@@ -20,7 +20,6 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
 #include "drivers/io.h"
 #include "drivers/bus_i2c.h"
 
diff --git a/src/main/drivers/accgyro/accgyro_mpu.c b/src/main/drivers/accgyro/accgyro_mpu.c
index 0b6087ea7..35e80f206 100644
--- a/src/main/drivers/accgyro/accgyro_mpu.c
+++ b/src/main/drivers/accgyro/accgyro_mpu.c
@@ -29,14 +29,14 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/nvic.h"
-
-#include "drivers/system.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
-
+#include "drivers/exti.h"
+#include "drivers/io.h"
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu3050.h"
 #include "accgyro_mpu6050.h"
diff --git a/src/main/drivers/accgyro/accgyro_mpu3050.c b/src/main/drivers/accgyro/accgyro_mpu3050.c
index 335e8f2df..c13d8ac1b 100644
--- a/src/main/drivers/accgyro/accgyro_mpu3050.c
+++ b/src/main/drivers/accgyro/accgyro_mpu3050.c
@@ -23,11 +23,12 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
-
+#include "drivers/exti.h"
 #include "drivers/sensor.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu3050.h"
diff --git a/src/main/drivers/accgyro/accgyro_mpu6050.c b/src/main/drivers/accgyro/accgyro_mpu6050.c
index 190f2109c..1e6bdac28 100644
--- a/src/main/drivers/accgyro/accgyro_mpu6050.c
+++ b/src/main/drivers/accgyro/accgyro_mpu6050.c
@@ -26,15 +26,14 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/nvic.h"
-
-#include "drivers/system.h"
-#include "drivers/gpio.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/exti.h"
+#include "drivers/gpio.h"
 #include "drivers/gyro_sync.h"
-
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu6050.h"
diff --git a/src/main/drivers/accgyro/accgyro_mpu6500.c b/src/main/drivers/accgyro/accgyro_mpu6500.c
index 52edb3412..4212eb7c6 100644
--- a/src/main/drivers/accgyro/accgyro_mpu6500.c
+++ b/src/main/drivers/accgyro/accgyro_mpu6500.c
@@ -24,12 +24,12 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
 #include "drivers/exti.h"
 #include "drivers/gpio.h"
 #include "drivers/gyro_sync.h"
-
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu6500.h"
diff --git a/src/main/drivers/accgyro/accgyro_spi_bmi160.c b/src/main/drivers/accgyro/accgyro_spi_bmi160.c
index ef22644d2..3852fa34d 100644
--- a/src/main/drivers/accgyro/accgyro_spi_bmi160.c
+++ b/src/main/drivers/accgyro/accgyro_spi_bmi160.c
@@ -37,13 +37,13 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
-#include "drivers/nvic.h"
 #include "drivers/bus_spi.h"
-
+#include "drivers/exti.h"
+#include "drivers/io.h"
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_spi_bmi160.h"
 
diff --git a/src/main/drivers/accgyro/accgyro_spi_icm20689.c b/src/main/drivers/accgyro/accgyro_spi_icm20689.c
index 329aae53c..9764f6173 100644
--- a/src/main/drivers/accgyro/accgyro_spi_icm20689.c
+++ b/src/main/drivers/accgyro/accgyro_spi_icm20689.c
@@ -24,14 +24,14 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
-#include "drivers/exti.h"
-#include "drivers/io.h"
 #include "drivers/bus_spi.h"
+#include "drivers/exti.h"
 #include "drivers/gpio.h"
 #include "drivers/gyro_sync.h"
-
+#include "drivers/io.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_spi_icm20689.h"
diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu6000.c b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c
index a876c0c8b..fd9455a55 100644
--- a/src/main/drivers/accgyro/accgyro_spi_mpu6000.c
+++ b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c
@@ -30,14 +30,14 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
 #include "drivers/bus_spi.h"
-
+#include "drivers/exti.h"
 #include "drivers/gyro_sync.h"
-
+#include "drivers/io.h"
+#include "drivers/time.h"
 #include "drivers/sensor.h"
+#include "drivers/system.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 
diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu6500.c b/src/main/drivers/accgyro/accgyro_spi_mpu6500.c
index bea575c04..e477c3a04 100755
--- a/src/main/drivers/accgyro/accgyro_spi_mpu6500.c
+++ b/src/main/drivers/accgyro/accgyro_spi_mpu6500.c
@@ -23,12 +23,12 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
+#include "drivers/bus_spi.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/bus_spi.h"
-
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu6500.h"
diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu9250.c b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c
index 3940a53d6..7467bf8a6 100644
--- a/src/main/drivers/accgyro/accgyro_spi_mpu9250.c
+++ b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c
@@ -33,18 +33,18 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/io.h"
-
-#include "drivers/system.h"
-#include "drivers/exti.h"
-#include "drivers/bus_spi.h"
-#include "drivers/gyro_sync.h"
-#include "drivers/light_led.h"
-
-#include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
 #include "drivers/accgyro/accgyro_mpu.h"
 #include "drivers/accgyro/accgyro_spi_mpu9250.h"
+#include "drivers/bus_spi.h"
+#include "drivers/exti.h"
+#include "drivers/gyro_sync.h"
+#include "drivers/io.h"
+#include "drivers/light_led.h"
+#include "drivers/sensor.h"
+#include "drivers/time.h"
+#include "drivers/system.h"
+
 
 static void mpu9250AccAndGyroInit(gyroDev_t *gyro);
 
diff --git a/src/main/drivers/adc.c b/src/main/drivers/adc.c
index d8ce0eb9a..1f3fcd428 100644
--- a/src/main/drivers/adc.c
+++ b/src/main/drivers/adc.c
@@ -23,8 +23,6 @@
 #include "build/build_config.h"
 #include "build/debug.h"
 
-#include "drivers/system.h"
-
 #include "adc.h"
 #include "adc_impl.h"
 
diff --git a/src/main/drivers/adc_stm32f10x.c b/src/main/drivers/adc_stm32f10x.c
index 221f7e3b5..931c2cc1d 100644
--- a/src/main/drivers/adc_stm32f10x.c
+++ b/src/main/drivers/adc_stm32f10x.c
@@ -26,7 +26,6 @@
 #include "build/build_config.h"
 
 #include "drivers/accgyro/accgyro.h"
-#include "drivers/system.h"
 #include "drivers/sensor.h"
 #include "adc.h"
 #include "adc_impl.h"
diff --git a/src/main/drivers/adc_stm32f30x.c b/src/main/drivers/adc_stm32f30x.c
index 49d58a87e..1626a27b4 100644
--- a/src/main/drivers/adc_stm32f30x.c
+++ b/src/main/drivers/adc_stm32f30x.c
@@ -22,14 +22,13 @@
 #include "platform.h"
 
 #include "drivers/accgyro/accgyro.h"
-#include "drivers/system.h"
 #include "drivers/gpio.h"
-
+#include "drivers/io.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
 
 #include "adc.h"
 #include "adc_impl.h"
-#include "drivers/io.h"
 #include "rcc.h"
 #include "dma.h"
 
diff --git a/src/main/drivers/barometer/barometer_bmp085.c b/src/main/drivers/barometer/barometer_bmp085.c
index a1c36c09b..48aa8a604 100644
--- a/src/main/drivers/barometer/barometer_bmp085.c
+++ b/src/main/drivers/barometer/barometer_bmp085.c
@@ -24,12 +24,12 @@
 
 #include "barometer.h"
 
-#include "drivers/gpio.h"
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
-#include "drivers/nvic.h"
 #include "drivers/exti.h"
+#include "drivers/gpio.h"
 #include "drivers/io.h"
+#include "drivers/nvic.h"
+#include "drivers/time.h"
 
 #include "barometer_bmp085.h"
 
diff --git a/src/main/drivers/barometer/barometer_bmp280.c b/src/main/drivers/barometer/barometer_bmp280.c
index bc079f14c..095b0b957 100644
--- a/src/main/drivers/barometer/barometer_bmp280.c
+++ b/src/main/drivers/barometer/barometer_bmp280.c
@@ -24,8 +24,8 @@
 
 #include "barometer.h"
 
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/time.h"
 
 #include "barometer_bmp280.h"
 #include "barometer_spi_bmp280.h"
diff --git a/src/main/drivers/barometer/barometer_ms5611.c b/src/main/drivers/barometer/barometer_ms5611.c
index 70693221f..5ea55e3a6 100644
--- a/src/main/drivers/barometer/barometer_ms5611.c
+++ b/src/main/drivers/barometer/barometer_ms5611.c
@@ -25,9 +25,9 @@
 #include "barometer.h"
 #include "barometer_spi_ms5611.h"
 
-#include "drivers/gpio.h"
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/gpio.h"
+#include "drivers/time.h"
 
 // MS5611, Standard address 0x77
 #define MS5611_ADDR                 0x77
diff --git a/src/main/drivers/bus_i2c_hal.c b/src/main/drivers/bus_i2c_hal.c
index 1eb51855c..006a19c1a 100644
--- a/src/main/drivers/bus_i2c_hal.c
+++ b/src/main/drivers/bus_i2c_hal.c
@@ -20,14 +20,15 @@
 
 #include <platform.h>
 
-#include "drivers/io.h"
-#include "drivers/system.h"
-
 #include "drivers/bus_i2c.h"
+#include "drivers/io.h"
 #include "drivers/nvic.h"
+#include "drivers/time.h"
+
 #include "io_impl.h"
 #include "rcc.h"
 
+
 #if !defined(SOFT_I2C) && defined(USE_I2C)
 
 #define CLOCKSPEED 800000    // i2c clockspeed 400kHz default (conform specs), 800kHz  and  1200kHz (Betaflight default)
diff --git a/src/main/drivers/bus_i2c_stm32f10x.c b/src/main/drivers/bus_i2c_stm32f10x.c
index 9c21da013..7cd909d54 100644
--- a/src/main/drivers/bus_i2c_stm32f10x.c
+++ b/src/main/drivers/bus_i2c_stm32f10x.c
@@ -22,7 +22,7 @@
 #include <platform.h>
 
 #include "drivers/io.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/nvic.h"
diff --git a/src/main/drivers/compass/compass_ak8963.c b/src/main/drivers/compass/compass_ak8963.c
index e43df108e..80c847ff8 100644
--- a/src/main/drivers/compass/compass_ak8963.c
+++ b/src/main/drivers/compass/compass_ak8963.c
@@ -28,11 +28,11 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
-
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "drivers/compass/compass.h"
 
 #include "drivers/accgyro/accgyro.h"
diff --git a/src/main/drivers/compass/compass_ak8975.c b/src/main/drivers/compass/compass_ak8975.c
index 8c0b908e0..d6413dad3 100644
--- a/src/main/drivers/compass/compass_ak8975.c
+++ b/src/main/drivers/compass/compass_ak8975.c
@@ -28,13 +28,12 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
-#include "drivers/gpio.h"
 #include "drivers/bus_i2c.h"
-
+#include "drivers/gpio.h"
 #include "drivers/sensor.h"
-#include "compass.h"
+#include "drivers/time.h"
 
+#include "compass.h"
 #include "compass_ak8975.h"
 
 // This sensor is available in MPU-9150.
diff --git a/src/main/drivers/compass/compass_hmc5883l.c b/src/main/drivers/compass/compass_hmc5883l.c
index 3fb86807b..a0366ee19 100644
--- a/src/main/drivers/compass/compass_hmc5883l.c
+++ b/src/main/drivers/compass/compass_hmc5883l.c
@@ -29,14 +29,14 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
-#include "drivers/nvic.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/exti.h"
+#include "drivers/io.h"
 #include "drivers/light_led.h"
-
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "compass.h"
 
 #include "compass_hmc5883l.h"
diff --git a/src/main/drivers/display_ug2864hsweg01.c b/src/main/drivers/display_ug2864hsweg01.c
index 173dafe0e..9c14f1562 100644
--- a/src/main/drivers/display_ug2864hsweg01.c
+++ b/src/main/drivers/display_ug2864hsweg01.c
@@ -21,7 +21,6 @@
 #include "platform.h"
 
 #include "drivers/bus_i2c.h"
-#include "drivers/system.h"
 
 #include "display_ug2864hsweg01.h"
 
diff --git a/src/main/drivers/flash_m25p16.c b/src/main/drivers/flash_m25p16.c
index 78b68441c..d816fddba 100644
--- a/src/main/drivers/flash_m25p16.c
+++ b/src/main/drivers/flash_m25p16.c
@@ -24,9 +24,9 @@
 
 #include "flash.h"
 #include "flash_m25p16.h"
-#include "drivers/io.h"
 #include "drivers/bus_spi.h"
-#include "drivers/system.h"
+#include "drivers/io.h"
+#include "drivers/time.h"
 
 #define M25P16_INSTRUCTION_RDID             0x9F
 #define M25P16_INSTRUCTION_READ_BYTES       0x03
diff --git a/src/main/drivers/light_ws2811strip_stdperiph.c b/src/main/drivers/light_ws2811strip_stdperiph.c
index b94071bb5..50f3b019e 100644
--- a/src/main/drivers/light_ws2811strip_stdperiph.c
+++ b/src/main/drivers/light_ws2811strip_stdperiph.c
@@ -28,7 +28,6 @@
 #include "common/color.h"
 #include "light_ws2811strip.h"
 #include "dma.h"
-#include "drivers/system.h"
 #include "rcc.h"
 #include "timer.h"
 
diff --git a/src/main/drivers/max7456.c b/src/main/drivers/max7456.c
index c4beeb467..59297b2ba 100644
--- a/src/main/drivers/max7456.c
+++ b/src/main/drivers/max7456.c
@@ -28,14 +28,14 @@
 #include "common/printf.h"
 
 #include "drivers/bus_spi.h"
-#include "drivers/light_led.h"
-#include "drivers/io.h"
-#include "drivers/system.h"
-#include "drivers/nvic.h"
 #include "drivers/dma.h"
+#include "drivers/io.h"
+#include "drivers/light_led.h"
+#include "drivers/max7456.h"
+#include "drivers/max7456_symbols.h"
+#include "drivers/nvic.h"
+#include "drivers/time.h"
 #include "drivers/vcd.h"
-#include "max7456.h"
-#include "max7456_symbols.h"
 
 // VM0 bits
 #define VIDEO_BUFFER_DISABLE        0x01
diff --git a/src/main/drivers/pwm_esc_detect.c b/src/main/drivers/pwm_esc_detect.c
index 26cb3a61c..2251c363e 100644
--- a/src/main/drivers/pwm_esc_detect.c
+++ b/src/main/drivers/pwm_esc_detect.c
@@ -24,7 +24,7 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/io.h"
 #include "pwm_esc_detect.h"
 #include "timer.h"
diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
index 035688529..1624598a5 100644
--- a/src/main/drivers/pwm_output.c
+++ b/src/main/drivers/pwm_output.c
@@ -21,7 +21,7 @@
 #include <math.h>
 
 #include "platform.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "drivers/io.h"
 #include "pwm_output.h"
diff --git a/src/main/drivers/pwm_output_dshot.c b/src/main/drivers/pwm_output_dshot.c
index a5d0c5343..38a4c1ccd 100644
--- a/src/main/drivers/pwm_output_dshot.c
+++ b/src/main/drivers/pwm_output_dshot.c
@@ -32,7 +32,6 @@
 #include "pwm_output.h"
 #include "drivers/nvic.h"
 #include "dma.h"
-#include "drivers/system.h"
 #include "rcc.h"
 
 static uint8_t dmaMotorTimerCount = 0;
diff --git a/src/main/drivers/pwm_output_dshot_hal.c b/src/main/drivers/pwm_output_dshot_hal.c
index 6c38b57bc..01083add6 100644
--- a/src/main/drivers/pwm_output_dshot_hal.c
+++ b/src/main/drivers/pwm_output_dshot_hal.c
@@ -27,7 +27,6 @@
 #include "pwm_output.h"
 #include "drivers/nvic.h"
 #include "dma.h"
-#include "drivers/system.h"
 #include "rcc.h"
 
 static uint8_t dmaMotorTimerCount = 0;
diff --git a/src/main/drivers/rx_nrf24l01.c b/src/main/drivers/rx_nrf24l01.c
index 9aa941a4f..61d568a87 100644
--- a/src/main/drivers/rx_nrf24l01.c
+++ b/src/main/drivers/rx_nrf24l01.c
@@ -30,10 +30,10 @@
 
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
-#include "io_impl.h"
-#include "rx_spi.h"
-#include "rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/io_impl.h"
+#include "drivers/rx_spi.h"
+#include "drivers/rx_nrf24l01.h"
+#include "drivers/time.h"
 
 #define NRF24_CE_HI()   {IOHi(DEFIO_IO(RX_CE_PIN));}
 #define NRF24_CE_LO()   {IOLo(DEFIO_IO(RX_CE_PIN));}
diff --git a/src/main/drivers/rx_pwm.c b/src/main/drivers/rx_pwm.c
index f7e103666..97c5822ea 100644
--- a/src/main/drivers/rx_pwm.c
+++ b/src/main/drivers/rx_pwm.c
@@ -27,8 +27,6 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
-
 #include "drivers/nvic.h"
 #include "drivers/io.h"
 #include "timer.h"
diff --git a/src/main/drivers/sdcard.c b/src/main/drivers/sdcard.c
index 18e486b96..4181fed7e 100644
--- a/src/main/drivers/sdcard.c
+++ b/src/main/drivers/sdcard.c
@@ -27,7 +27,7 @@
 #include "dma.h"
 
 #include "drivers/bus_spi.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "sdcard.h"
 #include "sdcard_standard.h"
diff --git a/src/main/drivers/serial_escserial.c b/src/main/drivers/serial_escserial.c
index 59e14ed0f..5595e5c50 100644
--- a/src/main/drivers/serial_escserial.c
+++ b/src/main/drivers/serial_escserial.c
@@ -34,9 +34,9 @@ typedef enum {
 
 #include "common/utils.h"
 
-#include "drivers/nvic.h"
-#include "drivers/system.h"
 #include "drivers/io.h"
+#include "drivers/nvic.h"
+#include "drivers/time.h"
 #include "timer.h"
 
 #include "serial.h"
diff --git a/src/main/drivers/serial_softserial.c b/src/main/drivers/serial_softserial.c
index 105b0c0b0..7540a521b 100644
--- a/src/main/drivers/serial_softserial.c
+++ b/src/main/drivers/serial_softserial.c
@@ -35,7 +35,6 @@
 #include "common/utils.h"
 
 #include "drivers/nvic.h"
-#include "drivers/system.h"
 #include "drivers/io.h"
 #include "timer.h"
 
diff --git a/src/main/drivers/serial_usb_vcp.c b/src/main/drivers/serial_usb_vcp.c
index 04395591b..2ed3ee173 100644
--- a/src/main/drivers/serial_usb_vcp.c
+++ b/src/main/drivers/serial_usb_vcp.c
@@ -39,7 +39,7 @@ USBD_HandleTypeDef USBD_Device;
 #include "hw_config.h"
 #endif
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "serial.h"
 #include "serial_usb_vcp.h"
diff --git a/src/main/drivers/sonar_hcsr04.c b/src/main/drivers/sonar_hcsr04.c
index f485620f7..8a903d6b2 100644
--- a/src/main/drivers/sonar_hcsr04.c
+++ b/src/main/drivers/sonar_hcsr04.c
@@ -22,11 +22,11 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
-#include "drivers/nvic.h"
-#include "drivers/io.h"
 #include "drivers/exti.h"
-#include "sonar_hcsr04.h"
+#include "drivers/io.h"
+#include "drivers/nvic.h"
+#include "drivers/sonar_hcsr04.h"
+#include "drivers/time.h"
 
 /* HC-SR04 consists of ultrasonic transmitter, receiver, and control circuits.
  * When triggered it sends out a series of 40KHz ultrasonic pulses and receives
diff --git a/src/main/drivers/sound_beeper.c b/src/main/drivers/sound_beeper.c
index 543dbffeb..04a67f41d 100644
--- a/src/main/drivers/sound_beeper.c
+++ b/src/main/drivers/sound_beeper.c
@@ -20,7 +20,6 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
 #include "drivers/io.h"
 
 #include "sound_beeper.h"
diff --git a/src/main/drivers/system.h b/src/main/drivers/system.h
index 5ac340c31..b898c9901 100644
--- a/src/main/drivers/system.h
+++ b/src/main/drivers/system.h
@@ -21,12 +21,6 @@
 #include <stdbool.h>
 
 void systemInit(void);
-void delayMicroseconds(uint32_t us);
-void delay(uint32_t ms);
-
-uint32_t micros(void);
-uint32_t microsISR(void);
-uint32_t millis(void);
 
 typedef enum {
     FAILURE_DEVELOPER = 0,
diff --git a/src/main/drivers/time.h b/src/main/drivers/time.h
new file mode 100644
index 000000000..8e2ddc153
--- /dev/null
+++ b/src/main/drivers/time.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of Cleanflight.
+ *
+ * Cleanflight is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Cleanflight is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#include "common/time.h"
+
+void delayMicroseconds(timeUs_t us);
+void delay(timeMs_t ms);
+
+timeUs_t micros(void);
+timeUs_t microsISR(void);
+timeMs_t millis(void);
+
+uint32_t ticks(void);
+timeDelta_t ticks_diff_us(uint32_t begin, uint32_t end);
diff --git a/src/main/drivers/timer_hal.c b/src/main/drivers/timer_hal.c
index bcc199ab7..350c1b432 100644
--- a/src/main/drivers/timer_hal.c
+++ b/src/main/drivers/timer_hal.c
@@ -30,7 +30,6 @@
 
 #include "drivers/io.h"
 #include "rcc.h"
-#include "drivers/system.h"
 
 #include "timer.h"
 #include "timer_impl.h"
diff --git a/src/main/drivers/usb_io.c b/src/main/drivers/usb_io.c
index eb41809ef..3de4bd030 100644
--- a/src/main/drivers/usb_io.c
+++ b/src/main/drivers/usb_io.c
@@ -23,7 +23,7 @@
 #ifdef USE_VCP
 
 #include "drivers/io.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "usb_io.h"
 #include "sdcard.h"
 
diff --git a/src/main/drivers/vtx_rtc6705.c b/src/main/drivers/vtx_rtc6705.c
index f92a6d10b..eb1d90ab5 100644
--- a/src/main/drivers/vtx_rtc6705.c
+++ b/src/main/drivers/vtx_rtc6705.c
@@ -31,10 +31,11 @@
 
 #include "common/maths.h"
 
-#include "vtx_rtc6705.h"
-#include "drivers/io.h"
 #include "drivers/bus_spi.h"
-#include "drivers/system.h"
+#include "drivers/io.h"
+#include "drivers/time.h"
+#include "drivers/vtx_rtc6705.h"
+
 
 #define RTC6705_SET_HEAD 0x3210 //fosc=8mhz r=400
 #define RTC6705_SET_A1 0x8F3031 //5865
diff --git a/src/main/drivers/vtx_rtc6705_soft_spi.c b/src/main/drivers/vtx_rtc6705_soft_spi.c
index 0acd4e683..cb4597e3e 100644
--- a/src/main/drivers/vtx_rtc6705_soft_spi.c
+++ b/src/main/drivers/vtx_rtc6705_soft_spi.c
@@ -24,10 +24,9 @@
 
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
-#include "drivers/system.h"
-#include "light_led.h"
-
-#include "vtx_rtc6705.h"
+#include "drivers/light_led.h"
+#include "drivers/time.h"
+#include "drivers/vtx_rtc6705.h"
 
 #define DP_5G_MASK                  0x7000
 #define PA5G_BS_MASK                0x0E00
diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index 205aebea5..5c6e6ddcf 100755
--- a/src/main/fc/cli.c
+++ b/src/main/fc/cli.c
@@ -71,6 +71,7 @@ extern uint8_t __config_end;
 #include "drivers/sonar_hcsr04.h"
 #include "drivers/stack_check.h"
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/vcd.h"
 
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index 863e363ad..b70b08719 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -33,9 +33,9 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/light_led.h"
-#include "drivers/system.h"
 #include "drivers/gyro_sync.h"
+#include "drivers/light_led.h"
+#include "drivers/time.h"
 
 #include "sensors/acceleration.h"
 #include "sensors/barometer.h"
diff --git a/src/main/fc/fc_dispatch.c b/src/main/fc/fc_dispatch.c
index 5080f8891..1e50135dd 100644
--- a/src/main/fc/fc_dispatch.c
+++ b/src/main/fc/fc_dispatch.c
@@ -23,7 +23,8 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
+
 #include "fc/fc_dispatch.h"
 
 static dispatchEntry_t *head = NULL;
diff --git a/src/main/fc/fc_hardfaults.c b/src/main/fc/fc_hardfaults.c
index 5164cc00f..cf9c50bb2 100644
--- a/src/main/fc/fc_hardfaults.c
+++ b/src/main/fc/fc_hardfaults.c
@@ -21,7 +21,7 @@
 #include "platform.h"
 
 #include "drivers/light_led.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/transponder_ir.h"
 
 #include "fc/fc_init.h"
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index f64f91128..1442ab3a9 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -39,6 +39,7 @@
 #include "drivers/nvic.h"
 #include "drivers/sensor.h"
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/light_led.h"
diff --git a/src/main/fc/rc_adjustments.c b/src/main/fc/rc_adjustments.c
index f0acda3e0..2fbba702b 100644
--- a/src/main/fc/rc_adjustments.c
+++ b/src/main/fc/rc_adjustments.c
@@ -31,7 +31,7 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c
index bdc5e2ae9..0bcdfe7cb 100644
--- a/src/main/fc/rc_controls.c
+++ b/src/main/fc/rc_controls.c
@@ -34,8 +34,6 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
-
 #include "fc/config.h"
 #include "fc/fc_core.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c
index 1527ed4fc..bf21c74d8 100644
--- a/src/main/flight/failsafe.c
+++ b/src/main/flight/failsafe.c
@@ -27,7 +27,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/flight/imu.c b/src/main/flight/imu.c
index 39d3a36ff..a0670cb2d 100644
--- a/src/main/flight/imu.c
+++ b/src/main/flight/imu.c
@@ -32,7 +32,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/runtime_config.h"
 
diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
index e3a753937..820c7a047 100755
--- a/src/main/flight/mixer.c
+++ b/src/main/flight/mixer.c
@@ -32,9 +32,9 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
 #include "drivers/pwm_output.h"
 #include "drivers/pwm_esc_detect.h"
+#include "drivers/time.h"
 
 #include "io/motors.h"
 
diff --git a/src/main/flight/navigation.c b/src/main/flight/navigation.c
index 905589edd..c6752c919 100644
--- a/src/main/flight/navigation.c
+++ b/src/main/flight/navigation.c
@@ -34,7 +34,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/fc_core.h"
diff --git a/src/main/flight/servos.c b/src/main/flight/servos.c
index c8eb79f77..c2113e0c3 100755
--- a/src/main/flight/servos.c
+++ b/src/main/flight/servos.c
@@ -35,7 +35,6 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/pwm_output.h"
-#include "drivers/system.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 655d0ea91..9b610eadf 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -27,7 +27,7 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/sound_beeper.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/io/dashboard.c b/src/main/io/dashboard.c
index 1cc421bc3..a185da7a3 100644
--- a/src/main/io/dashboard.c
+++ b/src/main/io/dashboard.c
@@ -31,9 +31,9 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
 #include "drivers/display.h"
 #include "drivers/display_ug2864hsweg01.h"
+#include "drivers/time.h"
 
 #include "cms/cms.h"
 
diff --git a/src/main/io/displayport_msp.c b/src/main/io/displayport_msp.c
index dc8088ef4..6753a3f23 100644
--- a/src/main/io/displayport_msp.c
+++ b/src/main/io/displayport_msp.c
@@ -30,7 +30,6 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/display.h"
-#include "drivers/system.h"
 
 #include "fc/fc_msp.h"
 
diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index 11c9359a1..42c6d3d45 100755
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -38,11 +38,8 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
 #include "drivers/light_led.h"
-
-#include "drivers/light_led.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/dashboard.h"
 #include "io/gps.h"
diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c
index 9740daa50..e664e6221 100644
--- a/src/main/io/ledstrip.c
+++ b/src/main/io/ledstrip.c
@@ -40,7 +40,6 @@
 
 #include "drivers/light_ws2811strip.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index 16658509e..e004589ac 100755
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -53,9 +53,9 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/max7456_symbols.h"
 #include "drivers/display.h"
-#include "drivers/system.h"
+#include "drivers/max7456_symbols.h"
+#include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
 #include "io/asyncfatfs/asyncfatfs.h"
diff --git a/src/main/io/osd_slave.c b/src/main/io/osd_slave.c
index b8a6ff6ca..baea793bf 100644
--- a/src/main/io/osd_slave.c
+++ b/src/main/io/osd_slave.c
@@ -32,9 +32,9 @@
 #include "common/printf.h"
 #include "common/utils.h"
 
-#include "drivers/max7456_symbols.h"
 #include "drivers/display.h"
-#include "drivers/system.h"
+#include "drivers/max7456_symbols.h"
+#include "drivers/time.h"
 
 #include "io/osd_slave.h"
 
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index ccf2aff0e..3754c3ac3 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -30,6 +30,7 @@
 
 #include "fc/config.h"
 
+#include "drivers/time.h"
 #include "drivers/system.h"
 #include "drivers/serial.h"
 #if defined(USE_SOFTSERIAL1) || defined(USE_SOFTSERIAL2)
diff --git a/src/main/io/serial_4way.c b/src/main/io/serial_4way.c
index c1096cd77..fdb028629 100644
--- a/src/main/io/serial_4way.c
+++ b/src/main/io/serial_4way.c
@@ -30,7 +30,6 @@
 #include "drivers/timer.h"
 #include "drivers/pwm_output.h"
 #include "drivers/light_led.h"
-#include "drivers/system.h"
 
 #include "flight/mixer.h"
 
diff --git a/src/main/io/serial_4way_avrootloader.c b/src/main/io/serial_4way_avrootloader.c
index 4c8cfcd7a..47142dc6e 100644
--- a/src/main/io/serial_4way_avrootloader.c
+++ b/src/main/io/serial_4way_avrootloader.c
@@ -27,8 +27,8 @@
 #ifdef  USE_SERIAL_4WAY_BLHELI_INTERFACE
 
 #include "drivers/io.h"
-#include "drivers/system.h"
 #include "drivers/serial.h"
+#include "drivers/time.h"
 #include "drivers/timer.h"
 
 #include "io/serial.h"
diff --git a/src/main/io/serial_4way_stk500v2.c b/src/main/io/serial_4way_stk500v2.c
index e83f99427..8df63d3e6 100644
--- a/src/main/io/serial_4way_stk500v2.c
+++ b/src/main/io/serial_4way_stk500v2.c
@@ -27,7 +27,7 @@
 
 #include "drivers/io.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 #include "io/serial_4way.h"
diff --git a/src/main/io/statusindicator.c b/src/main/io/statusindicator.c
index 1a5ea4c30..ab05ee758 100644
--- a/src/main/io/statusindicator.c
+++ b/src/main/io/statusindicator.c
@@ -20,8 +20,8 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
 #include "drivers/light_led.h"
+#include "drivers/time.h"
 
 #include "statusindicator.h"
 
diff --git a/src/main/io/transponder_ir.c b/src/main/io/transponder_ir.c
index eb99977f0..05068eeb2 100644
--- a/src/main/io/transponder_ir.c
+++ b/src/main/io/transponder_ir.c
@@ -30,7 +30,6 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/transponder_ir.h"
-#include "drivers/system.h"
 #include "drivers/usb_io.h"
 
 #include "fc/config.h"
diff --git a/src/main/io/vtx_control.c b/src/main/io/vtx_control.c
index af19c5184..e952bd95f 100644
--- a/src/main/io/vtx_control.c
+++ b/src/main/io/vtx_control.c
@@ -25,10 +25,10 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/vtx_common.h"
 #include "drivers/buttons.h"
 #include "drivers/light_led.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
+#include "drivers/vtx_common.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/io/vtx_rtc6705.c b/src/main/io/vtx_rtc6705.c
index 04e7b236f..82ca3c241 100644
--- a/src/main/io/vtx_rtc6705.c
+++ b/src/main/io/vtx_rtc6705.c
@@ -37,6 +37,7 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/vtx_common.h"
 #include "drivers/vtx_rtc6705.h"
 
diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c
index 6afea91fa..948488593 100644
--- a/src/main/io/vtx_smartaudio.c
+++ b/src/main/io/vtx_smartaudio.c
@@ -36,8 +36,8 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
 #include "drivers/serial.h"
+#include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
 #include "fc/rc_controls.h"
diff --git a/src/main/io/vtx_tramp.c b/src/main/io/vtx_tramp.c
index f63659d51..c62d625c8 100644
--- a/src/main/io/vtx_tramp.c
+++ b/src/main/io/vtx_tramp.c
@@ -33,7 +33,6 @@
 
 #include "io/serial.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
 #include "drivers/vtx_common.h"
 #include "io/vtx_tramp.h"
 #include "io/vtx_string.h"
diff --git a/src/main/msp/msp_serial.c b/src/main/msp/msp_serial.c
index 08cb7d7e4..fd7b9bfa4 100644
--- a/src/main/msp/msp_serial.c
+++ b/src/main/msp/msp_serial.c
@@ -27,8 +27,6 @@
 
 #include "io/serial.h"
 
-#include "drivers/system.h"
-
 #include "msp/msp.h"
 #include "msp/msp_serial.h"
 
diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index 4e68ca8fa..4bdb23e62 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -33,32 +33,32 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/nvic.h"
-#include "drivers/sensor.h"
-#include "drivers/system.h"
-#include "drivers/dma.h"
-#include "drivers/io.h"
-#include "drivers/light_led.h"
-#include "drivers/sound_beeper.h"
-#include "drivers/timer.h"
-#include "drivers/serial.h"
-#include "drivers/serial_softserial.h"
-#include "drivers/serial_uart.h"
 #include "drivers/adc.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
-#include "drivers/inverter.h"
-#include "drivers/usb_io.h"
-#include "drivers/transponder_ir.h"
+#include "drivers/dma.h"
 #include "drivers/exti.h"
+#include "drivers/inverter.h"
+#include "drivers/io.h"
+#include "drivers/light_led.h"
+#include "drivers/nvic.h"
+#include "drivers/sensor.h"
+#include "drivers/serial.h"
+#include "drivers/serial_softserial.h"
+#include "drivers/serial_uart.h"
+#include "drivers/sound_beeper.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
+#include "drivers/timer.h"
+#include "drivers/transponder_ir.h"
+#include "drivers/usb_io.h"
 
+#include "fc/cli.h"
 #include "fc/config.h"
-#include "osd_slave/osd_slave_init.h"
+#include "fc/rc_controls.h"
 #include "fc/fc_msp.h"
 #include "fc/fc_tasks.h"
-#include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
-#include "fc/cli.h"
 
 #include "msp/msp_serial.h"
 
@@ -67,11 +67,13 @@
 
 #include "io/beeper.h"
 #include "io/displayport_max7456.h"
-#include "io/serial.h"
 #include "io/flashfs.h"
 #include "io/ledstrip.h"
-#include "io/transponder_ir.h"
 #include "io/osd_slave.h"
+#include "io/serial.h"
+#include "io/transponder_ir.h"
+
+#include "osd_slave/osd_slave_init.h"
 
 #include "scheduler/scheduler.h"
 
diff --git a/src/main/rx/crsf.c b/src/main/rx/crsf.c
index 538081aa9..f0e58056a 100644
--- a/src/main/rx/crsf.c
+++ b/src/main/rx/crsf.c
@@ -30,9 +30,9 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/ibus.c b/src/main/rx/ibus.c
index 3c8cb1f4a..4a2055cf9 100755
--- a/src/main/rx/ibus.c
+++ b/src/main/rx/ibus.c
@@ -31,10 +31,10 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
-
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
+#include "drivers/time.h"
+
 #include "io/serial.h"
 
 #ifdef TELEMETRY
diff --git a/src/main/rx/jetiexbus.c b/src/main/rx/jetiexbus.c
index 2ddb1454b..1a00d6a8e 100644
--- a/src/main/rx/jetiexbus.c
+++ b/src/main/rx/jetiexbus.c
@@ -46,9 +46,9 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/nrf24_cx10.c b/src/main/rx/nrf24_cx10.c
index ae5b3492f..280d8398d 100644
--- a/src/main/rx/nrf24_cx10.c
+++ b/src/main/rx/nrf24_cx10.c
@@ -30,7 +30,7 @@
 
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/rx_xn297.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"
diff --git a/src/main/rx/nrf24_h8_3d.c b/src/main/rx/nrf24_h8_3d.c
index b9e22f55b..855ee5eb3 100644
--- a/src/main/rx/nrf24_h8_3d.c
+++ b/src/main/rx/nrf24_h8_3d.c
@@ -32,7 +32,7 @@
 
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/rx_xn297.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"
diff --git a/src/main/rx/nrf24_inav.c b/src/main/rx/nrf24_inav.c
index 115fc10d1..766d0b4eb 100644
--- a/src/main/rx/nrf24_inav.c
+++ b/src/main/rx/nrf24_inav.c
@@ -29,7 +29,7 @@
 #include "common/utils.h"
 
 #include "drivers/rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"
diff --git a/src/main/rx/nrf24_syma.c b/src/main/rx/nrf24_syma.c
index c3d3c4022..b6eb3a16f 100644
--- a/src/main/rx/nrf24_syma.c
+++ b/src/main/rx/nrf24_syma.c
@@ -29,7 +29,7 @@
 #include "build/build_config.h"
 
 #include "drivers/rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"
diff --git a/src/main/rx/nrf24_v202.c b/src/main/rx/nrf24_v202.c
index 8ddb1bb63..0342b7b52 100644
--- a/src/main/rx/nrf24_v202.c
+++ b/src/main/rx/nrf24_v202.c
@@ -31,7 +31,7 @@
 #include "common/utils.h"
 
 #include "drivers/rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 4a738ffb1..c8deb8010 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -37,7 +37,7 @@
 #include "drivers/adc.h"
 #include "drivers/rx_pwm.h"
 #include "drivers/rx_spi.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c
index 7076e7b30..fb9da893c 100644
--- a/src/main/rx/sbus.c
+++ b/src/main/rx/sbus.c
@@ -25,7 +25,7 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c
index a674ca131..0a9adb88f 100644
--- a/src/main/rx/spektrum.c
+++ b/src/main/rx/spektrum.c
@@ -28,8 +28,9 @@
 
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/system.h"
 #include "drivers/light_led.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/sumd.c b/src/main/rx/sumd.c
index 28ad0d7a4..6e6bbced1 100644
--- a/src/main/rx/sumd.c
+++ b/src/main/rx/sumd.c
@@ -25,7 +25,7 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/sumh.c b/src/main/rx/sumh.c
index 56f425663..750700f7a 100644
--- a/src/main/rx/sumh.c
+++ b/src/main/rx/sumh.c
@@ -31,7 +31,7 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/rx/xbus.c b/src/main/rx/xbus.c
index 24e9cd8a5..07f04df82 100644
--- a/src/main/rx/xbus.c
+++ b/src/main/rx/xbus.c
@@ -23,7 +23,7 @@
 
 #ifdef SERIAL_RX
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/scheduler/scheduler.c b/src/main/scheduler/scheduler.c
index d78b34bbd..2dd256060 100755
--- a/src/main/scheduler/scheduler.c
+++ b/src/main/scheduler/scheduler.c
@@ -31,7 +31,7 @@
 #include "common/time.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 // DEBUG_SCHEDULER, timings for:
 // 0 - gyroUpdate()
diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c
index de40db616..5f173eaf8 100644
--- a/src/main/sensors/acceleration.c
+++ b/src/main/sensors/acceleration.c
@@ -50,7 +50,6 @@
 #include "drivers/accgyro/accgyro_spi_mpu6500.h"
 #include "drivers/accgyro/accgyro_spi_mpu9250.h"
 #include "drivers/bus_spi.h"
-#include "drivers/system.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"
diff --git a/src/main/sensors/barometer.c b/src/main/sensors/barometer.c
index 44c887efe..0720db750 100644
--- a/src/main/sensors/barometer.c
+++ b/src/main/sensors/barometer.c
@@ -31,7 +31,6 @@
 #include "drivers/barometer/barometer_bmp280.h"
 #include "drivers/barometer/barometer_fake.h"
 #include "drivers/barometer/barometer_ms5611.h"
-#include "drivers/system.h"
 
 #include "fc/runtime_config.h"
 
diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index 0975adb3c..c2b296e85 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -31,7 +31,6 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/adc.h"
-#include "drivers/system.h"
 
 #include "fc/runtime_config.h"
 #include "fc/config.h"
diff --git a/src/main/sensors/current.c b/src/main/sensors/current.c
index da7654357..f6e664785 100644
--- a/src/main/sensors/current.c
+++ b/src/main/sensors/current.c
@@ -27,7 +27,6 @@
 #include "common/filter.h"
 
 #include "drivers/adc.h"
-#include "drivers/system.h"
 
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
diff --git a/src/main/sensors/esc_sensor.c b/src/main/sensors/esc_sensor.c
index 146bfd539..7bf485559 100644
--- a/src/main/sensors/esc_sensor.c
+++ b/src/main/sensors/esc_sensor.c
@@ -35,7 +35,6 @@
 #include "drivers/pwm_output.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
-#include "drivers/system.h"
 
 #include "esc_sensor.h"
 
diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c
index 5566128f9..977786da3 100644
--- a/src/main/sensors/gyro.c
+++ b/src/main/sensors/gyro.c
@@ -51,7 +51,6 @@
 #include "drivers/bus_spi.h"
 #include "drivers/gyro_sync.h"
 #include "drivers/io.h"
-#include "drivers/system.h"
 
 #include "fc/runtime_config.h"
 
diff --git a/src/main/sensors/gyroanalyse.c b/src/main/sensors/gyroanalyse.c
index 23f77a7c0..8f29c37bf 100644
--- a/src/main/sensors/gyroanalyse.c
+++ b/src/main/sensors/gyroanalyse.c
@@ -34,7 +34,7 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/accgyro/accgyro.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/sensors/voltage.c b/src/main/sensors/voltage.c
index aa9db9dfe..3369edc04 100644
--- a/src/main/sensors/voltage.c
+++ b/src/main/sensors/voltage.c
@@ -28,7 +28,6 @@
 #include "common/utils.h"
 
 #include "drivers/adc.h"
-#include "drivers/system.h"
 
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
diff --git a/src/main/target/ALIENFLIGHTF3/hardware_revision.c b/src/main/target/ALIENFLIGHTF3/hardware_revision.c
index 72630fabc..4773d5bbf 100644
--- a/src/main/target/ALIENFLIGHTF3/hardware_revision.c
+++ b/src/main/target/ALIENFLIGHTF3/hardware_revision.c
@@ -24,7 +24,7 @@
 #include "build/build_config.h"
 
 #include "drivers/io.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "hardware_revision.h"
 
diff --git a/src/main/target/ALIENFLIGHTF4/hardware_revision.c b/src/main/target/ALIENFLIGHTF4/hardware_revision.c
index 37f591828..fa333bd27 100644
--- a/src/main/target/ALIENFLIGHTF4/hardware_revision.c
+++ b/src/main/target/ALIENFLIGHTF4/hardware_revision.c
@@ -23,8 +23,8 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
 #include "drivers/io.h"
+#include "drivers/time.h"
 #include "hardware_revision.h"
 
 uint8_t hardwareRevision = AFF4_UNKNOWN;
diff --git a/src/main/target/ALIENFLIGHTNGF7/hardware_revision.c b/src/main/target/ALIENFLIGHTNGF7/hardware_revision.c
index a682d67ae..77ec75696 100644
--- a/src/main/target/ALIENFLIGHTNGF7/hardware_revision.c
+++ b/src/main/target/ALIENFLIGHTNGF7/hardware_revision.c
@@ -23,8 +23,9 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
 #include "drivers/io.h"
+#include "drivers/time.h"
+
 #include "hardware_revision.h"
 
 uint8_t hardwareRevision = AFF7_UNKNOWN;
diff --git a/src/main/target/BLUEJAYF4/hardware_revision.c b/src/main/target/BLUEJAYF4/hardware_revision.c
index 5f87926f9..ca1511413 100644
--- a/src/main/target/BLUEJAYF4/hardware_revision.c
+++ b/src/main/target/BLUEJAYF4/hardware_revision.c
@@ -23,10 +23,11 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
 #include "drivers/bus_spi.h"
-#include "drivers/io.h"
 #include "drivers/flash_m25p16.h"
+#include "drivers/io.h"
+#include "drivers/time.h"
+
 #include "hardware_revision.h"
 
 uint8_t hardwareRevision = UNKNOWN;
diff --git a/src/main/target/COLIBRI_RACE/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c
index 125b3cd3f..970fab00f 100644
--- a/src/main/target/COLIBRI_RACE/i2c_bst.c
+++ b/src/main/target/COLIBRI_RACE/i2c_bst.c
@@ -16,7 +16,6 @@
 #include "common/color.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
 
 #include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
@@ -25,6 +24,8 @@
 #include "drivers/serial.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/gpio.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/rx_pwm.h"
 
diff --git a/src/main/target/NAZE/hardware_revision.c b/src/main/target/NAZE/hardware_revision.c
index 56a54a260..68d406229 100755
--- a/src/main/target/NAZE/hardware_revision.c
+++ b/src/main/target/NAZE/hardware_revision.c
@@ -28,6 +28,7 @@
 #include "drivers/accgyro/accgyro_mpu6500.h"
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
+#include "drivers/time.h"
 #include "drivers/system.h"
 
 #include "hardware_revision.h"
diff --git a/src/main/target/RACEBASE/hardware_revision.c b/src/main/target/RACEBASE/hardware_revision.c
index e5e85c26a..c03d6a2c0 100755
--- a/src/main/target/RACEBASE/hardware_revision.c
+++ b/src/main/target/RACEBASE/hardware_revision.c
@@ -23,7 +23,7 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/bus_spi.h"
 #include "drivers/sensor.h"
 #include "drivers/io.h"
diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c
index 2abeb76ac..649dca471 100644
--- a/src/main/telemetry/frsky.c
+++ b/src/main/telemetry/frsky.c
@@ -36,10 +36,10 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
-#include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
+#include "drivers/sensor.h"
 #include "drivers/serial.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/telemetry/hott.c b/src/main/telemetry/hott.c
index d827e310d..a1e828d2e 100644
--- a/src/main/telemetry/hott.c
+++ b/src/main/telemetry/hott.c
@@ -70,7 +70,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 
diff --git a/src/main/telemetry/ibus.c b/src/main/telemetry/ibus.c
index 9596d67cb..b21c67f5f 100644
--- a/src/main/telemetry/ibus.c
+++ b/src/main/telemetry/ibus.c
@@ -37,9 +37,8 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
-#include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
+#include "drivers/sensor.h"
 #include "drivers/serial.h"
 
 #include "fc/rc_controls.h"
diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c
index d536eecf9..4a6589983 100644
--- a/src/main/telemetry/ltm.c
+++ b/src/main/telemetry/ltm.c
@@ -42,7 +42,7 @@
 #include "common/color.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
 
diff --git a/src/main/telemetry/mavlink.c b/src/main/telemetry/mavlink.c
index f35af4583..8b7a896f6 100755
--- a/src/main/telemetry/mavlink.c
+++ b/src/main/telemetry/mavlink.c
@@ -36,9 +36,9 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
-#include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
+#include "drivers/sensor.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c
index 8a913ac49..dfaa45e58 100644
--- a/src/main/telemetry/smartport.c
+++ b/src/main/telemetry/smartport.c
@@ -23,7 +23,7 @@
 #include "drivers/accgyro/accgyro.h"
 #include "drivers/compass/compass.h"
 #include "drivers/sensor.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
diff --git a/src/main/vcp_hal/usbd_cdc_interface.c b/src/main/vcp_hal/usbd_cdc_interface.c
index 11b5925f8..4a4cf497d 100644
--- a/src/main/vcp_hal/usbd_cdc_interface.c
+++ b/src/main/vcp_hal/usbd_cdc_interface.c
@@ -52,7 +52,7 @@
 #include "usbd_cdc.h"
 #include "usbd_cdc_interface.h"
 #include "stdbool.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
diff --git a/src/main/vcpf4/usbd_cdc_vcp.c b/src/main/vcpf4/usbd_cdc_vcp.c
index 7c8a1abe8..67746fe63 100644
--- a/src/main/vcpf4/usbd_cdc_vcp.c
+++ b/src/main/vcpf4/usbd_cdc_vcp.c
@@ -27,7 +27,7 @@
 #include "usbd_cdc_vcp.h"
 #include "stm32f4xx_conf.h"
 #include "stdbool.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 LINE_CODING g_lc;
 
diff --git a/src/test/unit/rx_ibus_unittest.cc b/src/test/unit/rx_ibus_unittest.cc
index 4537a8218..7f675ff95 100644
--- a/src/test/unit/rx_ibus_unittest.cc
+++ b/src/test/unit/rx_ibus_unittest.cc
@@ -20,8 +20,8 @@
 extern "C" {
 #include <platform.h>
 #include "config/parameter_group.h"
-#include "drivers/system.h"
 #include "drivers/serial.h"
+#include "drivers/time.h"
 #include "io/serial.h"
 #include "rx/rx.h"
 #include "rx/ibus.h"