win32, ...: avoid including windows.h

src/fs/DirectoryReader.hxx

@@ -24,7 +24,7 @@
 
 #ifdef _WIN32
 
-#include <windows.h>
+#include <fileapi.h>
 #include <tchar.h>
 
 /**

src/fs/io/FileOutputStream.hxx

@@ -42,7 +42,10 @@
 #include <cstdint>
 
 #ifdef _WIN32
-#include <windows.h>
+#include <fileapi.h>
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <handleapi.h> // for INVALID_HANDLE_VALUE
+#include <winbase.h> // for FILE_END
 #endif
 
 #if defined(__linux__) && !defined(ANDROID)

src/fs/io/FileReader.hxx

@@ -35,7 +35,10 @@
 #include "util/Compiler.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include <fileapi.h>
+#include <handleapi.h> // for INVALID_HANDLE_VALUE
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for FILE_CURRENT
 #else
 #include "io/UniqueFileDescriptor.hxx"
 #endif

src/output/plugins/WinmmOutputPlugin.cxx

@@ -28,6 +28,10 @@
 #include <array>
 #include <iterator>
 
+#include <handleapi.h>
+#include <synchapi.h>
+#include <winbase.h> // for INFINITE
+
 #include <stdlib.h>
 #include <string.h>
 

src/output/plugins/WinmmOutputPlugin.hxx

@@ -26,7 +26,7 @@
 
 #include "util/Compiler.h"
 
-#include <windows.h>
+#include <windef.h>
 #include <mmsystem.h>
 
 struct WinmmOutput;

src/system/Error.hxx

@@ -49,7 +49,9 @@ FormatSystemError(std::error_code code, const char *fmt,
 
 #ifdef _WIN32
 
-#include <windows.h>
+#include <errhandlingapi.h> // for GetLastError()
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for FormatMessageA()
 
 static inline std::system_error
 MakeLastError(DWORD code, const char *msg) noexcept

src/system/FatalError.cxx

@@ -27,7 +27,9 @@
 #include <cstring>
 
 #ifdef _WIN32
-#include <windows.h>
+#include <errhandlingapi.h> // for GetLastError()
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for FormatMessageA()
 #else
 #include <cerrno>
 #endif

src/thread/CriticalSection.hxx

@@ -30,7 +30,7 @@
 #ifndef THREAD_CRITICAL_SECTION_HXX
 #define THREAD_CRITICAL_SECTION_HXX
 
-#include <windows.h>
+#include <synchapi.h>
 
 /**
  * Wrapper for a CRITICAL_SECTION, backend for the Mutex class.

src/thread/Id.hxx

@@ -23,7 +23,7 @@
 #include "util/Compiler.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include <processthreadsapi.h>
 #else
 #include <pthread.h>
 #endif

src/thread/Thread.hxx

@@ -26,7 +26,7 @@
 #include <cassert>
 
 #ifdef _WIN32
-#include <windows.h>
+#include <processthreadsapi.h>
 #else
 #include <pthread.h>
 #endif

src/thread/WindowsCond.hxx

@@ -32,6 +32,9 @@
 
 #include "CriticalSection.hxx"
 
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for INFINITE
+
 #include <chrono>
 #include <mutex>
 

src/util/HugeAllocator.hxx

@@ -77,7 +77,7 @@ void
 HugeDiscard(void *p, size_t size) noexcept;
 
 #elif defined(_WIN32)
-#include <windows.h>
+#include <memoryapi.h>
 
 WritableBuffer<void>
 HugeAllocate(size_t size);

src/win32/Com.hxx

@@ -21,8 +21,8 @@
 #define MPD_WIN32_COM_HXX
 
 #include "HResult.hxx"
-#include <objbase.h>
-#include <windows.h>
+
+#include <combaseapi.h>
 
 // RAII for Microsoft Component Object Model(COM)
 // https://docs.microsoft.com/en-us/windows/win32/api/_com/

src/win32/ComHeapPtr.hxx

@@ -23,7 +23,8 @@
 #include <cstddef>
 #include <objbase.h>
 #include <utility>
-#include <windows.h>
+
+#include <combaseapi.h>
 
 // RAII for CoTaskMemAlloc and CoTaskMemFree
 // https://docs.microsoft.com/zh-tw/windows/win32/api/combaseapi/nf-combaseapi-cotaskmemalloc

src/win32/ComPtr.hxx

@@ -21,10 +21,12 @@
 #define MPD_WIN32_COMPTR_HXX
 
 #include "win32/HResult.hxx"
+
 #include <cstddef>
 #include <objbase.h>
 #include <utility>
-#include <windows.h>
+
+#include <combaseapi.h>
 
 // RAII for Object in Microsoft Component Object Model(COM)
 // https://docs.microsoft.com/zh-tw/windows/win32/api/_com/

src/win32/ComWorker.hxx

@@ -26,8 +26,6 @@
 
 #include <boost/lockfree/spsc_queue.hpp>
 
-#include <windows.h>
-
 // Worker thread for all COM operation
 class COMWorker {
 	Thread thread{BIND_THIS_METHOD(Work)};

src/win32/WinEvent.hxx

@@ -20,7 +20,10 @@
 #ifndef MPD_WIN32_WINEVENT_HXX
 #define MPD_WIN32_WINEVENT_HXX
 
-#include <windows.h>
+#include <handleapi.h>
+#include <synchapi.h>
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for INFINITE
 
 // RAII for Windows unnamed event object
 // https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-createeventw