diff --git a/src/bin/pgtclsh/pgtclAppInit.c b/src/bin/pgtclsh/pgtclAppInit.c
index 184c933475..f5fdfeec46 100644
--- a/src/bin/pgtclsh/pgtclAppInit.c
+++ b/src/bin/pgtclsh/pgtclAppInit.c
@@ -14,7 +14,7 @@
 
 #include <tcl.h>
 
-#include <libpgtcl.h>
+#include "libpgtcl.h"
 
 /*
  * The following variable is a special hack that is needed in order for
diff --git a/src/bin/pgtclsh/pgtkAppInit.c b/src/bin/pgtclsh/pgtkAppInit.c
index 9afa90bd72..798bc67b4e 100644
--- a/src/bin/pgtclsh/pgtkAppInit.c
+++ b/src/bin/pgtclsh/pgtkAppInit.c
@@ -13,7 +13,7 @@
  */
 
 #include <tk.h>
-#include <libpgtcl.h>
+#include "libpgtcl.h"
 
 /*
  * The following variable is a special hack that is needed in order for
diff --git a/src/interfaces/cli/example1.c b/src/interfaces/cli/example1.c
index 88d8d7f403..75cedda3dd 100644
--- a/src/interfaces/cli/example1.c
+++ b/src/interfaces/cli/example1.c
@@ -30,7 +30,7 @@
  * calls.
  */
 
-#include <sqlcli.h>
+#include "sqlcli.h"
 #include <string.h>
 
 #ifndef NULL
diff --git a/src/interfaces/cli/example2.c b/src/interfaces/cli/example2.c
index d74b1e971a..7230abc4da 100644
--- a/src/interfaces/cli/example2.c
+++ b/src/interfaces/cli/example2.c
@@ -30,7 +30,7 @@
  * Sample program - uses concise CLI functions to execute
  * interactively an ad hoc statement.
  */
-#include <sqlcli.h>
+#include "sqlcli.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
index f255e4f28a..5d1cde5516 100644
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -1,5 +1,5 @@
-#include <postgres.h>
-#include <libpq-fe.h>
+#include "postgres.h"
+#include "libpq-fe.h"
 
 #ifdef __cplusplus
 extern		"C"
diff --git a/src/interfaces/ecpg/lib/connect.c b/src/interfaces/ecpg/lib/connect.c
index 8452271926..416fcf17dd 100644
--- a/src/interfaces/ecpg/lib/connect.c
+++ b/src/interfaces/ecpg/lib/connect.c
@@ -1,8 +1,8 @@
-#include <ecpgtype.h>
-#include <ecpglib.h>
-#include <ecpgerrno.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
+#include "ecpgerrno.h"
 #include "extern.h"
-#include <sqlca.h>
+#include "sqlca.h"
 
 static struct connection *all_connections = NULL,
 		   *actual_connection = NULL;
diff --git a/src/interfaces/ecpg/lib/data.c b/src/interfaces/ecpg/lib/data.c
index 18ac49805b..054966f9cf 100644
--- a/src/interfaces/ecpg/lib/data.c
+++ b/src/interfaces/ecpg/lib/data.c
@@ -1,11 +1,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ecpgtype.h>
-#include <ecpglib.h>
-#include <ecpgerrno.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
+#include "ecpgerrno.h"
 #include "extern.h"
