diff --git a/Make.mk b/Make.mk
index 4e0e5fee..272bc58f 100644
--- a/Make.mk
+++ b/Make.mk
@@ -144,6 +144,9 @@ cli_distgen := $(acdistcli)
 
 # Compiler flags
 CPPFLAGS += -I$(srcdir)/include -I.
+ifeq ($(empthread),Windows)	# really: W32, regardless of thread package
+CPPFLAGS += -I$(srcdir)/src/lib/w32
+endif
 ifeq ($(have_gcc),yes)
 CFLAGS += -fno-builtin-carg	# conflicts with our carg()
 CFLAGS += -fno-common
diff --git a/src/server/main.c b/src/server/main.c
index 5e7c2054..f91db585 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -44,10 +44,10 @@
 #if defined(_WIN32)
 #include <winsock2.h>
 #undef NS_ALL
-#include <process.h>
 #include <direct.h>
+#include <getopt.h>
+#include <process.h>
 #include "service.h"
-#include "../lib/gen/getopt.h"
 #else
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/util/empsched.c b/src/util/empsched.c
index 78e31d5e..4907bd6a 100644
--- a/src/util/empsched.c
+++ b/src/util/empsched.c
@@ -34,7 +34,7 @@
 #include <config.h>
 
 #if defined(_WIN32)
-#include "../lib/gen/getopt.h"
+#include <getopt.h>
 #else
 #include <unistd.h>
 #endif
diff --git a/src/util/fairland.c b/src/util/fairland.c
index d16d9e1e..3b26d894 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -67,7 +67,7 @@ static int quiet = 0;
 #define URAN_MIN   56
 
 #if defined(_WIN32)
-#include "../lib/gen/getopt.h"
+#include <getopt.h>
 #else
 #include <unistd.h>
 #endif
diff --git a/src/util/files.c b/src/util/files.c
index d67f5062..76489e84 100644
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -40,8 +40,8 @@
 #include <errno.h>
 #if defined(_WIN32)
 #include <direct.h>
+#include <getopt.h>
 #include <io.h>
-#include "../lib/gen/getopt.h"
 #else
 #include <unistd.h>
 #endif