diff --git a/src/include/port/win32_include/arpa/inet.h b/src/include/port/win32/arpa/inet.h
similarity index 100%
rename from src/include/port/win32_include/arpa/inet.h
rename to src/include/port/win32/arpa/inet.h
diff --git a/src/include/port/win32_include/dlfcn.h b/src/include/port/win32/dlfcn.h
similarity index 100%
rename from src/include/port/win32_include/dlfcn.h
rename to src/include/port/win32/dlfcn.h
diff --git a/src/include/port/win32_include/grp.h b/src/include/port/win32/grp.h
similarity index 100%
rename from src/include/port/win32_include/grp.h
rename to src/include/port/win32/grp.h
diff --git a/src/include/port/win32_include/netdb.h b/src/include/port/win32/netdb.h
similarity index 100%
rename from src/include/port/win32_include/netdb.h
rename to src/include/port/win32/netdb.h
diff --git a/src/include/port/win32_include/netinet/in.h b/src/include/port/win32/netinet/in.h
similarity index 100%
rename from src/include/port/win32_include/netinet/in.h
rename to src/include/port/win32/netinet/in.h
diff --git a/src/include/port/win32_include/pwd.h b/src/include/port/win32/pwd.h
similarity index 100%
rename from src/include/port/win32_include/pwd.h
rename to src/include/port/win32/pwd.h
diff --git a/src/include/port/win32_include/sys/socket.h b/src/include/port/win32/sys/socket.h
similarity index 100%
rename from src/include/port/win32_include/sys/socket.h
rename to src/include/port/win32/sys/socket.h
diff --git a/src/include/port/win32_include/sys/wait.h b/src/include/port/win32/sys/wait.h
similarity index 100%
rename from src/include/port/win32_include/sys/wait.h
rename to src/include/port/win32/sys/wait.h
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index 0fb52b97fe..b6f178f4a4 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -1,7 +1,7 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.win32,v 1.1 2003/05/15 16:35:30 momjian Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.win32,v 1.2 2003/05/19 17:31:59 momjian Exp $
 
 # Use replacement include files for those missing on Win32
-override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32_include"
+override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
 
 DLLTOOL= dlltool
 DLLWRAP= dllwrap