diff --git a/platform/windows/btstack_run_loop_windows.c b/platform/windows/btstack_run_loop_windows.c
index 533ad6375..c745012dd 100644
--- a/platform/windows/btstack_run_loop_windows.c
+++ b/platform/windows/btstack_run_loop_windows.c
@@ -41,14 +41,13 @@
  *  btstack_run_loop_windows.c
  */
 
+#include <Windows.h>
 #include "btstack_run_loop.h"
 #include "btstack_run_loop_windows.h"
 #include "btstack_linked_list.h"
 #include "btstack_debug.h"
 #include "btstack_util.h"
 
-#include <Windows.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/platform/windows/btstack_stdin_windows.c b/platform/windows/btstack_stdin_windows.c
index 6e4943496..a15dbac6f 100644
--- a/platform/windows/btstack_stdin_windows.c
+++ b/platform/windows/btstack_stdin_windows.c
@@ -37,6 +37,7 @@
 
 #define BTSTACK_FILE__ "btstack_stdin_windows.c"
 
+#include <Windows.h>
 #include <errno.h>
 #include <stdio.h>
 
@@ -51,7 +52,6 @@
 // __WIN32 Defined as 1 when the compilation target is 32-bit ARM, 64-bit ARM, x86, or x64.
 //         Otherwise, undefined.
 
-#include <Windows.h>
 #include <conio.h>  //provides non standard getch() function
 #include <signal.h>
 
diff --git a/platform/windows/btstack_uart_block_windows.c b/platform/windows/btstack_uart_block_windows.c
index 7a7f1c923..3bdada6f4 100644
--- a/platform/windows/btstack_uart_block_windows.c
+++ b/platform/windows/btstack_uart_block_windows.c
@@ -43,7 +43,7 @@
  *  Common code to access serial port via asynchronous block read/write commands
  *
  */
-
+#include <Windows.h>
 #include "btstack_uart_block.h"
 #include "btstack_run_loop.h"
 #include "btstack_debug.h"
@@ -52,7 +52,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <Windows.h>
+
 
 // uart config
 static const btstack_uart_config_t * uart_config;
diff --git a/platform/windows/hci_dump_windows_fs.c b/platform/windows/hci_dump_windows_fs.c
index 6833a1291..3d210987d 100644
--- a/platform/windows/hci_dump_windows_fs.c
+++ b/platform/windows/hci_dump_windows_fs.c
@@ -47,7 +47,7 @@
  *  - stdout hexdump
  *
  */
-
+#include <windows.h>
 #include "btstack_config.h"
 
 #include "hci_dump_windows_fs.h"
@@ -57,7 +57,6 @@
 #include "hci_cmd.h"
 
 #include <stdio.h>
-#include <windows.h>
 #include <share.h>
 
 /**
diff --git a/platform/windows/hci_dump_windows_stdout.c b/platform/windows/hci_dump_windows_stdout.c
index 6e8c86e00..765420b7b 100644
--- a/platform/windows/hci_dump_windows_stdout.c
+++ b/platform/windows/hci_dump_windows_stdout.c
@@ -37,6 +37,8 @@
 
 #define BTSTACK_FILE__ "hci_dump_windows_stdout.c"
 
+
+#include <Windows.h>
 /*
  *  Dump HCI trace on stdout
  */
@@ -46,7 +48,7 @@
 #include "hci.h"
 #include "hci_cmd.h"
 #include <stdio.h>
-#include <Windows.h>
+
 
 #include "hci_dump_windows_stdout.h"
 
diff --git a/platform/windows/hci_transport_h2_winusb.c b/platform/windows/hci_transport_h2_winusb.c
index 0fc5bcb9c..f242af0ad 100644
--- a/platform/windows/hci_transport_h2_winusb.c
+++ b/platform/windows/hci_transport_h2_winusb.c
@@ -53,6 +53,8 @@
 // SCO Data     0 0 0x83 Isochronous (IN)
 // SCO Data     0 0 0x03 Isochronous (Out)
 
+#include <Windows.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -65,7 +67,6 @@
 #include "hci_transport.h"
 #include "hci_transport_usb.h"
 
-#include <Windows.h>
 #include <SetupAPI.h>
 #include <Winusb.h>
 
diff --git a/port/windows-winusb/main.c b/port/windows-winusb/main.c
index a7edf38a0..d828c40d6 100644
--- a/port/windows-winusb/main.c
+++ b/port/windows-winusb/main.c
@@ -42,7 +42,7 @@
 // minimal setup for HCI code
 //
 // *****************************************************************************
-
+#include <Windows.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/btstack_util.c b/src/btstack_util.c
index c7118ab9b..c7f17316a 100644
--- a/src/btstack_util.c
+++ b/src/btstack_util.c
@@ -41,6 +41,11 @@
  *  General utility functions
  */
 
+#ifdef _MSC_VER
+#include <Windows.h>
+#include <intrin.h>
+#endif
+
 #include "btstack_config.h"
 #include "btstack_debug.h"
 #include "btstack_util.h"
@@ -48,10 +53,6 @@
 #include <stdio.h>  // vsnprintf
 #include <string.h> // memcpy
 
-#ifdef _MSC_VER
-#include <intrin.h>
-#include <windows.h>
-#endif
 
 
 /**