diff --git a/src/components/ble/DfuService.h b/src/components/ble/DfuService.h
index 93d5ccf7..f30e213d 100644
--- a/src/components/ble/DfuService.h
+++ b/src/components/ble/DfuService.h
@@ -9,8 +9,8 @@
 #undef max
 #undef min
 
-#include <drivers/SpiNorFlash.h>
-#include "infinitime.h"
+#include "drivers/SpiNorFlash.h"
+#include "port/infinitime.h"
 
 namespace Pinetime {
   namespace System {
diff --git a/src/drivers/Spi.h b/src/drivers/Spi.h
index 77b37a7a..0df3e2c0 100644
--- a/src/drivers/Spi.h
+++ b/src/drivers/Spi.h
@@ -6,8 +6,8 @@
 
 namespace Pinetime {
   namespace Drivers {
-    template <typename T>
-    concept IsSpi = requires(T s, const uint8_t* constData, uint8_t* data, const uint8_t* constCommand, uint8_t* command, size_t size) {
+    template <typename SpiImpl>
+    concept IsSpi = requires(SpiImpl s, const uint8_t* constData, uint8_t* data, const uint8_t* constCommand, uint8_t* command, size_t size) {
                       { s.Write(constData, size) } -> std::same_as<bool>;
                       { s.Read(command, size, data, size) } -> std::same_as<bool>;
                     };
@@ -53,4 +53,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/SpiMaster.h b/src/drivers/SpiMaster.h
index 45b57d1f..c916f3bf 100644
--- a/src/drivers/SpiMaster.h
+++ b/src/drivers/SpiMaster.h
@@ -5,9 +5,9 @@
 
 namespace Pinetime {
   namespace Drivers {
-    template <typename T>
+    template <typename SpiImpl>
     concept IsSpiMaster =
-      requires(T spi, uint8_t pin, const uint8_t* constData, uint8_t* data, const uint8_t* constCommand, uint8_t* command, size_t size) {
+      requires(SpiImpl spi, uint8_t pin, const uint8_t* constData, uint8_t* data, const uint8_t* constCommand, uint8_t* command, size_t size) {
         { spi.Init() } -> std::same_as<bool>;
         { spi.Write(pin, constData, size) } -> std::same_as<bool>;
         { spi.Read(pin, command, size, data, size) } -> std::same_as<bool>;
@@ -67,4 +67,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/SpiNorFlash.h b/src/drivers/SpiNorFlash.h
index ecea0a35..e9d41c99 100644
--- a/src/drivers/SpiNorFlash.h
+++ b/src/drivers/SpiNorFlash.h
@@ -6,8 +6,8 @@
 
 namespace Pinetime {
   namespace Drivers {
-    template <typename T>
-    concept IsFlashMemory = requires(T memory, uint32_t address, uint8_t* buffer, const uint8_t* constBuffer, size_t size) {
+    template <typename MemoryImpl>
+    concept IsFlashMemory = requires(MemoryImpl memory, uint32_t address, uint8_t* buffer, const uint8_t* constBuffer, size_t size) {
                               { memory.ReadIdentification() };
                               { memory.ReadStatusRegister() } -> std::same_as<uint8_t>;
                               { memory.ReadConfigurationRegister() } -> std::same_as<uint8_t>;
@@ -113,4 +113,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/St7789.h b/src/drivers/St7789.h
index 026f4fab..8e972d83 100644
--- a/src/drivers/St7789.h
+++ b/src/drivers/St7789.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Spi.h"
+#include "drivers/Spi.h"
 #include <cstddef>
 #include <cstdint>
 #include "port/infinitime.h"
diff --git a/src/drivers/nrf52/Spi.cpp b/src/drivers/nrf52/Spi.cpp
index 437fce9f..4197ecfa 100644
--- a/src/drivers/nrf52/Spi.cpp
+++ b/src/drivers/nrf52/Spi.cpp
@@ -1,4 +1,4 @@
-#include "Spi.h"
+#include "drivers/nrf52/Spi.h"
 #include <hal/nrf_gpio.h>
 #include <nrfx_log.h>
 
diff --git a/src/drivers/nrf52/Spi.h b/src/drivers/nrf52/Spi.h
index 8072c77a..1891fe0a 100644
--- a/src/drivers/nrf52/Spi.h
+++ b/src/drivers/nrf52/Spi.h
@@ -27,4 +27,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/nrf52/SpiMaster.h b/src/drivers/nrf52/SpiMaster.h
index 9d88b2bb..affaddfd 100644
--- a/src/drivers/nrf52/SpiMaster.h
+++ b/src/drivers/nrf52/SpiMaster.h
@@ -64,4 +64,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/spiFlash/SpiNorFlash.h b/src/drivers/spiFlash/SpiNorFlash.h
index 7beadd71..d7ff9e25 100644
--- a/src/drivers/spiFlash/SpiNorFlash.h
+++ b/src/drivers/spiFlash/SpiNorFlash.h
@@ -59,4 +59,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/port/infinitime.h b/src/port/infinitime.h
index a0297e96..8cdef6bf 100644
--- a/src/port/infinitime.h
+++ b/src/port/infinitime.h
@@ -10,7 +10,6 @@
 #include <drivers/spiFlash/SpiNorFlash.h>
 #endif
 
-// #error "Do not include this"
 namespace Pinetime {
   namespace Drivers {
 #ifdef TARGET_DEVICE_PINETIME
@@ -21,4 +20,4 @@ namespace Pinetime {
   #error "No target device specified!"
 #endif
   }
-}
\ No newline at end of file
+}