aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-09-01 10:03:22 -0400
committerBruce Momjian <bruce@momjian.us>2011-09-01 10:04:27 -0400
commit6416a82a62db4e66b2edb0fa8fc83a580c3f1931 (patch)
tree748a06b7c1a122d741b87a6b11217d7749b64fe2 /src/backend/utils
parent63d06ef59156719efd0208c62e764a69611b3f12 (diff)
downloadpostgresql-6416a82a62db4e66b2edb0fa8fc83a580c3f1931.tar.gz
postgresql-6416a82a62db4e66b2edb0fa8fc83a580c3f1931.zip
Remove unnecessary #include references, per pgrminclude script.
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/arrayfuncs.c2
-rw-r--r--src/backend/utils/adt/domains.c1
-rw-r--r--src/backend/utils/adt/enum.c2
-rw-r--r--src/backend/utils/adt/genfile.c1
-rw-r--r--src/backend/utils/adt/inet_net_pton.c1
-rw-r--r--src/backend/utils/adt/int.c1
-rw-r--r--src/backend/utils/adt/lockfuncs.c1
-rw-r--r--src/backend/utils/adt/misc.c1
-rw-r--r--src/backend/utils/adt/regexp.c1
-rw-r--r--src/backend/utils/adt/ri_triggers.c2
-rw-r--r--src/backend/utils/adt/ruleutils.c2
-rw-r--r--src/backend/utils/adt/trigfuncs.c1
-rw-r--r--src/backend/utils/adt/tsgistidx.c2
-rw-r--r--src/backend/utils/adt/tsquery.c2
-rw-r--r--src/backend/utils/adt/tsquery_cleanup.c1
-rw-r--r--src/backend/utils/adt/tsquery_gist.c1
-rw-r--r--src/backend/utils/adt/tsquery_op.c3
-rw-r--r--src/backend/utils/adt/tsquery_rewrite.c1
-rw-r--r--src/backend/utils/adt/tsquery_util.c1
-rw-r--r--src/backend/utils/adt/tsrank.c1
-rw-r--r--src/backend/utils/adt/tsvector.c1
-rw-r--r--src/backend/utils/adt/tsvector_op.c1
-rw-r--r--src/backend/utils/adt/tsvector_parser.c3
-rw-r--r--src/backend/utils/cache/attoptcache.c3
-rw-r--r--src/backend/utils/cache/inval.c2
-rw-r--r--src/backend/utils/cache/plancache.c3
-rw-r--r--src/backend/utils/cache/relcache.c4
-rw-r--r--src/backend/utils/cache/relmapper.c2
-rw-r--r--src/backend/utils/cache/spccache.c2
-rw-r--r--src/backend/utils/cache/ts_cache.c3
-rw-r--r--src/backend/utils/cache/typcache.c1
-rw-r--r--src/backend/utils/fmgr/funcapi.c2
-rw-r--r--src/backend/utils/hash/dynahash.c2
-rw-r--r--src/backend/utils/hash/hashfn.c1
-rw-r--r--src/backend/utils/resowner/resowner.c3
-rw-r--r--src/backend/utils/sort/tuplesort.c4
-rw-r--r--src/backend/utils/sort/tuplestore.c1
-rw-r--r--src/backend/utils/time/combocid.c2
-rw-r--r--src/backend/utils/time/snapmgr.c2
39 files changed, 0 insertions, 70 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 3e43e951e10..8705725580d 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -18,8 +18,6 @@
#include "funcapi.h"
#include "libpq/pqformat.h"
-#include "parser/parse_coerce.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c
index c178fd0bddb..674229a84ea 100644
--- a/src/backend/utils/adt/domains.c
+++ b/src/backend/utils/adt/domains.c
@@ -33,7 +33,6 @@
#include "commands/typecmds.h"
#include "executor/executor.h"
-#include "lib/stringinfo.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c
index 8f65c84d305..f9ab3581299 100644
--- a/src/backend/utils/adt/enum.c
+++ b/src/backend/utils/adt/enum.c
@@ -17,9 +17,7 @@
#include "access/heapam.h"
#include "catalog/indexing.h"
#include "catalog/pg_enum.h"
-#include "fmgr.h"
#include "libpq/pqformat.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/snapmgr.h"
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
index 6b3f77fec14..dfe38f555f5 100644
--- a/src/backend/utils/adt/genfile.c
+++ b/src/backend/utils/adt/genfile.c
@@ -28,7 +28,6 @@
#include "storage/fd.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
-#include "utils/timestamp.h"
typedef struct
{
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index 1d32d2f04f6..0ef217b110d 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -30,7 +30,6 @@ static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.3 2004/03/17 00:40:11 m
#include <assert.h>
#include <ctype.h>
-#include "utils/builtins.h"
#include "utils/inet.h"
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index a367421f82b..fadcf7ace0f 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -34,7 +34,6 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
-#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c
index 0d9f482f330..0d21f9299e1 100644
--- a/src/backend/utils/adt/lockfuncs.c
+++ b/src/backend/utils/adt/lockfuncs.c
@@ -16,7 +16,6 @@
#include "funcapi.h"
#include "miscadmin.h"
#include "storage/predicate_internals.h"
-#include "storage/proc.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 5bda4af50fd..5a77340bdb0 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -19,7 +19,6 @@
#include <dirent.h>
#include <math.h>
-#include "access/xact.h"
#include "catalog/catalog.h"
#include "catalog/pg_type.h"
#include "catalog/pg_tablespace.h"
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 0dbbd6715c9..61362c97e1b 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -33,7 +33,6 @@
#include "funcapi.h"
#include "regex/regex.h"
#include "utils/builtins.h"
-#include "utils/guc.h"
#define PG_GETARG_TEXT_PP_IF_EXISTS(_n) \
(PG_NARGS() > (_n) ? PG_GETARG_TEXT_PP(_n) : NULL)
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index 4b85b9b4021..bf9b2bc5f03 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -42,10 +42,8 @@
#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
#include "miscadmin.h"
-#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
-#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3fd99e00e36..f25c50f9a49 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -18,7 +18,6 @@
#include <unistd.h>
#include <fcntl.h>
-#include "access/genam.h"
#include "access/sysattr.h"
#include "catalog/dependency.h"
#include "catalog/indexing.h"
@@ -48,7 +47,6 @@
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c
index 474878de7d9..c2b4a927efd 100644
--- a/src/backend/utils/adt/trigfuncs.c
+++ b/src/backend/utils/adt/trigfuncs.c
@@ -13,7 +13,6 @@
*/
#include "postgres.h"
-#include "access/htup.h"
#include "commands/trigger.h"
#include "utils/builtins.h"
#include "utils/rel.h"
diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c
index 2189a1a20ec..1ac2b17237f 100644
--- a/src/backend/utils/adt/tsgistidx.c
+++ b/src/backend/utils/adt/tsgistidx.c
@@ -16,9 +16,7 @@
#include "access/gist.h"
#include "access/tuptoaster.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
-#include "utils/pg_crc.h"
#define SIGLENINT 31 /* >121 => key will toast, so it will not work
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index 5baa02b1c03..a60989abd3b 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -17,11 +17,9 @@
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "tsearch/ts_locale.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
-#include "utils/pg_crc.h"
struct TSQueryParserStateData
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index 9feb4b796a6..3e0b99afeb8 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -15,7 +15,6 @@
#include "postgres.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "miscadmin.h"
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 2ecb13e3b9f..bef86036dc1 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -16,7 +16,6 @@
#include "access/skey.h"
#include "access/gist.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#define GETENTRY(vec,pos) DatumGetTSQuerySign((vec)->vector[pos].key)
diff --git a/src/backend/utils/adt/tsquery_op.c b/src/backend/utils/adt/tsquery_op.c
index 4cf628772c5..59d9d20b7e5 100644
--- a/src/backend/utils/adt/tsquery_op.c
+++ b/src/backend/utils/adt/tsquery_op.c
@@ -14,10 +14,7 @@
#include "postgres.h"
-#include "tsearch/ts_type.h"
-#include "tsearch/ts_locale.h"
#include "tsearch/ts_utils.h"
-#include "utils/pg_crc.h"
Datum
tsquery_numnode(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c
index e2faed26d36..974ce6a0197 100644
--- a/src/backend/utils/adt/tsquery_rewrite.c
+++ b/src/backend/utils/adt/tsquery_rewrite.c
@@ -17,7 +17,6 @@
#include "catalog/pg_type.h"
#include "executor/spi.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index 53093f1e864..003b83e7704 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -14,7 +14,6 @@
#include "postgres.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "miscadmin.h"
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index 8f5941c1476..564d855817a 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -15,7 +15,6 @@
#include <math.h>
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/array.h"
#include "miscadmin.h"
diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c
index 6810615a253..cb9a87d03ec 100644
--- a/src/backend/utils/adt/tsvector.c
+++ b/src/backend/utils/adt/tsvector.c
@@ -15,7 +15,6 @@
#include "postgres.h"
#include "libpq/pqformat.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
#include "tsearch/ts_utils.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index be7978561f7..285a484aa43 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -21,7 +21,6 @@
#include "funcapi.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c
index 65eec005639..20349a63d97 100644
--- a/src/backend/utils/adt/tsvector_parser.c
+++ b/src/backend/utils/adt/tsvector_parser.c
@@ -14,11 +14,8 @@
#include "postgres.h"
-#include "libpq/pqformat.h"
-#include "tsearch/ts_type.h"
#include "tsearch/ts_locale.h"
#include "tsearch/ts_utils.h"
-#include "utils/memutils.h"
/*
diff --git a/src/backend/utils/cache/attoptcache.c b/src/backend/utils/cache/attoptcache.c
index ba39aa8ee7f..179e6a6cc3d 100644
--- a/src/backend/utils/cache/attoptcache.c
+++ b/src/backend/utils/cache/attoptcache.c
@@ -17,12 +17,9 @@
#include "postgres.h"
#include "access/reloptions.h"
-#include "catalog/pg_attribute.h"
#include "utils/attoptcache.h"
-#include "utils/catcache.h"
#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 8792ec40842..337fe64e10c 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -86,10 +86,8 @@
*/
#include "postgres.h"
-#include "access/twophase_rmgr.h"
#include "access/xact.h"
#include "catalog/catalog.h"
-#include "catalog/pg_tablespace.h"
#include "miscadmin.h"
#include "storage/sinval.h"
#include "storage/smgr.h"
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
index 1410dec1e90..68b6783e196 100644
--- a/src/backend/utils/cache/plancache.c
+++ b/src/backend/utils/cache/plancache.c
@@ -41,7 +41,6 @@
*/
#include "postgres.h"
-#include "utils/plancache.h"
#include "access/transam.h"
#include "catalog/namespace.h"
#include "executor/executor.h"
@@ -52,11 +51,9 @@
#include "parser/parsetree.h"
#include "storage/lmgr.h"
#include "tcop/pquery.h"
-#include "tcop/tcopprot.h"
#include "tcop/utility.h"
#include "utils/inval.h"
#include "utils/memutils.h"
-#include "utils/resowner.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index d969510cab3..6101ef8071e 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -30,7 +30,6 @@
#include <fcntl.h>
#include <unistd.h>
-#include "access/genam.h"
#include "access/reloptions.h"
#include "access/sysattr.h"
#include "access/transam.h"
@@ -61,16 +60,13 @@
#include "optimizer/prep.h"
#include "optimizer/var.h"
#include "rewrite/rewriteDefine.h"
-#include "storage/fd.h"
#include "storage/lmgr.h"
#include "storage/smgr.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/relcache.h"
#include "utils/relmapper.h"
#include "utils/resowner.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c
index b04dc9e3497..9337181f687 100644
--- a/src/backend/utils/cache/relmapper.c
+++ b/src/backend/utils/cache/relmapper.c
@@ -49,9 +49,7 @@
#include "catalog/storage.h"
#include "miscadmin.h"
#include "storage/fd.h"
-#include "storage/lwlock.h"
#include "utils/inval.h"
-#include "utils/pg_crc.h"
#include "utils/relmapper.h"
diff --git a/src/backend/utils/cache/spccache.c b/src/backend/utils/cache/spccache.c
index b505f219243..54d8d6f8080 100644
--- a/src/backend/utils/cache/spccache.c
+++ b/src/backend/utils/cache/spccache.c
@@ -23,8 +23,6 @@
#include "commands/tablespace.h"
#include "miscadmin.h"
#include "optimizer/cost.h"
-#include "utils/catcache.h"
-#include "utils/hsearch.h"
#include "utils/inval.h"
#include "utils/spccache.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
index cffa2384385..be29a910ea2 100644
--- a/src/backend/utils/cache/ts_cache.c
+++ b/src/backend/utils/cache/ts_cache.c
@@ -36,11 +36,8 @@
#include "catalog/pg_ts_dict.h"
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
-#include "catalog/pg_type.h"
#include "commands/defrem.h"
-#include "miscadmin.h"
#include "tsearch/ts_cache.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/inval.h"
diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c
index b16ed6a2089..924ee573025 100644
--- a/src/backend/utils/cache/typcache.c
+++ b/src/backend/utils/cache/typcache.c
@@ -60,7 +60,6 @@
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
-#include "utils/tqual.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index 02ee92b7159..3861f402c3d 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -13,14 +13,12 @@
*/
#include "postgres.h"
-#include "access/heapam.h"
#include "catalog/namespace.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "nodes/nodeFuncs.h"
#include "parser/parse_coerce.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index d9027291ee3..dad7994923c 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -64,8 +64,6 @@
#include "postgres.h"
#include "access/xact.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
#include "utils/dynahash.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index 7406d266db5..898475514af 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -22,7 +22,6 @@
#include "postgres.h"
#include "access/hash.h"
-#include "nodes/bitmapset.h"
/*
diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c
index e5461e660ef..773a0d82ef8 100644
--- a/src/backend/utils/resowner/resowner.c
+++ b/src/backend/utils/resowner/resowner.c
@@ -21,12 +21,9 @@
#include "postgres.h"
#include "access/hash.h"
-#include "storage/bufmgr.h"
#include "storage/predicate.h"
-#include "storage/proc.h"
#include "utils/memutils.h"
#include "utils/rel.h"
-#include "utils/resowner.h"
#include "utils/snapmgr.h"
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index dcfb8f957a9..3505236e5d3 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -100,11 +100,8 @@
#include <limits.h>
-#include "access/genam.h"
#include "access/nbtree.h"
#include "catalog/index.h"
-#include "catalog/pg_amop.h"
-#include "catalog/pg_operator.h"
#include "commands/tablespace.h"
#include "executor/executor.h"
#include "miscadmin.h"
@@ -115,7 +112,6 @@
#include "utils/memutils.h"
#include "utils/pg_rusage.h"
#include "utils/rel.h"
-#include "utils/syscache.h"
#include "utils/tuplesort.h"
diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index 4d6e3aa0e4b..b28532be578 100644
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -59,7 +59,6 @@
#include "storage/buffile.h"
#include "utils/memutils.h"
#include "utils/resowner.h"
-#include "utils/tuplestore.h"
/*
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index d9b37b2ba3f..28c8a172204 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -41,10 +41,8 @@
#include "postgres.h"
-#include "access/htup.h"
#include "access/xact.h"
#include "utils/combocid.h"
-#include "utils/hsearch.h"
#include "utils/memutils.h"
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index ef66466baf1..4b674c7c425 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -28,11 +28,9 @@
#include "access/transam.h"
#include "access/xact.h"
#include "storage/predicate.h"
-#include "storage/proc.h"
#include "storage/procarray.h"
#include "utils/memutils.h"
#include "utils/memutils.h"
-#include "utils/resowner.h"
#include "utils/snapmgr.h"
#include "utils/tqual.h"