6 files changed, 12 insertions, 15 deletions
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 0dba8ccabd1..605cbd9c8cc 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -7,16 +7,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdesc.h,v 1.10 1999/02/13 23:21:23 momjian Exp $
+ * $Id: execdesc.h,v 1.10.2.1 1999/07/30 19:36:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDESC_H
 #define EXECDESC_H
 
-#include <tcop/dest.h>
-#include <nodes/plannodes.h>
-#include <nodes/parsenodes.h>
+#include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
+#include "tcop/dest.h"
 
 /* ----------------
  *		query descriptor:
diff --git a/src/include/lib/hasht.h b/src/include/lib/hasht.h
index 3f56bf640ca..8be021597a8 100644
--- a/src/include/lib/hasht.h
+++ b/src/include/lib/hasht.h
@@ -7,14 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hasht.h,v 1.7 1999/02/13 23:21:31 momjian Exp $
+ * $Id: hasht.h,v 1.7.2.1 1999/07/30 19:36:31 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HASHT_H
 #define HASHT_H
 
-#include <utils/hsearch.h>
+#include "utils/hsearch.h"
 
 typedef void (*HashtFunc) ();
 
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index d6023332be6..7827b464081 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -9,7 +9,7 @@
 #ifndef PG_CRYPT_H
 #define PG_CRYPT_H
 
-#include <libpq/libpq-be.h>
+#include "libpq/libpq-be.h"
 
 #define CRYPT_PWD_FILE	"pg_pwd"
 #define CRYPT_PWD_FILE_SEPCHAR	"'\\t'"
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index ea603556c21..2fdcf8f932d 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,7 +4,7 @@
  *	  Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.13 1999/05/10 15:17:17 momjian Exp $
+ * $Id: hba.h,v 1.13.2.1 1999/07/30 19:36:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -13,8 +13,7 @@
 
 #include <netinet/in.h>
 
-#include "libpq/libpq-be.h"
-
+#include "libpq/pqcomm.h"
 
 #define CONF_FILE "pg_hba.conf"
  /* Name of the config file  */
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 7eda4e4e572..0b81b259392 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,17 +7,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.14 1999/02/13 23:21:35 momjian Exp $
+ * $Id: libpq-be.h,v 1.14.2.1 1999/07/30 19:36:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LIBPQ_BE_H
 #define LIBPQ_BE_H
 
-#include <stdio.h>
 #include <sys/types.h>
 
-#include "libpq/pqcomm.h"
 #include "libpq/hba.h"
 
 
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index d9d1a955236..ef767a1203f 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.31 1999/07/07 17:17:50 momjian Exp $
+ * $Id: libpq.h,v 1.31.2.1 1999/07/30 19:36:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 
 #include "libpq/libpq-be.h"
 #include "tcop/dest.h"
-
+#include "utils/exc.h"
 
 /* ----------------
  * PQArgBlock