diff --git a/src/include/parser/pool_parser.h b/src/include/parser/pool_parser.h
index 1952f09..e2fe2d7 100644
--- a/src/include/parser/pool_parser.h
+++ b/src/include/parser/pool_parser.h
@@ -40,11 +40,9 @@ extern int	server_version_num;
  * bitsN
  *		Unit of bitwise operation, AT LEAST N BITS IN SIZE.
  */
-typedef unsigned int PoolOid;
 typedef unsigned int Index;
 typedef short AttrNumber;
 
-#define Oid PoolOid
 #define InvalidOid		((Oid) 0)
 
 /*
diff --git a/src/include/pool.h b/src/include/pool.h
index 3244949..c7da1fe 100644
--- a/src/include/pool.h
+++ b/src/include/pool.h
@@ -31,7 +31,6 @@
 #include "utils/pool_signal.h"
 #include "parser/nodes.h"
 
-#include "libpq-fe.h"
 #include <stdio.h>
 #include <time.h>
 #include <sys/time.h>
diff --git a/src/include/pool_type.h b/src/include/pool_type.h
index 41ef4b5..4a2fedd 100644
--- a/src/include/pool_type.h
+++ b/src/include/pool_type.h
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include "pcp/libpcp_ext.h"
-
+#include "libpq-fe.h"
 /* Define common boolean type. C++ and BEOS already has it so exclude them. */
 #ifdef c_plusplus
 #ifndef __cplusplus