move pg_version_constants.h to toplevel include (#7335)

In preparation of sorting and grouping all includes we wanted to move
this file to the toplevel includes for good grouping/sorting.

(cherry picked from commit 0dac63afc0)

src/backend/columnar/columnar_compression.c

@@ -18,7 +18,7 @@
 #include "lib/stringinfo.h"
 
 #include "columnar/columnar_compression.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #if HAVE_CITUS_LIBLZ4
 #include <lz4.h>

src/backend/columnar/columnar_debug.c

@@ -15,7 +15,7 @@
 #include "access/table.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_type.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "miscadmin.h"
 #include "storage/fd.h"
 #include "storage/smgr.h"

src/backend/distributed/commands/call.c

@@ -13,7 +13,7 @@
 #include "postgres.h"
 #include "funcapi.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "catalog/pg_proc.h"
 #include "commands/defrem.h"

src/backend/distributed/commands/cascade_table_operation_for_connected_relations.c

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/xact.h"
 #include "catalog/pg_constraint.h"

src/backend/distributed/commands/citus_global_signal.c

@@ -11,7 +11,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/backend_data.h"
 #include "distributed/metadata_cache.h"

src/backend/distributed/commands/cluster.c

@@ -10,7 +10,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "commands/defrem.h"
 

src/backend/distributed/commands/collation.c

@@ -27,7 +27,7 @@
 #include "distributed/multi_executor.h"
 #include "distributed/relation_access_tracking.h"
 #include "distributed/worker_create_or_replace.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "distributed/worker_manager.h"
 #include "parser/parse_type.h"
 #include "utils/builtins.h"

src/backend/distributed/commands/create_distributed_table.c

@@ -11,7 +11,7 @@
 #include "postgres.h"
 #include "miscadmin.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "distributed/commands/utility_hook.h"
 
 #include "access/genam.h"

src/backend/distributed/commands/distribute_object_ops.c

@@ -14,7 +14,7 @@
 
 #include "distributed/commands.h"
 #include "distributed/deparser.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "distributed/version_compat.h"
 #include "distributed/commands/utility_hook.h"
 

src/backend/distributed/commands/foreign_constraint.c

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/htup_details.h"
 #include "access/sysattr.h"

src/backend/distributed/commands/function.c

@@ -21,7 +21,7 @@
 #include "miscadmin.h"
 #include "funcapi.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/htup_details.h"

src/backend/distributed/commands/index.c

@@ -10,7 +10,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/xact.h"

src/backend/distributed/commands/multi_copy.c

@@ -52,7 +52,7 @@
 #include <netinet/in.h> /* for htons */
 #include <string.h>
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/htup_details.h"
 #include "access/htup.h"

src/backend/distributed/commands/role.c

@@ -12,7 +12,7 @@
 
 #include "pg_version_compat.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/heapam.h"
 #include "access/htup_details.h"

src/backend/distributed/commands/subscription.c

@@ -17,7 +17,7 @@
 #include "commands/defrem.h"
 #include "distributed/commands.h"
 #include "distributed/connection_management.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "distributed/version_compat.h"
 #include "libpq-fe.h"
 #include "nodes/parsenodes.h"

src/backend/distributed/commands/table.c

@@ -9,7 +9,7 @@
  */
 
 #include "postgres.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/xact.h"

src/backend/distributed/commands/trigger.c

@@ -9,7 +9,7 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/table.h"

src/backend/distributed/commands/type.c

@@ -43,7 +43,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/htup_details.h"

src/backend/distributed/commands/utility_hook.c

@@ -25,7 +25,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "postgres.h"
 #include "miscadmin.h"

src/backend/distributed/commands/vacuum.c

@@ -10,7 +10,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "commands/defrem.h"
 #include "commands/vacuum.h"

src/backend/distributed/connection/locally_reserved_shared_connections.c

@@ -33,7 +33,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "miscadmin.h"
 

src/backend/distributed/connection/placement_connection.c

@@ -11,7 +11,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/hash.h"
 #include "distributed/colocation_utils.h"

src/backend/distributed/connection/shared_connection_stats.c

@@ -13,7 +13,7 @@
 #include "postgres.h"
 #include "pgstat.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "libpq-fe.h"
 

src/backend/distributed/deparser/citus_ruleutils.c

@@ -10,7 +10,7 @@
 #include "postgres.h"
 #include "miscadmin.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <stddef.h>
 

src/backend/distributed/deparser/deparse_statistics_stmts.c

@@ -12,7 +12,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "catalog/namespace.h"
 #include "distributed/citus_ruleutils.h"

src/backend/distributed/deparser/ruleutils_14.c

@@ -14,7 +14,7 @@
  * This needs to be closely in sync with the core code.
  *-------------------------------------------------------------------------
  */
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "pg_config.h"
 

src/backend/distributed/deparser/ruleutils_15.c

@@ -14,7 +14,7 @@
  * This needs to be closely in sync with the core code.
  *-------------------------------------------------------------------------
  */
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "pg_config.h"
 

src/backend/distributed/deparser/ruleutils_16.c

@@ -14,7 +14,7 @@
  * This needs to be closely in sync with the core code.
  *-------------------------------------------------------------------------
  */
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "pg_config.h"
 

src/backend/distributed/executor/citus_custom_scan.c

@@ -9,7 +9,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "miscadmin.h"
 

src/backend/distributed/executor/distributed_intermediate_results.c

@@ -8,7 +8,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <sys/stat.h>
 #include <unistd.h>

src/backend/distributed/executor/local_executor.c

@@ -78,7 +78,7 @@
 #include "postgres.h"
 #include "miscadmin.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/adaptive_executor.h"
 #include "distributed/commands/utility_hook.h"

src/backend/distributed/executor/multi_executor.c

@@ -10,7 +10,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "miscadmin.h"
 

src/backend/distributed/executor/query_stats.c

@@ -15,7 +15,7 @@
 
 #include "miscadmin.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/hash.h"
 #include "catalog/pg_authid.h"

src/backend/distributed/metadata/dependency.c

@@ -11,7 +11,7 @@
 #include "postgres.h"
 
 #include "distributed/commands.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/heapam.h"

src/backend/distributed/metadata/distobject.c

@@ -10,7 +10,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "miscadmin.h"
 

src/backend/distributed/metadata/metadata_cache.c

@@ -8,7 +8,7 @@
  */
 
 #include "postgres.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "pg_version_compat.h"
 
 #include "stdint.h"

src/backend/distributed/metadata/metadata_utility.c

@@ -17,7 +17,7 @@
 #include "libpq-fe.h"
 #include "miscadmin.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/htup_details.h"

src/backend/distributed/metadata/pg_get_object_address_13_14_15.c

@@ -24,7 +24,7 @@
 #include "distributed/citus_safe_lib.h"
 #include "distributed/metadata/dependency.h"
 #include "distributed/metadata/distobject.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "distributed/version_compat.h"
 #include "nodes/value.h"
 #include "utils/array.h"

src/backend/distributed/operations/delete_protocol.c

@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "c.h"
 #include "fmgr.h"

src/backend/distributed/operations/modify_multiple_shards.c

@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "funcapi.h"
 #include "libpq-fe.h"

src/backend/distributed/operations/node_protocol.c

@@ -13,7 +13,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "c.h"
 #include "fmgr.h"

src/backend/distributed/operations/shard_rebalancer.c

@@ -17,7 +17,7 @@
 
 #include <math.h>
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/htup_details.h"
 #include "access/genam.h"

src/backend/distributed/planner/combine_query_planner.c

@@ -11,7 +11,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "catalog/pg_type.h"
 #include "distributed/citus_ruleutils.h"

src/backend/distributed/planner/cte_inline.c

@@ -13,7 +13,7 @@
  */
 #include "postgres.h"
 #include "pg_version_compat.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/cte_inline.h"
 #include "nodes/nodeFuncs.h"

src/backend/distributed/planner/distributed_planner.c

@@ -9,7 +9,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "funcapi.h"
 

src/backend/distributed/planner/extended_op_node_utils.c

@@ -9,7 +9,7 @@
  */
 
 #include "postgres.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/extended_op_node_utils.h"
 #include "distributed/listutils.h"

src/backend/distributed/planner/fast_path_router_planner.c

@@ -34,7 +34,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/distributed_planner.h"
 #include "distributed/insert_select_planner.h"

src/backend/distributed/planner/function_call_delegation.c

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"

src/backend/distributed/planner/insert_select_planner.c

@@ -10,7 +10,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "catalog/pg_class.h"
 #include "catalog/pg_type.h"

src/backend/distributed/planner/local_distributed_join_planner.c

@@ -71,7 +71,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "funcapi.h"
 

src/backend/distributed/planner/local_plan_cache.c

@@ -9,7 +9,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/listutils.h"
 #include "distributed/local_executor.h"

src/backend/distributed/planner/merge_planner.c

@@ -29,7 +29,7 @@
 #include "distributed/multi_logical_optimizer.h"
 #include "distributed/multi_router_planner.h"
 #include "distributed/pg_dist_node_metadata.h"
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "distributed/query_pushdown_planning.h"
 #include "distributed/query_colocation_checker.h"
 #include "distributed/repartition_executor.h"

src/backend/distributed/planner/multi_explain.c

@@ -11,7 +11,7 @@
 #include "libpq-fe.h"
 #include "miscadmin.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/htup_details.h"
 #include "access/xact.h"

src/backend/distributed/planner/multi_join_order.c

@@ -13,7 +13,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <limits.h>
 

src/backend/distributed/planner/multi_logical_optimizer.c

@@ -13,7 +13,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <math.h>
 

src/backend/distributed/planner/multi_logical_planner.c

@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/heapam.h"
 #include "access/nbtree.h"

src/backend/distributed/planner/multi_physical_planner.c

@@ -13,7 +13,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <math.h>
 #include <stdint.h>

src/backend/distributed/planner/multi_router_planner.c

@@ -13,7 +13,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <stddef.h>
 

src/backend/distributed/planner/query_colocation_checker.c

@@ -21,7 +21,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/relation.h"
 #include "distributed/multi_logical_planner.h"

src/backend/distributed/planner/query_pushdown_planning.c

@@ -21,7 +21,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/citus_clauses.h"
 #include "distributed/citus_ruleutils.h"

src/backend/distributed/planner/recursive_planning.c

@@ -48,7 +48,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "funcapi.h"
 

src/backend/distributed/planner/relation_restriction_equivalence.c

@@ -10,7 +10,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/colocation_utils.h"
 #include "distributed/distributed_planner.h"

src/backend/distributed/planner/shard_pruning.c

@@ -66,7 +66,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "fmgr.h"
 

src/backend/distributed/replication/multi_logical_replication.c

@@ -15,7 +15,7 @@
 #include "pgstat.h"
 #include "libpq-fe.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 

src/backend/distributed/test/fake_am.c

@@ -19,7 +19,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "pg_version_compat.h"
 
 

src/backend/distributed/test/fake_fdw.c

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "c.h"
 #include "fmgr.h"

src/backend/distributed/test/prune_shard_list.c

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "c.h"
 #include "fmgr.h"

src/backend/distributed/transaction/backend_data.c

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "miscadmin.h"
 #include "unistd.h"

src/backend/distributed/transaction/relation_access_tracking.c

@@ -15,7 +15,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "miscadmin.h"
 

src/backend/distributed/transaction/transaction_recovery.c

@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "miscadmin.h"
 #include "libpq-fe.h"

src/backend/distributed/utils/citus_nodefuncs.c

@@ -10,7 +10,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "catalog/pg_type.h"
 #include "distributed/citus_nodes.h"

src/backend/distributed/utils/citus_outfuncs.c

@@ -18,7 +18,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <ctype.h>
 

src/backend/distributed/utils/citus_safe_lib.c

@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "safe_lib.h"
 

src/backend/distributed/utils/enable_ssl.c

@@ -18,7 +18,7 @@
  * it otherwise we get warnings about redefining this value. This needs to be
  * done before including libpq.h.
  */
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "distributed/connection_management.h"
 #include "distributed/memutils.h"

src/backend/distributed/utils/foreign_key_relationship.c

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/htup_details.h"

src/backend/distributed/utils/log_utils.c

@@ -9,7 +9,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "utils/guc.h"
 #include "distributed/log_utils.h"

src/backend/distributed/utils/maintenanced.c

@@ -16,7 +16,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include <time.h>
 

src/backend/distributed/utils/multi_partitioning_utils.c

@@ -6,7 +6,7 @@
  */
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "access/genam.h"
 #include "access/heapam.h"

src/backend/distributed/utils/task_execution_utils.c

@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <math.h>
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "common/hashfn.h"
 

src/include/columnar/columnar_version_compat.h

@@ -12,7 +12,7 @@
 #ifndef COLUMNAR_COMPAT_H
 #define COLUMNAR_COMPAT_H
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #if PG_VERSION_NUM >= PG_VERSION_15
 #define ExecARDeleteTriggers_compat(a, b, c, d, e, f) \

src/include/distributed/commands/utility_hook.h

@@ -10,7 +10,7 @@
 #ifndef MULTI_UTILITY_H
 #define MULTI_UTILITY_H
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "postgres.h"
 

src/include/distributed/distributed_planner.h

@@ -12,7 +12,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "nodes/plannodes.h"
 

src/include/distributed/hash_helpers.h

@@ -11,7 +11,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "utils/hsearch.h"
 

src/include/distributed/multi_physical_planner.h

@@ -16,7 +16,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #include "c.h"
 

src/include/distributed/recursive_planning.h

@@ -10,7 +10,7 @@
 #ifndef RECURSIVE_PLANNING_H
 #define RECURSIVE_PLANNING_H
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #include "distributed/errormessage.h"
 #include "distributed/log_utils.h"
 #include "distributed/relation_restriction_equivalence.h"

src/include/distributed/relation_utils.h

@@ -13,7 +13,7 @@
 
 #include "postgres.h"
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 #if PG_VERSION_NUM >= PG_VERSION_16
 #include "parser/parse_relation.h"
 #endif

src/include/pg_version_compat.h

@@ -11,7 +11,7 @@
 #ifndef PG_VERSION_COMPAT_H
 #define PG_VERSION_COMPAT_H
 
-#include "distributed/pg_version_constants.h"
+#include "pg_version_constants.h"
 
 #if PG_VERSION_NUM >= PG_VERSION_16