diff --git a/src/fs/DirectoryReader.cxx b/src/fs/DirectoryReader.cxx
index 248ef39d6..79211b5c0 100644
--- a/src/fs/DirectoryReader.cxx
+++ b/src/fs/DirectoryReader.cxx
@@ -22,6 +22,8 @@
 
 #ifdef _WIN32
 
+#include <handleapi.h> // for INVALID_HANDLE_VALUE
+
 DirectoryReader::DirectoryReader(Path dir)
 	:handle(FindFirstFile(MakeWildcardPath(dir.c_str()), &data))
 {
diff --git a/src/fs/FileSystem.cxx b/src/fs/FileSystem.cxx
index ada18e033..ab479946d 100644
--- a/src/fs/FileSystem.cxx
+++ b/src/fs/FileSystem.cxx
@@ -22,6 +22,12 @@
 #include "Limits.hxx"
 #include "system/Error.hxx"
 
+#ifdef _WIN32
+#include <handleapi.h> // for CloseHandle()
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for MoveFileEx()
+#endif
+
 #include <cerrno>
 
 #include <fcntl.h>
diff --git a/src/thread/Thread.cxx b/src/thread/Thread.cxx
index 238f01c4d..cc19fe0d8 100644
--- a/src/thread/Thread.cxx
+++ b/src/thread/Thread.cxx
@@ -24,6 +24,12 @@
 #include "java/Global.hxx"
 #endif
 
+#ifdef _WIN32
+#include <synchapi.h> // for WaitForSingleObject()
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for INFINITE
+#endif
+
 void
 Thread::Start()
 {