pgcrypto: Make header files stand alone

pgp.h used to require including mbuf.h and px.h first.  Include those in
pgp.h, so that it can be used without prerequisites.  Remove mbuf.h
inclusions in .c files where mbuf.h features are not used
directly.  (px.h was always used.)

11 files changed, 3 insertions, 10 deletions

diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index 87adf911259..8460bf924a2 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -32,7 +32,6 @@
 #include "postgres.h"
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 /*
diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c
index 7cf9bf0b8c5..d230bcb49eb 100644
--- a/contrib/pgcrypto/pgp-cfb.c
+++ b/contrib/pgcrypto/pgp-cfb.c
@@ -31,7 +31,6 @@
 
 #include "postgres.h"
 
-#include "mbuf.h"
 #include "px.h"
 #include "pgp.h"
 
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c
index c5924534021..edd8255f6a3 100644
--- a/contrib/pgcrypto/pgp-compress.c
+++ b/contrib/pgcrypto/pgp-compress.c
@@ -31,7 +31,6 @@
 
 #include "postgres.h"
 
-#include "mbuf.h"
 #include "px.h"
 #include "pgp.h"
 
diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c
index d0e5830fe03..6057dcd88c7 100644
--- a/contrib/pgcrypto/pgp-mpi-internal.c
+++ b/contrib/pgcrypto/pgp-mpi-internal.c
@@ -33,7 +33,6 @@
 #include "imath.h"
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 static mpz_t *
diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c
index ed41e1151c3..57acfa0f177 100644
--- a/contrib/pgcrypto/pgp-mpi-openssl.c
+++ b/contrib/pgcrypto/pgp-mpi-openssl.c
@@ -33,7 +33,6 @@
 #include <openssl/bn.h>
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 static BIGNUM *
diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c
index c8765b6d141..27ebd84ccab 100644
--- a/contrib/pgcrypto/pgp-mpi.c
+++ b/contrib/pgcrypto/pgp-mpi.c
@@ -31,7 +31,6 @@
 #include "postgres.h"
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 int
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index fe5fae0c42c..69b1ab34915 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -31,7 +31,6 @@
 #include "postgres.h"
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 /*
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 943d2e49f57..130d379a8a9 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -31,7 +31,6 @@
 #include "postgres.h"
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 /*
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 349234e243c..f7066bff95b 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -32,7 +32,6 @@
 #include "postgres.h"
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 static int
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
index b8a6bc49b40..059c04af8f1 100644
--- a/contrib/pgcrypto/pgp.c
+++ b/contrib/pgcrypto/pgp.c
@@ -32,7 +32,6 @@
 #include "postgres.h"
 
 #include "px.h"
-#include "mbuf.h"
 #include "pgp.h"
 
 /*
diff --git a/contrib/pgcrypto/pgp.h b/contrib/pgcrypto/pgp.h
index 3022abf75d8..f856e0733c6 100644
--- a/contrib/pgcrypto/pgp.h
+++ b/contrib/pgcrypto/pgp.h
@@ -29,6 +29,9 @@
  * contrib/pgcrypto/pgp.h
  */
 
+#include "mbuf.h"
+#include "px.h"
+
 enum PGP_S2K_TYPE
 {
 	PGP_S2K_SIMPLE = 0,