diff --git a/.clang-format b/.clang-format
index ef24da8a0..02f6e2e07 100644
--- a/.clang-format
+++ b/.clang-format
@@ -69,7 +69,9 @@ IncludeCategories:
     Priority: 3
   - Regex: '<winsock2\.h>'
     Priority: 4
-  - Regex: '^<.*\.h(pp)?>$'
+  - Regex: '<windows\.h>'
     Priority: 5
-  - Regex: '(<)(.)+(>)'
+  - Regex: '^<.*\.h(pp)?>$'
     Priority: 6
+  - Regex: '(<)(.)+(>)'
+    Priority: 7
diff --git a/daemon/lokinet.cpp b/daemon/lokinet.cpp
index f43900669..310211082 100644
--- a/daemon/lokinet.cpp
+++ b/daemon/lokinet.cpp
@@ -25,8 +25,6 @@
 
 #ifdef _WIN32
 #include <llarp/win32/service_manager.hpp>
-
-#include <dbghelp.h>
 #else
 #include <llarp/util/service_manager.hpp>
 #endif
diff --git a/llarp/util/str.cpp b/llarp/util/str.cpp
index 3fed7ea44..79329d756 100644
--- a/llarp/util/str.cpp
+++ b/llarp/util/str.cpp
@@ -6,8 +6,9 @@
 #ifdef _WIN32
 #include <llarp/win32/exception.hpp>
 
-#include <stringapiset.h>
 #include <windows.h>
+
+#include <stringapiset.h>
 #endif
 
 namespace llarp
diff --git a/llarp/vpn/win32.hpp b/llarp/vpn/win32.hpp
index ac0f5e01a..799254cc6 100644
--- a/llarp/vpn/win32.hpp
+++ b/llarp/vpn/win32.hpp
@@ -8,9 +8,10 @@
 
 #include <winsock2.h>
 
-#include <iphlpapi.h>
 #include <windows.h>
 
+#include <iphlpapi.h>
+
 namespace llarp::win32
 {
   using namespace llarp::vpn;
diff --git a/llarp/win32/service_manager.cpp b/llarp/win32/service_manager.cpp
index df682e518..6b3167514 100644
--- a/llarp/win32/service_manager.cpp
+++ b/llarp/win32/service_manager.cpp
@@ -3,9 +3,6 @@
 #include <llarp.hpp>
 #include <llarp/util/logging.hpp>
 
-#include <dbghelp.h>
-#include <windows.h>
-
 #include <cassert>
 #include <chrono>
 #include <csignal>
@@ -18,7 +15,6 @@ namespace llarp::sys
 
   namespace
   {
-
     std::optional<DWORD>
     to_win32_state(ServiceState st)
     {
diff --git a/llarp/win32/service_manager.hpp b/llarp/win32/service_manager.hpp
index 37a8f54c6..425263382 100644
--- a/llarp/win32/service_manager.hpp
+++ b/llarp/win32/service_manager.hpp
@@ -2,6 +2,10 @@
 #include <llarp/util/service_manager.hpp>
 #include <llarp/util/types.hpp>
 
+#include <windows.h>
+
+#include <dbghelp.h>
+
 #include <chrono>
 
 namespace llarp::sys
diff --git a/llarp/win32/win32_inet.c b/llarp/win32/win32_inet.c
index 835794751..437e3a532 100644
--- a/llarp/win32/win32_inet.c
+++ b/llarp/win32/win32_inet.c
@@ -11,10 +11,11 @@
 // these need to be in a specific order
 #include <llarp/net/net.h>
 
+#include <windows.h>
+
 #include <assert.h>
 #include <iphlpapi.h>
 #include <stdbool.h>
-#include <windows.h>
 
 const char*
 inet_ntop(int af, const void* src, char* dst, size_t size)