-#include <sqlca.h>
+#include "sqlca.h"
 
 bool
 get_data(PGresult *results, int act_tuple, int act_field, int lineno,
diff --git a/src/interfaces/ecpg/lib/descriptor.c b/src/interfaces/ecpg/lib/descriptor.c
index c79baf799a..fe4a04d2e0 100644
--- a/src/interfaces/ecpg/lib/descriptor.c
+++ b/src/interfaces/ecpg/lib/descriptor.c
@@ -1,8 +1,8 @@
-#include <ecpgtype.h>
-#include <ecpglib.h>
-#include <ecpgerrno.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
+#include "ecpgerrno.h"
 #include "extern.h"
-#include <sql3types.h>
+#include "sql3types.h"
 
 struct descriptor
 {
diff --git a/src/interfaces/ecpg/lib/error.c b/src/interfaces/ecpg/lib/error.c
index 369972687c..0c9c197edf 100644
--- a/src/interfaces/ecpg/lib/error.c
+++ b/src/interfaces/ecpg/lib/error.c
@@ -1,10 +1,10 @@
 #include <stdio.h>
 
-#include <ecpgerrno.h>
-#include <ecpgtype.h>
-#include <ecpglib.h>
+#include "ecpgerrno.h"
+#include "ecpgtype.h"
+#include "ecpglib.h"
 #include "extern.h"
-#include <sqlca.h>
+#include "sqlca.h"
 
 void
 ECPGraise(int line, int code, const char *str)
diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c
index 43b7a60387..f606a88e84 100644
--- a/src/interfaces/ecpg/lib/execute.c
+++ b/src/interfaces/ecpg/lib/execute.c
@@ -15,12 +15,12 @@
 #include <stdio.h>
 #include <locale.h>
 
-#include <ecpgtype.h>
-#include <ecpglib.h>
-#include <ecpgerrno.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
+#include "ecpgerrno.h"
 #include "extern.h"
-#include <sqlca.h>
-#include <sql3types.h>
+#include "sqlca.h"
+#include "sql3types.h"
 
 /* variables visible to the programs */
 struct sqlca sqlca =
@@ -868,7 +868,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
  *
  * Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>
  *
- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.6 2000/04/12 17:17:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.7 2000/05/29 21:25:00 momjian Exp $
  */
 
 PGconn	   *ECPG_internal_get_connection(char *name);
diff --git a/src/interfaces/ecpg/lib/extern.h b/src/interfaces/ecpg/lib/extern.h
index 86cc8bbab8..db2f3a7d41 100644
--- a/src/interfaces/ecpg/lib/extern.h
+++ b/src/interfaces/ecpg/lib/extern.h
@@ -1,5 +1,5 @@
-#include <postgres.h>
-#include <libpq-fe.h>
+#include "postgres.h"
+#include "libpq-fe.h"
 
 /* Here are some methods used by the lib. */
 /* Returns a pointer to a string containing a simple type name. */
diff --git a/src/interfaces/ecpg/lib/memory.c b/src/interfaces/ecpg/lib/memory.c
index 463dad129f..e6ef531128 100644
--- a/src/interfaces/ecpg/lib/memory.c
+++ b/src/interfaces/ecpg/lib/memory.c
@@ -1,6 +1,6 @@
-#include <ecpgtype.h>
-#include <ecpglib.h>
-#include <ecpgerrno.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
+#include "ecpgerrno.h"
 #include "extern.h"
 
 char *
diff --git a/src/interfaces/ecpg/lib/misc.c b/src/interfaces/ecpg/lib/misc.c
index dbfb8b810d..c0b585cf1d 100644
--- a/src/interfaces/ecpg/lib/misc.c
+++ b/src/interfaces/ecpg/lib/misc.c
@@ -1,9 +1,9 @@
 #include <unistd.h>
-#include <ecpgtype.h>
-#include <ecpglib.h>
-#include <ecpgerrno.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
+#include "ecpgerrno.h"
 #include "extern.h"
-#include <sqlca.h>
+#include "sqlca.h"
 
 static struct sqlca sqlca_init =
 {
diff --git a/src/interfaces/ecpg/lib/prepare.c b/src/interfaces/ecpg/lib/prepare.c
index c49d44ab8d..5090004875 100644
--- a/src/interfaces/ecpg/lib/prepare.c
+++ b/src/interfaces/ecpg/lib/prepare.c
@@ -1,10 +1,10 @@
 #include <ctype.h>
 
-#include <ecpgtype.h>
-#include <ecpglib.h>
-#include <ecpgerrno.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
+#include "ecpgerrno.h"
 #include "extern.h"
-#include <sqlca.h>
+#include "sqlca.h"
 
 static struct prepared_statement
 {
diff --git a/src/interfaces/ecpg/lib/typename.c b/src/interfaces/ecpg/lib/typename.c
index 19f1fcdbf2..18f9aef57e 100644
--- a/src/interfaces/ecpg/lib/typename.c
+++ b/src/interfaces/ecpg/lib/typename.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
-#include <ecpgtype.h>
-#include <ecpglib.h>
+#include "ecpgtype.h"
+#include "ecpglib.h"
 #include "extern.h"
-#include <sql3types.h>
+#include "sql3types.h"
 
 /*
  * This function is used to generate the correct type names.
diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h
index 7ce1e89287..ca3002a1ec 100644
--- a/src/interfaces/ecpg/preproc/type.h
+++ b/src/interfaces/ecpg/preproc/type.h
@@ -1,4 +1,4 @@
-#include <ecpgtype.h>
+#include "ecpgtype.h"
 
 struct ECPGtype;
 struct ECPGstruct_member
diff --git a/src/interfaces/libpgeasy/examples/pginsert.c b/src/interfaces/libpgeasy/examples/pginsert.c
index eac150109e..85de5aad68 100644
--- a/src/interfaces/libpgeasy/examples/pginsert.c
+++ b/src/interfaces/libpgeasy/examples/pginsert.c
@@ -5,9 +5,9 @@
 
 #include <stdio.h>
 #include <time.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 #include "../halt.h"
-#include <libpgeasy.h>
+#include "libpgeasy.h"
 
 int
 main(int argc, char **argv)
diff --git a/src/interfaces/libpgeasy/examples/pgnulltest.c b/src/interfaces/libpgeasy/examples/pgnulltest.c
index 9489a9d291..419a68fe86 100644
--- a/src/interfaces/libpgeasy/examples/pgnulltest.c
+++ b/src/interfaces/libpgeasy/examples/pgnulltest.c
@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 #include <time.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 #include "../halt.h"
-#include <libpgeasy.h>
+#include "libpgeasy.h"
 
 int
 main(int argc, char **argv)
diff --git a/src/interfaces/libpgeasy/examples/pgwordcount.c b/src/interfaces/libpgeasy/examples/pgwordcount.c
index d87349e95b..86aa8c2ff4 100644
--- a/src/interfaces/libpgeasy/examples/pgwordcount.c
+++ b/src/interfaces/libpgeasy/examples/pgwordcount.c
@@ -4,9 +4,9 @@
 */
 
 #include <stdio.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 #include "../halt.h"
-#include <libpgeasy.h>
+#include "libpgeasy.h"
 
 int
 main(int argc, char **argv)
diff --git a/src/interfaces/libpgeasy/libpgeasy.c b/src/interfaces/libpgeasy/libpgeasy.c
index f78a00cf64..f8682c2761 100644
--- a/src/interfaces/libpgeasy/libpgeasy.c
+++ b/src/interfaces/libpgeasy/libpgeasy.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 #include "halt.h"
 #include "libpgeasy.h"
 
diff --git a/src/interfaces/libpgtcl/libpgtcl.h b/src/interfaces/libpgtcl/libpgtcl.h
index 778d7c3fa7..c1a7bd96c6 100644
--- a/src/interfaces/libpgtcl/libpgtcl.h
+++ b/src/interfaces/libpgtcl/libpgtcl.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpgtcl.h,v 1.9 2000/01/26 05:58:43 momjian Exp $
+ * $Id: libpgtcl.h,v 1.10 2000/05/29 21:25:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #ifndef LIBPGTCL_H
 #define LIBPGTCL_H
 
-#include "tcl.h"
+#include <tcl.h>
 
 extern int	Pgtcl_Init(Tcl_Interp *interp);
 extern int	Pgtcl_SafeInit(Tcl_Interp *interp);
diff --git a/src/interfaces/libpgtcl/pgtclCmds.h b/src/interfaces/libpgtcl/pgtclCmds.h
index b1d908fbee..76fff887aa 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.h
+++ b/src/interfaces/libpgtcl/pgtclCmds.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pgtclCmds.h,v 1.17 2000/04/12 17:17:11 momjian Exp $
+ * $Id: pgtclCmds.h,v 1.18 2000/05/29 21:25:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,7 @@
 #ifndef PGTCLCMDS_H
 #define PGTCLCMDS_H
 
-#include "tcl.h"
+#include <tcl.h>
 #include "libpq-fe.h"
 
 #define RES_HARD_MAX 128
diff --git a/src/interfaces/libpq++/examples/testlibpq0.cc b/src/interfaces/libpq++/examples/testlibpq0.cc
index 7bfa20e28e..041ced557f 100644
--- a/src/interfaces/libpq++/examples/testlibpq0.cc
+++ b/src/interfaces/libpq++/examples/testlibpq0.cc
@@ -9,13 +9,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq++/examples/Attic/testlibpq0.cc,v 1.5 1999/12/03 18:28:32 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq++/examples/Attic/testlibpq0.cc,v 1.6 2000/05/29 21:25:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <iostream.h>
-#include <libpq++.h>
+#include "libpq++.h"
 
 int main()
 {
diff --git a/src/interfaces/libpq++/examples/testlibpq1.cc b/src/interfaces/libpq++/examples/testlibpq1.cc
index c969b56bf8..5c71c906b9 100644
--- a/src/interfaces/libpq++/examples/testlibpq1.cc
+++ b/src/interfaces/libpq++/examples/testlibpq1.cc
@@ -8,7 +8,7 @@
 
 #include <iostream.h>
 #include <iomanip.h>
-#include <libpq++.h>
+#include "libpq++.h"
 
 int main()
 {
diff --git a/src/interfaces/libpq++/examples/testlibpq2.cc b/src/interfaces/libpq++/examples/testlibpq2.cc
index fda3a38eb2..1a602e16b7 100644
--- a/src/interfaces/libpq++/examples/testlibpq2.cc
+++ b/src/interfaces/libpq++/examples/testlibpq2.cc
@@ -8,7 +8,7 @@
 
 #include <iostream.h>
 #include <iomanip.h>
-#include <libpq++.h>
+#include "libpq++.h"
 
 int main()
 {
diff --git a/src/interfaces/libpq++/examples/testlibpq3.cc b/src/interfaces/libpq++/examples/testlibpq3.cc
index 87688a4657..da0c48df35 100644
--- a/src/interfaces/libpq++/examples/testlibpq3.cc
+++ b/src/interfaces/libpq++/examples/testlibpq3.cc
@@ -9,7 +9,7 @@
 
 #include <iostream.h>
 #include <iomanip.h>
-#include <libpq++.h>
+#include "libpq++.h"
 
 int main()
 {
diff --git a/src/interfaces/libpq++/examples/testlibpq4.cc b/src/interfaces/libpq++/examples/testlibpq4.cc
index 9520226c44..98f91686c9 100644
--- a/src/interfaces/libpq++/examples/testlibpq4.cc
+++ b/src/interfaces/libpq++/examples/testlibpq4.cc
@@ -19,7 +19,7 @@ INSERT INTO TBL1 values (10);
  *
  */
 #include <iostream.h>
-#include <libpq++.h>
+#include "libpq++.h"
 #include <stdlib.h>
 
 main()
diff --git a/src/interfaces/libpq++/examples/testlibpq5.cc b/src/interfaces/libpq++/examples/testlibpq5.cc
index 3624be9312..9f74d4d530 100644
--- a/src/interfaces/libpq++/examples/testlibpq5.cc
+++ b/src/interfaces/libpq++/examples/testlibpq5.cc
@@ -27,7 +27,7 @@ tuple 1: got
  *
  */
 #include <iostream.h>
-#include <libpq++.h>
+#include "libpq++.h"
 #include <stdlib.h>
 extern "C" {
 #include "postgres.h"		// for Postgres types
diff --git a/src/interfaces/libpq++/examples/testlibpq6.cc b/src/interfaces/libpq++/examples/testlibpq6.cc
index ef02ed6daa..23263d9c36 100644
--- a/src/interfaces/libpq++/examples/testlibpq6.cc
+++ b/src/interfaces/libpq++/examples/testlibpq6.cc
@@ -5,7 +5,7 @@
  *
  */
 #include <iostream.h>
-#include <libpq++.h>
+#include "libpq++.h"
 #include <stdlib.h>
 
 main()
diff --git a/src/interfaces/libpq++/examples/testlo.cc b/src/interfaces/libpq++/examples/testlo.cc
index 3f0ad4d074..0fd516c04f 100644
--- a/src/interfaces/libpq++/examples/testlo.cc
+++ b/src/interfaces/libpq++/examples/testlo.cc
@@ -7,12 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq++/examples/Attic/testlo.cc,v 1.7 2000/04/25 21:00:29 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq++/examples/Attic/testlo.cc,v 1.8 2000/05/29 21:25:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <iostream.h>
-#include <libpq++.h>
+#include "libpq++.h"
 #include <stdlib.h>
 
 int main(int argc, char **argv)
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index fac3494054..75418fcd0b 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -10,11 +10,11 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.37 2000/04/12 17:17:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.38 2000/05/29 21:25:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
+#include "postgres.h"
 
 #include <signal.h>
 #include "libpq-fe.h"
diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c
index 02faa82517..1a1b32c9df 100644
--- a/src/interfaces/odbc/bind.c
+++ b/src/interfaces/odbc/bind.c
@@ -30,8 +30,8 @@
 #include "isql.h"
 #include "isqlext.h"
 #else
-#include <sql.h>
-#include <sqlext.h>
+#include "sql.h"
+#include "sqlext.h"
 #endif
 
 /*      Bind parameters on a statement handle */
diff --git a/src/interfaces/python/pgmodule.c b/src/interfaces/python/pgmodule.c
index 375cb26658..03424b805c 100644
--- a/src/interfaces/python/pgmodule.c
+++ b/src/interfaces/python/pgmodule.c
@@ -26,9 +26,9 @@
  *
  */
 
-#include <Python.h>
-#include <libpq-fe.h>
-#include <libpq/libpq-fs.h>
+#include "Python.h"
+#include "libpq-fe.h"
+#include "libpq/libpq-fs.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 278a5709ef..ed8d1672db 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,7 +33,7 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.8 2000/05/29 01:59:13 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.9 2000/05/29 21:25:06 momjian Exp $
  *
  **********************************************************************/
 
@@ -75,8 +75,8 @@
 #ifndef HAS_UNION_SEMUN
 #define HAS_UNION_SEMUN
 #endif
-#include <EXTERN.h>
-#include <perl.h>
+#include "EXTERN.h"
+#include "perl.h"
 
 
 /**********************************************************************
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index 0a435b5914..831ad83e8c 100644
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.8 1999/11/28 22:02:17 tgl Exp $
+ *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.9 2000/05/29 21:25:07 momjian Exp $
  *
  *    This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -36,8 +36,8 @@
  *
  **********************************************************************/
 
-#include "stdio.h"
-#include "string.h"
+#include <stdio.h>
+#include <string.h>
 #include "plpgsql.h"
 #ifdef YYBISON
 #include "pl_scan.c" /* GNU bison wants it here */