diff --git a/configure.ac b/configure.ac
index 660db608c..706b8c88a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl When updating the version, remember to update the following files
 dnl appropriately:
-dnl
-dnl include/win32/setup.h
-dnl src/win32/unrealinst.iss
+dnl include/windows/setup.h
+dnl src/windows/unrealinst.iss
 dnl doc/Config.header
 dnl src/version.c.SH
 
diff --git a/include/win32/setup.h b/include/windows/setup.h
similarity index 100%
rename from include/win32/setup.h
rename to include/windows/setup.h
diff --git a/makefile.win32 b/makefile.win32
index cc337f1db..36fce85a5 100644
--- a/makefile.win32
+++ b/makefile.win32
@@ -126,9 +126,9 @@ MODDBGCFLAG=/LDd /MD /Zi
 !ENDIF 
 
 FD_SETSIZE=/D FD_SETSIZE=16384
-CFLAGS=$(DBGCFLAG) $(PCRE2_INC) $(ARGON2_INC) $(CARES_INC) $(LIBCURL_INC) $(LIBRESSL_INC) /J /I ./INCLUDE /I ./INCLUDE/WIN32/ARES /Fosrc/ /nologo \
+CFLAGS=$(DBGCFLAG) $(PCRE2_INC) $(ARGON2_INC) $(CARES_INC) $(LIBCURL_INC) $(LIBRESSL_INC) /J /I ./INCLUDE /Fosrc/ /nologo \
  $(CURLCFLAGS) $(FD_SETSIZE) $(SSLCFLAGS) /D NOSPOOF=1 /c /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _USE_32BIT_TIME_T
-CFLAGSST=$(DBGCFLAGST) $(PCRE2_INC) $(ARGON2_INC) $(CARES_INC) $(LIBCURL_INC) $(LIBRESSL_INC) /J /I ./INCLUDE /I ./INCLUDE/WIN32/ARES /Fosrc/ /nologo \
+CFLAGSST=$(DBGCFLAGST) $(PCRE2_INC) $(ARGON2_INC) $(CARES_INC) $(LIBCURL_INC) $(LIBRESSL_INC) /J /I ./INCLUDE /Fosrc/ /nologo \
  $(CURLCFLAGS) $(FD_SETSIZE) $(SSLCFLAGS) /D NOSPOOF=1 /c /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _USE_32BIT_TIME_T
 LFLAGS=kernel32.lib user32.lib gdi32.lib shell32.lib ws2_32.lib advapi32.lib \
  dbghelp.lib oldnames.lib comctl32.lib comdlg32.lib $(CARES_LIB) $(CARESLIB) \
@@ -165,7 +165,7 @@ EXP_OBJ_FILES=SRC/CHANNEL.OBJ SRC/SEND.OBJ SRC/SOCKET.OBJ \
  SRC/OPENSSL_HOSTNAME_VALIDATION.OBJ $(CURLOBJ)
 
 OBJ_FILES=$(EXP_OBJ_FILES) SRC/GUI.OBJ SRC/SERVICE.OBJ SRC/WINDEBUG.OBJ SRC/RTF.OBJ \
- SRC/EDITOR.OBJ SRC/WIN32.OBJ 
+ SRC/EDITOR.OBJ SRC/WINDOWS.OBJ 
 
 DLL_FILES=SRC/MODULES/M_CHGHOST.DLL SRC/MODULES/M_SDESC.DLL SRC/MODULES/M_SETIDENT.DLL \
  SRC/MODULES/M_SETNAME.DLL SRC/MODULES/M_SETHOST.DLL SRC/MODULES/M_CHGIDENT.DLL \
@@ -305,18 +305,18 @@ CLEAN:
 	-@erase src\modules\*.pdb >NUL
 	-@erase src\modules\*.ilk >NUL
 
-./UNREALSVC.EXE: SRC/UNREALSVC.OBJ SRC/WIN32/UNREALSVC.RES
-	$(LINK) $(DBGLFLAGST) advapi32.lib src/unrealsvc.obj src/win32/unrealsvc.res
+./UNREALSVC.EXE: SRC/UNREALSVC.OBJ SRC/WINDOWS/UNREALSVC.RES
+	$(LINK) $(DBGLFLAGST) advapi32.lib src/unrealsvc.obj src/windows/unrealsvc.res
 
 CONF:
 	-@copy include\win32\setup.h include\setup.h >NUL
-	$(CC) src/win32/config.c
+	$(CC) src/windows/config.c
 	-@config.exe
 
 
 
