diff --git a/include/blescan.h b/include/blescan.h
index 7fd4e906..e9252e88 100644
--- a/include/blescan.h
+++ b/include/blescan.h
@@ -1,8 +1,16 @@
 #ifndef _BLESCAN_H
 #define _BLESCAN_H
 
+#include "globals.h"
 #include "macsniff.h"
 
+// Bluetooth specific includes
+#include <esp_bt.h>
+#include <esp_bt_main.h>
+#include <esp_gap_ble_api.h>
+#include <esp_blufi_api.h> // needed for BLE_ADDR types, do not remove
+#include <esp_coexist.h>
+
 void start_BLEscan(void);
 void stop_BLEscan(void);
 
diff --git a/include/main.h b/include/main.h
index af6ff496..4f4452b7 100644
--- a/include/main.h
+++ b/include/main.h
@@ -7,6 +7,7 @@
 #include <esp_coexist.h> // needed for showing coex sw version
 
 #include "globals.h"
+#include "blescan.h"
 #include "wifiscan.h"
 #include "configmanager.h"
 #include "cyclic.h"
diff --git a/src/blecsan.cpp b/src/blecsan.cpp
index c4d10865..fa8a09c4 100644
--- a/src/blecsan.cpp
+++ b/src/blecsan.cpp
@@ -4,16 +4,7 @@
 https://github.com/nkolban/esp32-snippets/tree/master/BLE/scanner
 */
 
-// Basic Config
-#include "globals.h"
-#include "macsniff.h"
-
-// Bluetooth specific includes
-#include <esp_bt.h>
-#include <esp_bt_main.h>
-#include <esp_gap_ble_api.h>
-#include <esp_blufi_api.h> // needed for BLE_ADDR types, do not remove
-#include <esp_coexist.h>
+#include "blescan.h"
 
 #define BT_BD_ADDR_HEX(addr)                                                   \
   addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]