diff --git a/src/drivers/BufferProvider.h b/src/drivers/BufferProvider.h
index 50fa253e..1be4317a 100644
--- a/src/drivers/BufferProvider.h
+++ b/src/drivers/BufferProvider.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstddef>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index 94db3b34..e703b73b 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -1,8 +1,9 @@
-#include <FreeRTOS.h>
-#include <task.h>
-#include <nrfx_log.h>
-#include <legacy/nrf_drv_gpiote.h>
 #include "Cst816s.h"
+#include <FreeRTOS.h>
+#include <legacy/nrf_drv_gpiote.h>
+#include <nrfx_log.h>
+#include <task.h>
+
 using namespace Pinetime::Drivers;
 
 /* References :
diff --git a/src/drivers/Cst816s.h b/src/drivers/Cst816s.h
index 4569e82f..b7876b88 100644
--- a/src/drivers/Cst816s.h
+++ b/src/drivers/Cst816s.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nrfx_twi.h>
 #include "TwiMaster.h"
 
 namespace Pinetime {
diff --git a/src/drivers/DebugPins.cpp b/src/drivers/DebugPins.cpp
index 5a12fd86..8457ba5f 100644
--- a/src/drivers/DebugPins.cpp
+++ b/src/drivers/DebugPins.cpp
@@ -1,5 +1,5 @@
-#include <hal/nrf_gpio.h>
 #include "DebugPins.h"
+#include <hal/nrf_gpio.h>
 
 #ifdef USE_DEBUG_PINS
 void debugpins_init() {
diff --git a/src/drivers/InternalFlash.cpp b/src/drivers/InternalFlash.cpp
index db705d78..33c14473 100644
--- a/src/drivers/InternalFlash.cpp
+++ b/src/drivers/InternalFlash.cpp
@@ -1,5 +1,5 @@
-#include <mdk/nrf.h>
 #include "InternalFlash.h"
+#include <mdk/nrf.h>
 using namespace Pinetime::Drivers;
 
 void InternalFlash::ErasePage(uint32_t address) {
diff --git a/src/drivers/Spi.cpp b/src/drivers/Spi.cpp
index 2d8aa3b8..0e7de4d5 100644
--- a/src/drivers/Spi.cpp
+++ b/src/drivers/Spi.cpp
@@ -1,6 +1,6 @@
+#include "Spi.h"
 #include <hal/nrf_gpio.h>
 #include <nrfx_log.h>
-#include "Spi.h"
 
 using namespace Pinetime::Drivers;
 
diff --git a/src/drivers/Spi.h b/src/drivers/Spi.h
index 82ba8a65..e3cab459 100644
--- a/src/drivers/Spi.h
+++ b/src/drivers/Spi.h
@@ -1,12 +1,6 @@
 #pragma once
-#include <FreeRTOS.h>
 #include <cstdint>
 #include <cstddef>
-#include <array>
-#include <atomic>
-#include <task.h>
-
-#include "BufferProvider.h"
 #include "SpiMaster.h"
 
 namespace Pinetime {
diff --git a/src/drivers/SpiMaster.cpp b/src/drivers/SpiMaster.cpp
index 2e5852a5..5f7c0642 100644
--- a/src/drivers/SpiMaster.cpp
+++ b/src/drivers/SpiMaster.cpp
@@ -1,10 +1,8 @@
-#include <FreeRTOS.h>
+#include "SpiMaster.h"
 #include <hal/nrf_gpio.h>
 #include <hal/nrf_spim.h>
-#include "SpiMaster.h"
-#include <algorithm>
-#include <task.h>
 #include <nrfx_log.h>
+#include <algorithm>
 
 using namespace Pinetime::Drivers;
 
diff --git a/src/drivers/SpiMaster.h b/src/drivers/SpiMaster.h
index cd3193e4..cb79d90c 100644
--- a/src/drivers/SpiMaster.h
+++ b/src/drivers/SpiMaster.h
@@ -1,14 +1,10 @@
 #pragma once
-#include <FreeRTOS.h>
-#include <cstdint>
 #include <cstddef>
-#include <array>
-#include <atomic>
-#include <task.h>
-#include <semphr.h>
+#include <cstdint>
 
-#include "BufferProvider.h"
+#include <FreeRTOS.h>
 #include <semphr.h>
+#include <task.h>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/SpiNorFlash.cpp b/src/drivers/SpiNorFlash.cpp
index bd24834e..3ea5afe7 100644
--- a/src/drivers/SpiNorFlash.cpp
+++ b/src/drivers/SpiNorFlash.cpp
@@ -1,7 +1,7 @@
+#include "SpiNorFlash.h"
 #include <hal/nrf_gpio.h>
 #include <libraries/delay/nrf_delay.h>
 #include <libraries/log/nrf_log.h>
-#include "SpiNorFlash.h"
 #include "Spi.h"
 
 using namespace Pinetime::Drivers;
diff --git a/src/drivers/SpiNorFlash.h b/src/drivers/SpiNorFlash.h
index 10c25a01..7702d434 100644
--- a/src/drivers/SpiNorFlash.h
+++ b/src/drivers/SpiNorFlash.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstddef>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/St7789.cpp b/src/drivers/St7789.cpp
index ed28c82c..2df2c531 100644
--- a/src/drivers/St7789.cpp
+++ b/src/drivers/St7789.cpp
@@ -1,7 +1,7 @@
+#include "St7789.h"
 #include <hal/nrf_gpio.h>
 #include <libraries/delay/nrf_delay.h>
 #include <nrfx_log.h>
-#include "St7789.h"
 #include "Spi.h"
 
 using namespace Pinetime::Drivers;
diff --git a/src/drivers/St7789.h b/src/drivers/St7789.h
index 0b94cf24..053caccb 100644
--- a/src/drivers/St7789.h
+++ b/src/drivers/St7789.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstddef>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index 3ff8a952..6a063ecf 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -1,7 +1,7 @@
-#include <nrfx_log.h>
-#include <hal/nrf_gpio.h>
-#include <cstring>
 #include "TwiMaster.h"
+#include <cstring>
+#include <hal/nrf_gpio.h>
+#include <nrfx_log.h>
 
 using namespace Pinetime::Drivers;
 
diff --git a/src/drivers/TwiMaster.h b/src/drivers/TwiMaster.h
index 52e39098..cc0b6f02 100644
--- a/src/drivers/TwiMaster.h
+++ b/src/drivers/TwiMaster.h
@@ -1,8 +1,6 @@
 #pragma once
 #include <FreeRTOS.h>
 #include <semphr.h>
-#include <drivers/include/nrfx_twi.h>
-
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/Watchdog.cpp b/src/drivers/Watchdog.cpp
index 11da1211..d09fbcd1 100644
--- a/src/drivers/Watchdog.cpp
+++ b/src/drivers/Watchdog.cpp
@@ -1,7 +1,5 @@
-#include <mdk/nrf52.h>
-#include <mdk/nrf52_bitfields.h>
-#include <nrf_soc.h>
 #include "Watchdog.h"
+#include <mdk/nrf.h>
 using namespace Pinetime::Drivers;
 
 
diff --git a/src/drivers/Watchdog.h b/src/drivers/Watchdog.h
index 73f99ea1..0c816a4e 100644
--- a/src/drivers/Watchdog.h
+++ b/src/drivers/Watchdog.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {