diff --git a/src/include/config.h.win32 b/src/include/config.h.win32
index ec836d8190db96179400fdcf036a702767766604..9bee5dc9b7c6dde0e22edace4664a650661d9e9e 100644
--- a/src/include/config.h.win32
+++ b/src/include/config.h.win32
@@ -1,15 +1,17 @@
 /*
  * Parts of config.h that you get with autoconf on other systems
  */
-
-
 #define PG_VERSION "7.1"
 #define PG_VERSION_STR "7.1 (win32)"
 
 #define SYSCONFDIR ""
 
+#define DEF_PGPORT 5432
 #define DEF_PGPORT_STR "5432"
+
 #define MAXIMUM_ALIGNOF 4
+#define ACCEPT_TYPE_ARG3 int
+
 #define MAXPGPATH 1024
 
 #define INDEX_MAX_KEYS		16
diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h
index 98d1a8345c2ce9e9a4188a29537994c9e0b0a4f0..c8cddb51dc4b88d4f2020c345748d0f1f1c1ae76 100644
--- a/src/interfaces/libpq/win32.h
+++ b/src/interfaces/libpq/win32.h
@@ -21,9 +21,3 @@
  * crypt not available (yet)
  */
 #define crypt(a,b) a
-
-/*
- * Parts of config.h that you get with autoconf on other systems
- */
-#define MAXIMUM_ALIGNOF 4
-#define ACCEPT_TYPE_ARG3 int