-./UnrealIRCd.exe: $(OBJ_FILES) SRC/win32/WIN32.RES
-        $(LINK) $(LFLAGS) $(OBJ_FILES) SRC/win32/WIN32.RES /MAP
+./UnrealIRCd.exe: $(OBJ_FILES) src/windows/WIN32.RES
+        $(LINK) $(LFLAGS) $(OBJ_FILES) SRC/windows/WIN32.RES /MAP
 	-@erase src\win32\win32.res
 	$(MT) -manifest src\win32\UnrealIRCd.exe.manifest -outputresource:UnrealIRCd.exe;1
 !IFNDEF DEBUGEXTRA
@@ -429,26 +429,26 @@ src/hash.obj: src/hash.c $(INCLUDES)
 src/crule.obj: src/crule.c $(INCLUDES)
         $(CC) $(CFLAGS) src/crule.c
 
-src/gui.obj: src/win32/gui.c $(INCLUDES) ./include/resource.h
-        $(CC) $(CFLAGS) src/win32/gui.c
+src/gui.obj: src/windows/gui.c $(INCLUDES) ./include/resource.h
+        $(CC) $(CFLAGS) src/windows/gui.c
 
-src/rtf.obj: src/win32/rtf.c $(INCLUDES) ./src/win32/win32.h
-	$(CC) $(CFLAGS) src/win32/rtf.c
+src/rtf.obj: src/windows/rtf.c $(INCLUDES) ./src/windows/win32.h
+	$(CC) $(CFLAGS) src/windows/rtf.c
 
-src/editor.obj: src/win32/editor.c $(INCLUDES) ./include/resource.h ./src/win32/win32.h
-        $(CC) $(CFLAGS) src/win32/editor.c
+src/editor.obj: src/windows/editor.c $(INCLUDES) ./include/resource.h ./src/windows/win32.h
+        $(CC) $(CFLAGS) src/windows/editor.c
 
-src/service.obj: src/win32/service.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/win32/service.c
+src/service.obj: src/windows/service.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/windows/service.c
 
-src/windebug.obj: src/win32/windebug.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/win32/windebug.c
+src/windebug.obj: src/windows/windebug.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/windows/windebug.c
 
-src/win32.obj: src/win32/win32.c $(INCLUDES)
-	$(CC) $(CFLAGS) src/win32/win32.c
+src/windows.obj: src/windows/win32.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/windows/win32.c
 
-src/unrealsvc.obj: src/win32/unrealsvc.c $(INCLUDES)
-	$(CC) $(CFLAGSST) src/win32/unrealsvc.c
+src/unrealsvc.obj: src/windows/unrealsvc.c $(INCLUDES)
+	$(CC) $(CFLAGSST) src/windows/unrealsvc.c
 
 src/modules.obj: src/modules.c $(INCLUDES)
 	$(CC) $(CFLAGS) src/modules.c
@@ -516,13 +516,13 @@ src/operclass.obj: src/operclass.c $(INCLUDES) ./include/dbuf.h
 src/updconf.obj: src/updconf.c $(INCLUDES) ./include/dbuf.h
         $(CC) $(CFLAGS) src/updconf.c
 
-src/win32/win32.res: src/win32/win32gui.rc
-        $(RC) /l 0x409 /fosrc/win32/win32.res /i ./include /i ./src \
-              /d NDEBUG src/win32/win32gui.rc
+src/windows/win32.res: src/windows/win32gui.rc
+        $(RC) /l 0x409 /fosrc/windows/win32.res /i ./include /i ./src \
+              /d NDEBUG src/windows/win32gui.rc
 
-src/win32/unrealsvc.res: src/win32/unrealsvc.rc
-        $(RC) /l 0x409 /fosrc/win32/unrealsvc.res /i ./include /i ./src \
-              /d NDEBUG src/win32/unrealsvc.rc
+src/windows/unrealsvc.res: src/windows/unrealsvc.rc
+        $(RC) /l 0x409 /fosrc/windows/unrealsvc.res /i ./include /i ./src \
+              /d NDEBUG src/windows/unrealsvc.rc
 
 ################# Modules #################
 
@@ -531,7 +531,7 @@ CUSTOMMODULE: src/modules/third/$(MODULEFILE).c
 	      /OUT:src/modules/third/$(MODULEFILE).dll $(EXLIBS)
 
 SYMBOLFILE: 
-	$(CC) src/win32/def-clean.c
+	$(CC) src/windows/def-clean.c
 	dlltool --output-def UnrealIRCd.def.in --export-all-symbols $(EXP_OBJ_FILES)
 	def-clean UnrealIRCd.def.in UnrealIRCd.def
 
