diff --git a/source/Core/BSP/Pinecil/BSP.cpp b/source/Core/BSP/Pinecil/BSP.cpp
index b3c86d6c..dca65fd6 100644
--- a/source/Core/BSP/Pinecil/BSP.cpp
+++ b/source/Core/BSP/Pinecil/BSP.cpp
@@ -5,6 +5,7 @@
 #include "I2C_Wrapper.hpp"
 #include "IRQ.h"
 #include "Pins.h"
+#include "Settings.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
 #include "configuration.h"
diff --git a/source/Core/BSP/Pinecilv2/BSP.cpp b/source/Core/BSP/Pinecilv2/BSP.cpp
index d86c650d..4bcedb13 100644
--- a/source/Core/BSP/Pinecilv2/BSP.cpp
+++ b/source/Core/BSP/Pinecilv2/BSP.cpp
@@ -5,6 +5,7 @@
 #include "I2C_Wrapper.hpp"
 #include "IRQ.h"
 #include "Pins.h"
+#include "Settings.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
 #include "USBPD.h"
@@ -293,4 +294,4 @@ TemperatureType_t getCustomTipMaxInC() {
   TemperatureType_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(max_reading);
   maximumTipTemp += getHandleTemperature(0) / 10; // Add handle offset
   return maximumTipTemp - 1;
-}
\ No newline at end of file
+}
diff --git a/source/Core/BSP/Sequre/BSP.cpp b/source/Core/BSP/Sequre/BSP.cpp
index a169ec60..32daec13 100644
--- a/source/Core/BSP/Sequre/BSP.cpp
+++ b/source/Core/BSP/Sequre/BSP.cpp
@@ -6,6 +6,7 @@
 #include "HUB238.hpp"
 #include "I2C_Wrapper.hpp"
 #include "Pins.h"
+#include "Settings.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
 #include "configuration.h"
@@ -281,4 +282,4 @@ void showBootLogo(void) { BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR)
 
 #ifdef CUSTOM_MAX_TEMP_C
 TemperatureType_t getCustomTipMaxInC() { return MAX_TEMP_C; }
-#endif
\ No newline at end of file
+#endif
diff --git a/source/Core/Drivers/FS2711.cpp b/source/Core/Drivers/FS2711.cpp
index 35e90898..e6624b30 100644
--- a/source/Core/Drivers/FS2711.cpp
+++ b/source/Core/Drivers/FS2711.cpp
@@ -1,9 +1,11 @@
+#include "configuration.h"
+
+#if POW_PD_EXT == 2
+#include "BSP.h"
 #include "FS2711.hpp"
 #include "FS2711_defines.h"
 #include "I2CBB2.hpp"
-#include "configuration.h"
-#if POW_PD_EXT == 2
-#include "BSP.h"
+#include "Settings.h"
 #include "cmsis_os.h"
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/source/Core/Drivers/USBPD.cpp b/source/Core/Drivers/USBPD.cpp
index 6c21f5ed..016f882a 100644
--- a/source/Core/Drivers/USBPD.cpp
+++ b/source/Core/Drivers/USBPD.cpp
@@ -1,9 +1,9 @@
 #include "USBPD.h"
 #include "configuration.h"
 #ifdef POW_PD
-
 #include "BSP_PD.h"
 #include "FreeRTOS.h"
+#include "Settings.h"
 #include "fusb302b.h"
 #include "main.hpp"
 #include "pd.h"