diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp
index 761b0ce..c2effbd 100644
--- a/src/LoRa_APRS_Tracker.cpp
+++ b/src/LoRa_APRS_Tracker.cpp
@@ -18,9 +18,7 @@ ________________________________________________________________________________
 #include <Arduino.h>
 #include <logger.h>
 #include <WiFi.h>
-#include <vector>
 #include "APRSPacketLib.h"
-#include "notification_utils.h"
 #include "bluetooth_utils.h"
 #include "keyboard_utils.h"
 #include "configuration.h"
@@ -35,7 +33,6 @@ ________________________________________________________________________________
 #include "bme_utils.h"
 #include "ble_utils.h"
 #include "display.h"
-#include "SPIFFS.h"
 #include "utils.h"
 
 Configuration                       Config;
diff --git a/src/bme_utils.cpp b/src/bme_utils.cpp
index 6526ba4..3335ae6 100644
--- a/src/bme_utils.cpp
+++ b/src/bme_utils.cpp
@@ -1,6 +1,5 @@
 #include "bme_utils.h"
 #include "configuration.h"
-#include "gps_utils.h"
 #include "display.h"
 #include <logger.h>
 
diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp
index 22a109f..b535575 100644
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -6,7 +6,6 @@
 #include "gps_utils.h"
 #include "display.h"
 #include "logger.h"
-#include "utils.h"
 
 #include "APRSPacketLib.h"
 
diff --git a/src/keyboard_utils.cpp b/src/keyboard_utils.cpp
index 5c0e28a..e880a8e 100644
--- a/src/keyboard_utils.cpp
+++ b/src/keyboard_utils.cpp
@@ -6,7 +6,6 @@
 #include "winlink_utils.h"
 #include "station_utils.h"
 #include "configuration.h"
-#include "button_utils.h"
 #include "power_utils.h"
 #include "pins_config.h"
 #include "msg_utils.h"
diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp
index bb24079..db20d2c 100644
--- a/src/lora_utils.cpp
+++ b/src/lora_utils.cpp
@@ -3,7 +3,7 @@
 #include "notification_utils.h"
 #include "configuration.h"
 #include "pins_config.h"
-#include "msg_utils.h"
+#include "lora_utils.h"
 #include "display.h"
 #ifdef HAS_SX127X
     #include <LoRa.h>
diff --git a/src/station_utils.cpp b/src/station_utils.cpp
index 3cfdde3..85f7c55 100644
--- a/src/station_utils.cpp
+++ b/src/station_utils.cpp
@@ -1,13 +1,11 @@
 #include <TinyGPS++.h>
 #include <SPIFFS.h>
-#include <vector>
 #include "APRSPacketLib.h"
 #include "station_utils.h"
 #include "configuration.h"
 #include "power_utils.h"
 #include "lora_utils.h"
 #include "bme_utils.h"
-#include "gps_utils.h"
 #include "display.h"
 #include "logger.h"