diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 14507d729b1dce4880636a6034a042d33f370eaa..1bf019b557e37f58ee7a390780d977b21976b695 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.170 2004/10/18 16:24:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.171 2004/10/18 19:08:57 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to other files.
@@ -120,9 +120,7 @@ do { \
 /*
  * from utils/init/globals.c
  */
-#ifndef WIN32_CLIENT_ONLY
 extern pid_t PostmasterPid;
-#endif
 extern bool IsPostmasterEnvironment;
 extern bool IsUnderPostmaster;
 
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 6035b81bc532793f47e6d736615f580bb7fc70f5..d325abe89fd5b593f42fb63f15c5fc8b07b0d480 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.30 2004/10/17 23:53:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.31 2004/10/18 19:08:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,8 +37,6 @@
 
 #if defined(WIN32) || defined(__CYGWIN__)
 
-#include "miscadmin.h"
-
 #ifndef __CYGWIN__
 #include <winioctl.h>
 #else
diff --git a/src/port/exec.c b/src/port/exec.c
index 650fc724768829738d03feced3c52f556f0b1eaf..8d32754c8e7bd526e9343533de4fe40ba1e9c116 100644
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.29 2004/10/07 15:21:57 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.30 2004/10/18 19:08:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,8 +26,6 @@
 #include <unistd.h>
 #endif
 
-#include "miscadmin.h"
-
 #define _(x) gettext(x)
 
 #ifndef S_IRUSR					/* XXX [TRH] should be in a header */