diff --git a/src/win32/ComWorker.cxx b/src/win32/ComWorker.cxx
index d708dffbe..cd84c9730 100644
--- a/src/win32/ComWorker.cxx
+++ b/src/win32/ComWorker.cxx
@@ -16,11 +16,12 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 #include "ComWorker.hxx"
-#include "Log.hxx"
+#include "Com.hxx"
 #include "thread/Name.hxx"
 #include "util/Domain.hxx"
-#include "win32/Com.hxx"
+#include "Log.hxx"
 
 namespace {
 static constexpr Domain com_worker_domain("com_worker");
diff --git a/src/win32/ComWorker.hxx b/src/win32/ComWorker.hxx
index 0d45f667b..10f2123a4 100644
--- a/src/win32/ComWorker.hxx
+++ b/src/win32/ComWorker.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Music Player Daemon Project
+ * Copyright 2020-2021 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,14 +20,15 @@
 #ifndef MPD_WIN32_COM_WORKER_HXX
 #define MPD_WIN32_COM_WORKER_HXX
 
+#include "WinEvent.hxx"
+#include "thread/Future.hxx"
+#include "thread/Mutex.hxx"
+#include "thread/Thread.hxx"
+
 #include <boost/lockfree/spsc_queue.hpp>
 #include <mutex>
 #include <optional>
 
-#include "thread/Future.hxx"
-#include "thread/Mutex.hxx"
-#include "thread/Thread.hxx"
-#include "win32/WinEvent.hxx"
 #include <windows.h>
 
 // Worker thread for all COM operation