aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pl/plperl/plperl.c1
-rw-r--r--src/pl/plpgsql/src/pl_comp.c3
-rw-r--r--src/pl/plpgsql/src/pl_exec.c5
-rw-r--r--src/pl/plpython/plpy_cursorobject.c2
-rw-r--r--src/pl/plpython/plpy_exec.c4
-rw-r--r--src/pl/plpython/plpy_planobject.c1
-rw-r--r--src/pl/plpython/plpy_plpymodule.c3
-rw-r--r--src/pl/plpython/plpy_procedure.c3
-rw-r--r--src/pl/plpython/plpy_spi.c3
-rw-r--r--src/pl/plpython/plpy_util.c1
-rw-r--r--src/pl/tcl/pltcl.c3
-rw-r--r--src/test/modules/delay_execution/delay_execution.c2
-rw-r--r--src/test/modules/dummy_index_am/dummy_index_am.c2
-rw-r--r--src/test/modules/ldap_password_func/ldap_password_func.c4
-rw-r--r--src/test/modules/libpq_pipeline/libpq_pipeline.c2
-rw-r--r--src/test/modules/plsample/plsample.c2
-rw-r--r--src/test/modules/test_ddl_deparse/test_ddl_deparse.c1
-rw-r--r--src/test/modules/test_integerset/test_integerset.c4
-rw-r--r--src/test/modules/test_oat_hooks/test_oat_hooks.c1
-rw-r--r--src/test/modules/test_radixtree/test_radixtree.c2
-rw-r--r--src/test/modules/test_regex/test_regex.c1
-rw-r--r--src/test/modules/test_resowner/test_resowner_basic.c2
-rw-r--r--src/test/modules/test_resowner/test_resowner_many.c1
-rw-r--r--src/test/modules/test_rls_hooks/test_rls_hooks.c1
-rw-r--r--src/test/modules/test_shm_mq/setup.c1
-rw-r--r--src/test/modules/test_slru/test_multixact.c2
-rw-r--r--src/test/modules/test_tidstore/test_tidstore.c1
-rw-r--r--src/test/modules/worker_spi/worker_spi.c4
-rw-r--r--src/test/regress/pg_regress.c1
-rw-r--r--src/test/regress/regress.c3
30 files changed, 7 insertions, 59 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index fe719935c67..1b1677e333b 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -24,7 +24,6 @@
#include "executor/spi.h"
#include "funcapi.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
#include "storage/ipc.h"
#include "tcop/tcopprot.h"
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index f1bce708d62..5633e3c7905 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -23,7 +23,7 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "nodes/makefuncs.h"
-#include "parser/parse_type.h"
+#include "parser/parse_node.h"
#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
@@ -31,7 +31,6 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
-#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index e69559b980e..86c5bd324a9 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -19,11 +19,9 @@
#include "access/detoast.h"
#include "access/htup_details.h"
-#include "access/transam.h"
#include "access/tupconvert.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
-#include "commands/defrem.h"
#include "executor/execExpr.h"
#include "executor/spi.h"
#include "executor/tstoreReceiver.h"
@@ -34,13 +32,10 @@
#include "optimizer/optimizer.h"
#include "parser/parse_coerce.h"
#include "parser/parse_type.h"
-#include "parser/scansup.h"
#include "plpgsql.h"
#include "storage/proc.h"
#include "tcop/cmdtag.h"
#include "tcop/pquery.h"
-#include "tcop/tcopprot.h"
-#include "tcop/utility.h"
#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/datum.h"
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
index 24f2ac8c46b..6108384c9a5 100644
--- a/src/pl/plpython/plpy_cursorobject.c
+++ b/src/pl/plpython/plpy_cursorobject.c
@@ -8,14 +8,12 @@
#include <limits.h>
-#include "access/xact.h"
#include "catalog/pg_type.h"
#include "mb/pg_wchar.h"
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
#include "plpy_main.h"
#include "plpy_planobject.h"
-#include "plpy_procedure.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
#include "plpython.h"
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
index 157229e96f6..9d59473d6ad 100644
--- a/src/pl/plpython/plpy_exec.c
+++ b/src/pl/plpython/plpy_exec.c
@@ -18,10 +18,8 @@
#include "plpy_procedure.h"
#include "plpy_subxactobject.h"
#include "plpython.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
+#include "utils/fmgrprotos.h"
#include "utils/rel.h"
-#include "utils/typcache.h"
/* saved state for a set-returning function */
typedef struct PLySRFState
diff --git a/src/pl/plpython/plpy_planobject.c b/src/pl/plpython/plpy_planobject.c
index ec2439c6a1f..bbef889329e 100644
--- a/src/pl/plpython/plpy_planobject.c
+++ b/src/pl/plpython/plpy_planobject.c
@@ -7,7 +7,6 @@
#include "postgres.h"
#include "plpy_cursorobject.h"
-#include "plpy_elog.h"
#include "plpy_planobject.h"
#include "plpy_spi.h"
#include "plpython.h"
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index fa08f0dbfb3..ea06d9a52b1 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -6,11 +6,9 @@
#include "postgres.h"
-#include "access/xact.h"
#include "mb/pg_wchar.h"
#include "plpy_cursorobject.h"
#include "plpy_elog.h"
-#include "plpy_main.h"
#include "plpy_planobject.h"
#include "plpy_plpymodule.h"
#include "plpy_resultobject.h"
@@ -18,7 +16,6 @@
#include "plpy_subxactobject.h"
#include "plpython.h"
#include "utils/builtins.h"
-#include "utils/snapmgr.h"
HTAB *PLy_spi_exceptions = NULL;
diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
index ba7786d31c3..c35a3b801ab 100644
--- a/src/pl/plpython/plpy_procedure.c
+++ b/src/pl/plpython/plpy_procedure.c
@@ -7,7 +7,6 @@
#include "postgres.h"
#include "access/htup_details.h"
-#include "access/transam.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
@@ -17,8 +16,6 @@
#include "plpython.h"
#include "utils/builtins.h"
#include "utils/hsearch.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index ff87b27de09..bcbd07b70ae 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -8,7 +8,6 @@
#include <limits.h>
-#include "access/htup_details.h"
#include "access/xact.h"
#include "catalog/pg_type.h"
#include "executor/spi.h"
@@ -18,12 +17,10 @@
#include "plpy_main.h"
#include "plpy_planobject.h"
#include "plpy_plpymodule.h"
-#include "plpy_procedure.h"
#include "plpy_resultobject.h"
#include "plpy_spi.h"
#include "plpython.h"
#include "utils/memutils.h"
-#include "utils/syscache.h"
static PyObject *PLy_spi_execute_query(char *query, long limit);
static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable,
diff --git a/src/pl/plpython/plpy_util.c b/src/pl/plpython/plpy_util.c
index 22e2a599ad9..6d89b1cb60a 100644
--- a/src/pl/plpython/plpy_util.c
+++ b/src/pl/plpython/plpy_util.c
@@ -10,7 +10,6 @@
#include "plpy_elog.h"
#include "plpy_util.h"
#include "plpython.h"
-#include "utils/memutils.h"
/*
* Convert a Python unicode object to a Python string/bytes object in
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index e2ccaa84f3f..80de0db40de 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -25,13 +25,12 @@
#include "funcapi.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "parser/parse_func.h"
#include "parser/parse_type.h"
#include "pgstat.h"
-#include "tcop/tcopprot.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/regproc.h"
diff --git a/src/test/modules/delay_execution/delay_execution.c b/src/test/modules/delay_execution/delay_execution.c
index 155c8a8d556..fa4693a3f57 100644
--- a/src/test/modules/delay_execution/delay_execution.c
+++ b/src/test/modules/delay_execution/delay_execution.c
@@ -23,7 +23,7 @@
#include <limits.h>
#include "optimizer/planner.h"
-#include "utils/builtins.h"
+#include "utils/fmgrprotos.h"
#include "utils/guc.h"
#include "utils/inval.h"
diff --git a/src/test/modules/dummy_index_am/dummy_index_am.c b/src/test/modules/dummy_index_am/dummy_index_am.c
index 2841cf2eb4b..beb2c1d2542 100644
--- a/src/test/modules/dummy_index_am/dummy_index_am.c
+++ b/src/test/modules/dummy_index_am/dummy_index_am.c
@@ -18,8 +18,6 @@
#include "catalog/index.h"
#include "commands/vacuum.h"
#include "nodes/pathnodes.h"
-#include "utils/guc.h"
-#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/ldap_password_func/ldap_password_func.c b/src/test/modules/ldap_password_func/ldap_password_func.c
index 24d9c637818..84057d955aa 100644
--- a/src/test/modules/ldap_password_func/ldap_password_func.c
+++ b/src/test/modules/ldap_password_func/ldap_password_func.c
@@ -15,10 +15,8 @@
#include <float.h>
#include <stdio.h>
+#include "fmgr.h"
#include "libpq/auth.h"
-#include "libpq/libpq.h"
-#include "libpq/libpq-be.h"
-#include "utils/guc.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c
index 999a7f57a7e..1323e4c598d 100644
--- a/src/test/modules/libpq_pipeline/libpq_pipeline.c
+++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c
@@ -19,10 +19,8 @@
#include <sys/time.h>
#include "catalog/pg_type_d.h"
-#include "common/fe_memutils.h"
#include "libpq-fe.h"
#include "pg_getopt.h"
-#include "portability/instr_time.h"
static void exit_nicely(PGconn *conn);
diff --git a/src/test/modules/plsample/plsample.c b/src/test/modules/plsample/plsample.c
index 89ea166a676..25f7814f1f7 100644
--- a/src/test/modules/plsample/plsample.c
+++ b/src/test/modules/plsample/plsample.c
@@ -21,7 +21,7 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "funcapi.h"
-#include "utils/builtins.h"
+#include "utils/fmgrprotos.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
diff --git a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
index 2758ae82d7b..97cf52d133c 100644
--- a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
+++ b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
@@ -10,7 +10,6 @@
*/
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "funcapi.h"
#include "nodes/execnodes.h"
#include "tcop/deparse_utility.h"
diff --git a/src/test/modules/test_integerset/test_integerset.c b/src/test/modules/test_integerset/test_integerset.c
index 61f8d0b663a..73a97b81167 100644
--- a/src/test/modules/test_integerset/test_integerset.c
+++ b/src/test/modules/test_integerset/test_integerset.c
@@ -15,10 +15,6 @@
#include "common/pg_prng.h"
#include "fmgr.h"
#include "lib/integerset.h"
-#include "miscadmin.h"
-#include "nodes/bitmapset.h"
-#include "storage/block.h"
-#include "storage/itemptr.h"
#include "utils/memutils.h"
#include "utils/timestamp.h"
diff --git a/src/test/modules/test_oat_hooks/test_oat_hooks.c b/src/test/modules/test_oat_hooks/test_oat_hooks.c
index 05c33712254..ca4aa7e6696 100644
--- a/src/test/modules/test_oat_hooks/test_oat_hooks.c
+++ b/src/test/modules/test_oat_hooks/test_oat_hooks.c
@@ -16,7 +16,6 @@
#include "access/parallel.h"
#include "catalog/dependency.h"
#include "catalog/objectaccess.h"
-#include "catalog/pg_proc.h"
#include "executor/executor.h"
#include "fmgr.h"
#include "miscadmin.h"
diff --git a/src/test/modules/test_radixtree/test_radixtree.c b/src/test/modules/test_radixtree/test_radixtree.c
index 1d9165a3a23..3e072fa5ec6 100644
--- a/src/test/modules/test_radixtree/test_radixtree.c
+++ b/src/test/modules/test_radixtree/test_radixtree.c
@@ -15,8 +15,6 @@
#include "common/int.h"
#include "common/pg_prng.h"
#include "fmgr.h"
-#include "miscadmin.h"
-#include "storage/lwlock.h"
#include "utils/memutils.h"
#include "utils/timestamp.h"
diff --git a/src/test/modules/test_regex/test_regex.c b/src/test/modules/test_regex/test_regex.c
index c4ef15d7425..cd503a2cd81 100644
--- a/src/test/modules/test_regex/test_regex.c
+++ b/src/test/modules/test_regex/test_regex.c
@@ -15,7 +15,6 @@
#include "postgres.h"
#include "funcapi.h"
-#include "miscadmin.h"
#include "regex/regex.h"
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/src/test/modules/test_resowner/test_resowner_basic.c b/src/test/modules/test_resowner/test_resowner_basic.c
index 558cf1de56e..1d9c1cd0259 100644
--- a/src/test/modules/test_resowner/test_resowner_basic.c
+++ b/src/test/modules/test_resowner/test_resowner_basic.c
@@ -13,8 +13,6 @@
#include "postgres.h"
#include "fmgr.h"
-#include "lib/ilist.h"
-#include "utils/memutils.h"
#include "utils/resowner.h"
PG_MODULE_MAGIC;
diff --git a/src/test/modules/test_resowner/test_resowner_many.c b/src/test/modules/test_resowner/test_resowner_many.c
index 7808c9e5df3..4f3f5ebf87e 100644
--- a/src/test/modules/test_resowner/test_resowner_many.c
+++ b/src/test/modules/test_resowner/test_resowner_many.c
@@ -14,7 +14,6 @@
#include "fmgr.h"
#include "lib/ilist.h"
-#include "utils/memutils.h"
#include "utils/resowner.h"
/*
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c
index 358e28edb45..d18d5815cfe 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c
@@ -15,7 +15,6 @@
#include "catalog/pg_type.h"
#include "fmgr.h"
-#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "parser/parse_clause.h"
#include "parser/parse_collate.h"
diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c
index b3dac44d97a..fb235604394 100644
--- a/src/test/modules/test_shm_mq/setup.c
+++ b/src/test/modules/test_shm_mq/setup.c
@@ -18,7 +18,6 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "postmaster/bgworker.h"
-#include "storage/procsignal.h"
#include "storage/shm_toc.h"
#include "test_shm_mq.h"
#include "utils/memutils.h"
diff --git a/src/test/modules/test_slru/test_multixact.c b/src/test/modules/test_slru/test_multixact.c
index 22cc441a385..1cc89aa116c 100644
--- a/src/test/modules/test_slru/test_multixact.c
+++ b/src/test/modules/test_slru/test_multixact.c
@@ -16,7 +16,7 @@
#include "access/multixact.h"
#include "access/xact.h"
-#include "utils/builtins.h"
+#include "fmgr.h"
#include "utils/injection_point.h"
PG_FUNCTION_INFO_V1(test_create_multixact);
diff --git a/src/test/modules/test_tidstore/test_tidstore.c b/src/test/modules/test_tidstore/test_tidstore.c
index 94ddcf1de82..6da1cb24527 100644
--- a/src/test/modules/test_tidstore/test_tidstore.c
+++ b/src/test/modules/test_tidstore/test_tidstore.c
@@ -18,7 +18,6 @@
#include "access/tidstore.h"
#include "fmgr.h"
-#include "funcapi.h"
#include "storage/block.h"
#include "storage/itemptr.h"
#include "storage/lwlock.h"
diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c
index de8f46902b4..d4403b24d98 100644
--- a/src/test/modules/worker_spi/worker_spi.c
+++ b/src/test/modules/worker_spi/worker_spi.c
@@ -26,11 +26,7 @@
#include "miscadmin.h"
#include "postmaster/bgworker.h"
#include "postmaster/interrupt.h"
-#include "storage/ipc.h"
#include "storage/latch.h"
-#include "storage/lwlock.h"
-#include "storage/proc.h"
-#include "storage/shmem.h"
/* these headers are used by this particular worker's code */
#include "access/xact.h"
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 6c188954b14..0e40ed32a21 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -28,7 +28,6 @@
#include "common/logging.h"
#include "common/restricted_token.h"
-#include "common/string.h"
#include "common/username.h"
#include "getopt_long.h"
#include "lib/stringinfo.h"
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 9e81371be4b..8bae56a9777 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -21,8 +21,6 @@
#include "access/detoast.h"
#include "access/htup_details.h"
-#include "access/transam.h"
-#include "access/xact.h"
#include "catalog/namespace.h"
#include "catalog/pg_operator.h"
#include "catalog/pg_type.h"
@@ -39,7 +37,6 @@
#include "parser/parse_coerce.h"
#include "port/atomics.h"
#include "storage/spin.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "utils/geo_decls.h"
#include "utils/memutils.h"