diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h
index 09f9321bd6..3e9119f81a 100644
--- a/contrib/dblink/dblink.h
+++ b/contrib/dblink/dblink.h
@@ -74,6 +74,4 @@ extern Datum dblink_build_sql_delete(PG_FUNCTION_ARGS);
 extern Datum dblink_build_sql_update(PG_FUNCTION_ARGS);
 extern Datum dblink_current_query(PG_FUNCTION_ARGS);
 
-extern char *debug_query_string;
-
 #endif   /* DBLINK_H */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index d8271e32ab..1977417fc6 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.64 2002/09/04 20:31:45 momjian Exp $
+ * $Id: bufmgr.h,v 1.65 2002/10/21 18:57:34 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,12 +26,12 @@ typedef void *Block;
 extern int	NBuffers;
 
 /* in buf_init.c */
-extern Block *BufferBlockPointers;
+extern DLLIMPORT Block *BufferBlockPointers;
 extern long *PrivateRefCount;
 
 /* in localbuf.c */
 extern int	NLocBuffer;
-extern Block *LocalBufferBlockPointers;
+extern DLLIMPORT Block *LocalBufferBlockPointers;
 extern long *LocalRefCount;
 
 /* special pageno for bget */
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index de3d1d4e46..dd81713599 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: proc.h,v 1.60 2002/09/04 20:31:45 momjian Exp $
+ * $Id: proc.h,v 1.61 2002/10/21 18:57:34 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,7 +73,7 @@ struct PGPROC
 /* NOTE: "typedef struct PGPROC PGPROC" appears in storage/lock.h. */
 
 
-extern PGPROC *MyProc;
+extern DLLIMPORT PGPROC *MyProc;
 
 
 /*
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index ae909eb8af..f4ba67b3be 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.50 2002/10/14 23:49:20 tgl Exp $
+ * $Id: tcopprot.h,v 1.51 2002/10/21 18:57:35 petere Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -32,6 +32,7 @@ extern bool InError;
 extern CommandDest whereToSendOutput;
 extern bool HostnameLookup;
 extern bool ShowPortNumber;
+extern DLLIMPORT char* debug_query_string;
 
 #ifndef BOOTSTRAP_INCLUDE
 
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 51b570affd..48221bded3 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -4,7 +4,7 @@
  * External declarations pertaining to backend/utils/misc/guc.c and
  * backend/utils/misc/guc-file.l
  *
- * $Id: guc.h,v 1.23 2002/09/04 20:31:45 momjian Exp $
+ * $Id: guc.h,v 1.24 2002/10/21 18:57:35 petere Exp $
  */
 #ifndef GUC_H
 #define GUC_H
@@ -125,8 +125,6 @@ extern bool Explain_pretty_print;
 extern bool SQL_inheritance;
 extern bool Australian_timezones;
 
-extern char *debug_query_string;
-
 extern int	log_min_error_statement;
 extern char *log_min_error_statement_str;
 extern const char log_min_error_statement_str_default[];