diff --git a/src/win32/Icon1.ico b/src/windows/Icon1.ico
similarity index 100%
rename from src/win32/Icon1.ico
rename to src/windows/Icon1.ico
diff --git a/src/win32/UnrealIRCd.exe.manifest b/src/windows/UnrealIRCd.exe.manifest
similarity index 100%
rename from src/win32/UnrealIRCd.exe.manifest
rename to src/windows/UnrealIRCd.exe.manifest
diff --git a/src/win32/Win32GUI.rc b/src/windows/Win32GUI.rc
similarity index 100%
rename from src/win32/Win32GUI.rc
rename to src/windows/Win32GUI.rc
diff --git a/src/win32/Win32New.h b/src/windows/Win32New.h
similarity index 100%
rename from src/win32/Win32New.h
rename to src/windows/Win32New.h
diff --git a/src/win32/bar.bmp b/src/windows/bar.bmp
similarity index 100%
rename from src/win32/bar.bmp
rename to src/windows/bar.bmp
diff --git a/src/win32/compilerhelp.c b/src/windows/compilerhelp.c
similarity index 100%
rename from src/win32/compilerhelp.c
rename to src/windows/compilerhelp.c
diff --git a/src/win32/config.c b/src/windows/config.c
similarity index 100%
rename from src/win32/config.c
rename to src/windows/config.c
diff --git a/src/win32/def-clean.c b/src/windows/def-clean.c
similarity index 100%
rename from src/win32/def-clean.c
rename to src/windows/def-clean.c
diff --git a/src/win32/editor.c b/src/windows/editor.c
similarity index 100%
rename from src/win32/editor.c
rename to src/windows/editor.c
diff --git a/src/win32/gpl.rtf b/src/windows/gpl.rtf
similarity index 100%
rename from src/win32/gpl.rtf
rename to src/windows/gpl.rtf
diff --git a/src/win32/gplplusssl.rtf b/src/windows/gplplusssl.rtf
similarity index 100%
rename from src/win32/gplplusssl.rtf
rename to src/windows/gplplusssl.rtf
diff --git a/src/win32/gui.c b/src/windows/gui.c
similarity index 100%
rename from src/win32/gui.c
rename to src/windows/gui.c
diff --git a/src/win32/hand.CUR b/src/windows/hand.CUR
similarity index 100%
rename from src/win32/hand.CUR
rename to src/windows/hand.CUR
diff --git a/src/win32/leavealone.h b/src/windows/leavealone.h
similarity index 100%
rename from src/win32/leavealone.h
rename to src/windows/leavealone.h
diff --git a/src/win32/makecert.bat b/src/windows/makecert.bat
similarity index 100%
rename from src/win32/makecert.bat
rename to src/windows/makecert.bat
diff --git a/src/win32/resource.h b/src/windows/resource.h
similarity index 100%
rename from src/win32/resource.h
rename to src/windows/resource.h
diff --git a/src/win32/rtf.c b/src/windows/rtf.c
similarity index 100%
rename from src/win32/rtf.c
rename to src/windows/rtf.c
diff --git a/src/win32/service.c b/src/windows/service.c
similarity index 100%
rename from src/win32/service.c
rename to src/windows/service.c
diff --git a/src/win32/toolbar.bmp b/src/windows/toolbar.bmp
similarity index 100%
rename from src/win32/toolbar.bmp
rename to src/windows/toolbar.bmp
diff --git a/src/win32/unreal.bmp b/src/windows/unreal.bmp
similarity index 100%
rename from src/win32/unreal.bmp
rename to src/windows/unreal.bmp
diff --git a/src/win32/unrealinst.iss b/src/windows/unrealinst.iss
similarity index 100%
rename from src/win32/unrealinst.iss
rename to src/windows/unrealinst.iss
diff --git a/src/win32/unrealsvc.c b/src/windows/unrealsvc.c
similarity index 100%
rename from src/win32/unrealsvc.c
rename to src/windows/unrealsvc.c
diff --git a/src/win32/unrealsvc.rc b/src/windows/unrealsvc.rc
similarity index 100%
rename from src/win32/unrealsvc.rc
rename to src/windows/unrealsvc.rc
diff --git a/src/win32/win32.c b/src/windows/win32.c
similarity index 100%
rename from src/win32/win32.c
rename to src/windows/win32.c
diff --git a/src/win32/win32.h b/src/windows/win32.h
similarity index 100%
rename from src/win32/win32.h
rename to src/windows/win32.h
diff --git a/src/win32/windebug.c b/src/windows/windebug.c
similarity index 100%
rename from src/win32/windebug.c
rename to src/windows/windebug.c