diff --git a/src/bin/pgevent/pgevent.c b/src/bin/pgevent/pgevent.c
index 38bfd5177b..d91840f99f 100644
--- a/src/bin/pgevent/pgevent.c
+++ b/src/bin/pgevent/pgevent.c
@@ -6,15 +6,15 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pgevent/pgevent.c,v 1.3 2004/08/30 02:54:40 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pgevent/pgevent.c,v 1.4 2004/09/27 19:16:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 
-#include "windows.h"
-#include "olectl.h"
-#include "string.h"
+#include <windows.h>
+#include <olectl.h>
+#include <string.h>
 
 /* Global variables */
 HANDLE		g_module = NULL;	/* hModule of DLL */
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 072df4abce..7cc59c1421 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,17 +3,13 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.37 2004/08/29 05:06:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.38 2004/09/27 19:16:02 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "input.h"
 
 #include <errno.h>
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 #include "pqexpbuffer.h"
 #include "settings.h"
 #include "tab-complete.h"
diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c
index 588aa242f2..78cbdcdf6d 100644
--- a/src/bin/psql/mbprint.c
+++ b/src/bin/psql/mbprint.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.14 2004/08/29 04:13:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.15 2004/09/27 19:16:02 momjian Exp $
  */
 
 #include "postgres_fe.h"
@@ -14,10 +14,6 @@
 
 #include "mb/pg_wchar.h"
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 /*
  * This is an implementation of wcwidth() and wcswidth() as defined in
  * "The Single UNIX Specification, Version 2, The Open Group, 1997"
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 06b0c06da9..e0aea1d3eb 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.100 2004/09/13 23:07:12 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.101 2004/09/27 19:16:02 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -13,7 +13,6 @@
 #include <unistd.h>
 #else							/* WIN32 */
 #include <io.h>
-#include <windows.h>
 #include <win32.h>
 #endif   /* WIN32 */
 
diff --git a/src/port/crypt.c b/src/port/crypt.c
index caa8d82142..10f63e7d20 100644
--- a/src/port/crypt.c
+++ b/src/port/crypt.c
@@ -52,9 +52,7 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
 #include <limits.h>
 #include <stdlib.h>
 
-#ifdef WIN32
-#include <windows.h>
-#else
+#ifndef WIN32
 #include <unistd.h>
 #endif
 
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index d2b51716ed..1141138984 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -10,7 +10,7 @@
  *	Win32 (NT, Win2k, XP).	replace() doesn't work on Win95/98/Me.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.26 2004/09/10 09:58:21 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.27 2004/09/27 19:16:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -402,7 +402,6 @@ rmtree(char *path, bool rmtopdir)
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <windows.h>
 
 #define halt(str) \
 do { \
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index d6b0a71e96..1e07315344 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/sprompt.c,v 1.8 2004/08/29 05:07:02 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/sprompt.c,v 1.9 2004/09/27 19:16:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,11 +30,6 @@
 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
-#else
-#ifdef WIN32
-#include <windows.h>
-#undef ERROR
-#endif
 #endif
 
 bool		prompt_state = false;
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index 3a9308bc62..5cc2432998 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -3,7 +3,7 @@
  * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/zic.c,v 1.12 2004/08/29 05:07:02 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/zic.c,v 1.13 2004/09/27 19:16:03 momjian Exp $
  */
 
 #include "postgres.h"
@@ -18,10 +18,6 @@
 #include "private.h"
 #include "tzfile.h"
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif