diff --git a/Make.mk b/Make.mk
index 5225eeeb..4e0e5fee 100644
--- a/Make.mk
+++ b/Make.mk
@@ -124,6 +124,10 @@ empth_obj := src/lib/empthread/ntthread.o
 empth_lib :=
 endif
 
+ifeq ($(empthread),Windows)	# really: W32, regardless of thread package
+libs += lib/libw32.a
+endif
+
 # Cleanliness
 # Each generated file should be in one of the following sets.
 # Removed by clean:
@@ -262,6 +266,7 @@ lib/libcommon.a: $(filter src/lib/common/%, $(obj))
 lib/libgen.a: $(filter src/lib/gen/%, $(obj))
 lib/libglobal.a: $(filter src/lib/global/%, $(obj))
 lib/liblwp.a: $(filter src/lib/lwp/%, $(obj))
+lib/libw32.a: $(filter src/lib/w32/%, $(obj))
 
 $(libs) $(empth_lib):
 	$(AR) rc $@ $?
diff --git a/src/lib/gen/getopt.c b/src/lib/w32/getopt.c
similarity index 100%
rename from src/lib/gen/getopt.c
rename to src/lib/w32/getopt.c
diff --git a/src/lib/gen/getopt.h b/src/lib/w32/getopt.h
similarity index 100%
rename from src/lib/gen/getopt.h
rename to src/lib/w32/getopt.h
diff --git a/src/lib/gen/service.c b/src/lib/w32/service.c
similarity index 100%
rename from src/lib/gen/service.c
rename to src/lib/w32/service.c