This is an automated email from the ASF dual-hosted git repository.
rafsun42 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/master by this push:
new cb3efdb1 Clean up #included files in src/include directories (#1518)
cb3efdb1 is described below
commit cb3efdb1f9ada0c51ac11dd28b9b3f5cf25f1137
Author: John Gemignani <[email protected]>
AuthorDate: Tue Jan 23 10:12:46 2024 -0800
Clean up #included files in src/include directories (#1518)
Cleaned up #included files in the .h files in the src/include
directories.
Additionally, deleted 1 unnecessary header file.
modified: src/include/catalog/ag_catalog.h
modified: src/include/catalog/ag_graph.h
modified: src/include/catalog/ag_label.h
modified: src/include/catalog/ag_namespace.h
modified: src/include/commands/graph_commands.h
modified: src/include/commands/label_commands.h
modified: src/include/executor/cypher_executor.h
modified: src/include/executor/cypher_utils.h
modified: src/include/nodes/ag_nodes.h
modified: src/include/nodes/cypher_copyfuncs.h
modified: src/include/nodes/cypher_nodes.h
modified: src/include/nodes/cypher_outfuncs.h
modified: src/include/nodes/cypher_readfuncs.h
modified: src/include/optimizer/cypher_createplan.h
modified: src/include/optimizer/cypher_pathnode.h
modified: src/include/parser/cypher_clause.h
modified: src/include/parser/cypher_expr.h
modified: src/include/parser/cypher_gram.h
modified: src/include/parser/cypher_item.h
modified: src/include/parser/cypher_parse_node.h
modified: src/include/parser/cypher_parser.h
modified: src/include/parser/cypher_transform_entity.h
modified: src/include/utils/ag_cache.h
modified: src/include/utils/ag_float8_supp.h
modified: src/include/utils/ag_func.h
modified: src/include/utils/age_global_graph.h
modified: src/include/utils/agtype.h
modified: src/include/utils/agtype_parser.h
modified: src/include/utils/agtype_raw.h
modified: src/include/utils/graphid.h
modified: src/include/utils/load/ag_load_edges.h
modified: src/include/utils/load/ag_load_labels.h
modified: src/include/utils/load/age_load.h
deleted: src/include/utils/ag_load.h
---
src/include/catalog/ag_catalog.h | 1 -
src/include/catalog/ag_graph.h | 2 -
src/include/catalog/ag_label.h | 4 --
src/include/catalog/ag_namespace.h | 2 -
src/include/commands/graph_commands.h | 4 +-
src/include/commands/label_commands.h | 2 -
src/include/executor/cypher_executor.h | 2 -
src/include/executor/cypher_utils.h | 6 ---
src/include/nodes/ag_nodes.h | 3 --
src/include/nodes/cypher_copyfuncs.h | 31 +++++++-------
src/include/nodes/cypher_nodes.h | 6 ---
src/include/nodes/cypher_outfuncs.h | 5 ---
src/include/nodes/cypher_readfuncs.h | 3 --
src/include/optimizer/cypher_createplan.h | 3 --
src/include/optimizer/cypher_pathnode.h | 2 -
src/include/parser/cypher_clause.h | 4 --
src/include/parser/cypher_expr.h | 3 --
src/include/parser/cypher_gram.h | 1 -
src/include/parser/cypher_item.h | 9 -----
src/include/parser/cypher_parse_node.h | 3 --
src/include/parser/cypher_parser.h | 2 -
src/include/parser/cypher_transform_entity.h | 4 --
src/include/utils/ag_cache.h | 2 -
src/include/utils/ag_float8_supp.h | 2 -
src/include/utils/ag_func.h | 2 -
src/include/utils/ag_load.h | 60 ----------------------------
src/include/utils/age_global_graph.h | 1 -
src/include/utils/agtype.h | 7 ----
src/include/utils/agtype_parser.h | 2 -
src/include/utils/agtype_raw.h | 2 -
src/include/utils/graphid.h | 4 +-
src/include/utils/load/ag_load_edges.h | 46 ---------------------
src/include/utils/load/ag_load_labels.h | 41 -------------------
src/include/utils/load/age_load.h | 28 -------------
34 files changed, 19 insertions(+), 280 deletions(-)
diff --git a/src/include/catalog/ag_catalog.h b/src/include/catalog/ag_catalog.h
index 3b8a36ba..56aa8470 100644
--- a/src/include/catalog/ag_catalog.h
+++ b/src/include/catalog/ag_catalog.h
@@ -23,7 +23,6 @@
#include "postgres.h"
#include "utils/agtype.h"
-#include "utils/graphid.h"
void object_access_hook_init(void);
void object_access_hook_fini(void);
diff --git a/src/include/catalog/ag_graph.h b/src/include/catalog/ag_graph.h
index 3704f9c0..43295456 100644
--- a/src/include/catalog/ag_graph.h
+++ b/src/include/catalog/ag_graph.h
@@ -20,8 +20,6 @@
#ifndef AG_AG_GRAPH_H
#define AG_AG_GRAPH_H
-#include "postgres.h"
-
#include "catalog/ag_catalog.h"
#define Anum_ag_graph_oid 1
diff --git a/src/include/catalog/ag_label.h b/src/include/catalog/ag_label.h
index e1e90f3f..46ea9bc7 100644
--- a/src/include/catalog/ag_label.h
+++ b/src/include/catalog/ag_label.h
@@ -20,12 +20,8 @@
#ifndef AG_AG_LABEL_H
#define AG_AG_LABEL_H
-#include "postgres.h"
-
#include "nodes/execnodes.h"
-#include "catalog/ag_catalog.h"
-
#define Anum_ag_label_vertex_table_id 1
#define Anum_ag_label_vertex_table_properties 2
diff --git a/src/include/catalog/ag_namespace.h
b/src/include/catalog/ag_namespace.h
index af664333..a2c576cf 100644
--- a/src/include/catalog/ag_namespace.h
+++ b/src/include/catalog/ag_namespace.h
@@ -20,8 +20,6 @@
#ifndef AG_AG_NAMESPACE_H
#define AG_AG_NAMESPACE_H
-#include "postgres.h"
-
Oid ag_catalog_namespace_id(void);
Oid pg_catalog_namespace_id(void);
diff --git a/src/include/commands/graph_commands.h
b/src/include/commands/graph_commands.h
index 6e1bbb96..e4d93fc1 100644
--- a/src/include/commands/graph_commands.h
+++ b/src/include/commands/graph_commands.h
@@ -20,8 +20,6 @@
#ifndef AG_GRAPH_COMMANDS_H
#define AG_GRAPH_COMMANDS_H
-#include "postgres.h"
-
Datum create_graph(PG_FUNCTION_ARGS);
-#endif
\ No newline at end of file
+#endif
diff --git a/src/include/commands/label_commands.h
b/src/include/commands/label_commands.h
index 6bbc814c..cfbbdb33 100644
--- a/src/include/commands/label_commands.h
+++ b/src/include/commands/label_commands.h
@@ -20,8 +20,6 @@
#ifndef AG_LABEL_COMMANDS_H
#define AG_LABEL_COMMANDS_H
-#include "postgres.h"
-
#define LABEL_TYPE_VERTEX 'v'
#define LABEL_TYPE_EDGE 'e'
diff --git a/src/include/executor/cypher_executor.h
b/src/include/executor/cypher_executor.h
index 57222853..ff0b3619 100644
--- a/src/include/executor/cypher_executor.h
+++ b/src/include/executor/cypher_executor.h
@@ -21,8 +21,6 @@
#define AG_CYPHER_EXECUTOR_H
#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
#define DELETE_SCAN_STATE_NAME "Cypher Delete"
#define SET_SCAN_STATE_NAME "Cypher Set"
diff --git a/src/include/executor/cypher_utils.h
b/src/include/executor/cypher_utils.h
index 056f1a96..f758ca48 100644
--- a/src/include/executor/cypher_utils.h
+++ b/src/include/executor/cypher_utils.h
@@ -21,12 +21,6 @@
#define AG_CYPHER_UTILS_H
#include "access/heapam.h"
-#include "access/table.h"
-#include "access/tableam.h"
-#include "nodes/execnodes.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
#include "nodes/cypher_nodes.h"
#include "utils/agtype.h"
diff --git a/src/include/nodes/ag_nodes.h b/src/include/nodes/ag_nodes.h
index 481c75b5..f74cd135 100644
--- a/src/include/nodes/ag_nodes.h
+++ b/src/include/nodes/ag_nodes.h
@@ -20,10 +20,7 @@
#ifndef AG_AG_NODES_H
#define AG_AG_NODES_H
-#include "postgres.h"
-
#include "nodes/extensible.h"
-#include "nodes/nodes.h"
// This list must match node_names and node_methods.
typedef enum ag_node_tag
diff --git a/src/include/nodes/cypher_copyfuncs.h
b/src/include/nodes/cypher_copyfuncs.h
index 314cbab7..2b9eebc6 100644
--- a/src/include/nodes/cypher_copyfuncs.h
+++ b/src/include/nodes/cypher_copyfuncs.h
@@ -20,10 +20,6 @@
#ifndef AG_CYPHER_COPYFUNCS_H
#define AG_CYPHER_COPYFUNCS_H
-#include "postgres.h"
-
-#include "nodes/nodes.h"
-
/*
* Functions that let AGE's ExtensibleNodes be compatible with
* Postgres' copyObject. We assign each node to its copy function
@@ -31,22 +27,29 @@
* macros in ag_nodes.c
*/
-void copy_ag_node(ExtensibleNode *newnode,
- const ExtensibleNode *oldnode);
+void copy_ag_node(ExtensibleNode *newnode, const ExtensibleNode *oldnode);
// create data structures
-void copy_cypher_create_target_nodes(ExtensibleNode *newnode, const
ExtensibleNode *from);
-void copy_cypher_create_path(ExtensibleNode *newnode, const ExtensibleNode
*from);
-void copy_cypher_target_node(ExtensibleNode *newnode, const ExtensibleNode
*from);
+void copy_cypher_create_target_nodes(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
+void copy_cypher_create_path(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
+void copy_cypher_target_node(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
// set/remove data structures
-void copy_cypher_update_information(ExtensibleNode *newnode, const
ExtensibleNode *from);
-void copy_cypher_update_item(ExtensibleNode *newnode, const ExtensibleNode
*from);
+void copy_cypher_update_information(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
+void copy_cypher_update_item(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
// delete data structures
-void copy_cypher_delete_information(ExtensibleNode *newnode, const
ExtensibleNode *from);
-void copy_cypher_delete_item(ExtensibleNode *newnode, const ExtensibleNode
*from);
+void copy_cypher_delete_information(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
+void copy_cypher_delete_item(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
// merge data structure
-void copy_cypher_merge_information(ExtensibleNode *newnode, const
ExtensibleNode *from);
+void copy_cypher_merge_information(ExtensibleNode *newnode,
+ const ExtensibleNode *from);
#endif
diff --git a/src/include/nodes/cypher_nodes.h b/src/include/nodes/cypher_nodes.h
index bb81e8f1..a3022fea 100644
--- a/src/include/nodes/cypher_nodes.h
+++ b/src/include/nodes/cypher_nodes.h
@@ -20,12 +20,6 @@
#ifndef AG_CYPHER_NODE_H
#define AG_CYPHER_NODE_H
-#include "postgres.h"
-
-#include "nodes/extensible.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-
#include "nodes/ag_nodes.h"
/* cypher sub patterns */
diff --git a/src/include/nodes/cypher_outfuncs.h
b/src/include/nodes/cypher_outfuncs.h
index 4071b28d..6be3c01c 100644
--- a/src/include/nodes/cypher_outfuncs.h
+++ b/src/include/nodes/cypher_outfuncs.h
@@ -20,11 +20,6 @@
#ifndef AG_CYPHER_OUTFUNCS_H
#define AG_CYPHER_OUTFUNCS_H
-#include "postgres.h"
-
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-
/*
* Serialization functions for AGE's ExtensibleNodes. We assign
* each node to its serialized function in the DEFINE_NODE_METHODS
diff --git a/src/include/nodes/cypher_readfuncs.h
b/src/include/nodes/cypher_readfuncs.h
index 9ae4e2d9..ab493854 100644
--- a/src/include/nodes/cypher_readfuncs.h
+++ b/src/include/nodes/cypher_readfuncs.h
@@ -20,10 +20,7 @@
#ifndef AG_CYPHER_READFUNCS_H
#define AG_CYPHER_READFUNCS_H
-#include "postgres.h"
-
#include "nodes/extensible.h"
-#include "nodes/nodes.h"
/*
* Deserialization functions for AGE's ExtensibleNodes. We assign
diff --git a/src/include/optimizer/cypher_createplan.h
b/src/include/optimizer/cypher_createplan.h
index e42e20b7..2d5d2e69 100644
--- a/src/include/optimizer/cypher_createplan.h
+++ b/src/include/optimizer/cypher_createplan.h
@@ -20,9 +20,6 @@
#ifndef AG_CYPHER_CREATEPLAN_H
#define AG_CYPHER_CREATEPLAN_H
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-
Plan *plan_cypher_create_path(PlannerInfo *root, RelOptInfo *rel,
CustomPath *best_path, List *tlist,
List *clauses, List *custom_plans);
diff --git a/src/include/optimizer/cypher_pathnode.h
b/src/include/optimizer/cypher_pathnode.h
index 22404f25..75c2b07d 100644
--- a/src/include/optimizer/cypher_pathnode.h
+++ b/src/include/optimizer/cypher_pathnode.h
@@ -20,8 +20,6 @@
#ifndef AG_CYPHER_PATHNODE_H
#define AG_CYPHER_PATHNODE_H
-#include "nodes/pg_list.h"
-
#define CREATE_PATH_NAME "Cypher Create"
#define SET_PATH_NAME "Cypher Set"
#define DELETE_PATH_NAME "Cypher Delete"
diff --git a/src/include/parser/cypher_clause.h
b/src/include/parser/cypher_clause.h
index b23e22b3..dd554650 100644
--- a/src/include/parser/cypher_clause.h
+++ b/src/include/parser/cypher_clause.h
@@ -20,10 +20,6 @@
#ifndef AG_CYPHER_CLAUSE_H
#define AG_CYPHER_CLAUSE_H
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "parser/parse_node.h"
-
#include "parser/cypher_parse_node.h"
typedef struct cypher_clause cypher_clause;
diff --git a/src/include/parser/cypher_expr.h b/src/include/parser/cypher_expr.h
index eb21ba04..cde40cc8 100644
--- a/src/include/parser/cypher_expr.h
+++ b/src/include/parser/cypher_expr.h
@@ -25,9 +25,6 @@
#ifndef AG_CYPHER_EXPR_H
#define AG_CYPHER_EXPR_H
-#include "nodes/nodes.h"
-#include "parser/parse_node.h"
-
#include "parser/cypher_parse_node.h"
Node *transform_cypher_expr(cypher_parsestate *cpstate, Node *expr,
diff --git a/src/include/parser/cypher_gram.h b/src/include/parser/cypher_gram.h
index cffbba3c..c74567b8 100644
--- a/src/include/parser/cypher_gram.h
+++ b/src/include/parser/cypher_gram.h
@@ -27,7 +27,6 @@
#ifndef AG_CYPHER_GRAM_H
#define AG_CYPHER_GRAM_H
-#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "parser/ag_scanner.h"
diff --git a/src/include/parser/cypher_item.h b/src/include/parser/cypher_item.h
index 3b782b88..92b6c95f 100644
--- a/src/include/parser/cypher_item.h
+++ b/src/include/parser/cypher_item.h
@@ -20,15 +20,6 @@
#ifndef AG_CYPHER_ITEM_H
#define AG_CYPHER_ITEM_H
-#include "postgres.h"
-
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
-
-#include "parser/cypher_parse_node.h"
-
TargetEntry *transform_cypher_item(cypher_parsestate *cpstate, Node *node,
Node *expr, ParseExprKind expr_kind,
char *colname, bool resjunk);
diff --git a/src/include/parser/cypher_parse_node.h
b/src/include/parser/cypher_parse_node.h
index 01377ab0..c0eb5a7d 100644
--- a/src/include/parser/cypher_parse_node.h
+++ b/src/include/parser/cypher_parse_node.h
@@ -20,9 +20,6 @@
#ifndef AG_CYPHER_PARSE_NODE_H
#define AG_CYPHER_PARSE_NODE_H
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
-
#include "nodes/cypher_nodes.h"
/*
diff --git a/src/include/parser/cypher_parser.h
b/src/include/parser/cypher_parser.h
index f02fb2d9..19491720 100644
--- a/src/include/parser/cypher_parser.h
+++ b/src/include/parser/cypher_parser.h
@@ -20,8 +20,6 @@
#ifndef AG_CYPHER_PARSER_H
#define AG_CYPHER_PARSER_H
-#include "nodes/pg_list.h"
-
List *parse_cypher(const char *s);
#endif
diff --git a/src/include/parser/cypher_transform_entity.h
b/src/include/parser/cypher_transform_entity.h
index 0d49430e..bffce7ca 100644
--- a/src/include/parser/cypher_transform_entity.h
+++ b/src/include/parser/cypher_transform_entity.h
@@ -20,10 +20,6 @@
#ifndef AG_CYPHER_TRANSFORM_ENTITY_H
#define AG_CYPHER_TRANSFORM_ENTITY_H
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
-
-#include "nodes/cypher_nodes.h"
#include "nodes/makefuncs.h"
#include "parser/cypher_parse_node.h"
diff --git a/src/include/utils/ag_cache.h b/src/include/utils/ag_cache.h
index 8775da08..cfd7c033 100644
--- a/src/include/utils/ag_cache.h
+++ b/src/include/utils/ag_cache.h
@@ -20,8 +20,6 @@
#ifndef AG_AG_CACHE_H
#define AG_AG_CACHE_H
-#include "postgres.h"
-
// graph_cache_data contains the same fields that ag_graph catalog table has
typedef struct graph_cache_data
{
diff --git a/src/include/utils/ag_float8_supp.h
b/src/include/utils/ag_float8_supp.h
index b710e17b..d36ddd72 100644
--- a/src/include/utils/ag_float8_supp.h
+++ b/src/include/utils/ag_float8_supp.h
@@ -25,8 +25,6 @@
#ifndef AG_FLOAT_H
#define AG_FLOAT_H
-#include "postgres.h"
-
bool is_float8_special_number(float8 number);
float8 float8in_internal_null(char *num, char **endptr_p, const char
*type_name,
const char *orig_string, bool *is_valid);
diff --git a/src/include/utils/ag_func.h b/src/include/utils/ag_func.h
index fe59b21a..dd133652 100644
--- a/src/include/utils/ag_func.h
+++ b/src/include/utils/ag_func.h
@@ -25,8 +25,6 @@
#ifndef AG_AG_FUNC_H
#define AG_AG_FUNC_H
-#include "postgres.h"
-
#define CREATE_CLAUSE_FUNCTION_NAME "_cypher_create_clause"
#define SET_CLAUSE_FUNCTION_NAME "_cypher_set_clause"
#define DELETE_CLAUSE_FUNCTION_NAME "_cypher_delete_clause"
diff --git a/src/include/utils/ag_load.h b/src/include/utils/ag_load.h
deleted file mode 100644
index 2c51dc2d..00000000
--- a/src/include/utils/ag_load.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef AGE_AG_LOAD_H
-#define AGE_AG_LOAD_H
-
-#include "postgres.h"
-
-#include "access/heapam.h"
-#include "access/xact.h"
-#include "catalog/dependency.h"
-#include "catalog/namespace.h"
-#include "catalog/objectaddress.h"
-#include "catalog/pg_class_d.h"
-#include "commands/defrem.h"
-#include "commands/sequence.h"
-#include "commands/tablecmds.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/value.h"
-#include "parser/parse_node.h"
-#include "parser/parser.h"
-#include "storage/lockdefs.h"
-#include "tcop/dest.h"
-#include "tcop/utility.h"
-#include "utils/acl.h"
-#include "utils/builtins.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
-
-#include "catalog/ag_graph.h"
-#include "catalog/ag_label.h"
-#include "commands/label_commands.h"
-#include "utils/ag_cache.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
-
-
-#endif //AGE_AG_LOAD_H
diff --git a/src/include/utils/age_global_graph.h
b/src/include/utils/age_global_graph.h
index 17e15ffb..2b336a41 100644
--- a/src/include/utils/age_global_graph.h
+++ b/src/include/utils/age_global_graph.h
@@ -20,7 +20,6 @@
#ifndef AG_AGE_GLOBAL_GRAPH_H
#define AG_AGE_GLOBAL_GRAPH_H
-#include "utils/graphid.h"
#include "utils/age_graphid_ds.h"
/*
diff --git a/src/include/utils/agtype.h b/src/include/utils/agtype.h
index 62150372..d430ab93 100644
--- a/src/include/utils/agtype.h
+++ b/src/include/utils/agtype.h
@@ -31,16 +31,9 @@
#ifndef AG_AGTYPE_H
#define AG_AGTYPE_H
-#include "access/htup_details.h"
-#include "fmgr.h"
-#include "lib/stringinfo.h"
-#include "nodes/pg_list.h"
#include "utils/array.h"
#include "utils/numeric.h"
-#include "utils/syscache.h"
-#include "catalog/ag_namespace.h"
-#include "catalog/pg_type.h"
#include "utils/graphid.h"
/* Tokens used when sequentially processing an agtype value */
diff --git a/src/include/utils/agtype_parser.h
b/src/include/utils/agtype_parser.h
index e2d24b1d..b6772422 100644
--- a/src/include/utils/agtype_parser.h
+++ b/src/include/utils/agtype_parser.h
@@ -32,8 +32,6 @@
#ifndef AG_AGTYPE_PARSER_H
#define AG_AGTYPE_PARSER_H
-#include "lib/stringinfo.h"
-
typedef enum
{
AGTYPE_TOKEN_INVALID,
diff --git a/src/include/utils/agtype_raw.h b/src/include/utils/agtype_raw.h
index 1b158c21..f7b92f71 100644
--- a/src/include/utils/agtype_raw.h
+++ b/src/include/utils/agtype_raw.h
@@ -25,8 +25,6 @@
#ifndef AG_AGTYPE_RAW_H
#define AG_AGTYPE_RAW_H
-#include "postgres.h"
-#include "utils/agtype.h"
#include "utils/agtype_ext.h"
/*
diff --git a/src/include/utils/graphid.h b/src/include/utils/graphid.h
index 999661cf..95e0eca9 100644
--- a/src/include/utils/graphid.h
+++ b/src/include/utils/graphid.h
@@ -20,9 +20,6 @@
#ifndef AG_GRAPHID_H
#define AG_GRAPHID_H
-#include "postgres.h"
-
-#include "fmgr.h"
#include "utils/fmgroids.h"
#include "utils/syscache.h"
@@ -30,6 +27,7 @@
#include "catalog/pg_type.h"
typedef int64 graphid;
+
#define F_GRAPHIDEQ F_INT8EQ
#define LABEL_ID_MIN 1
diff --git a/src/include/utils/load/ag_load_edges.h
b/src/include/utils/load/ag_load_edges.h
index 3f4ffa8f..0779685c 100644
--- a/src/include/utils/load/ag_load_edges.h
+++ b/src/include/utils/load/ag_load_edges.h
@@ -20,52 +20,6 @@
#ifndef AG_LOAD_EDGES_H
#define AG_LOAD_EDGES_H
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-
-#include "postgres.h"
-
-#include "access/heapam.h"
-#include "access/xact.h"
-#include "catalog/dependency.h"
-#include "catalog/namespace.h"
-#include "catalog/objectaddress.h"
-#include "catalog/pg_class_d.h"
-#include "commands/defrem.h"
-#include "commands/sequence.h"
-#include "commands/tablecmds.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/value.h"
-#include "parser/parse_node.h"
-#include "parser/parser.h"
-#include "storage/lockdefs.h"
-#include "tcop/dest.h"
-#include "tcop/utility.h"
-#include "utils/acl.h"
-#include "utils/builtins.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-
-#include "catalog/ag_graph.h"
-#include "catalog/ag_label.h"
-#include "commands/label_commands.h"
-#include "utils/ag_cache.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
-
-
-
typedef struct {
size_t row;
char **header;
diff --git a/src/include/utils/load/ag_load_labels.h
b/src/include/utils/load/ag_load_labels.h
index 8bf24c24..e2b19ab1 100644
--- a/src/include/utils/load/ag_load_labels.h
+++ b/src/include/utils/load/ag_load_labels.h
@@ -21,48 +21,7 @@
#ifndef AG_LOAD_LABELS_H
#define AG_LOAD_LABELS_H
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "postgres.h"
-
#include "access/heapam.h"
-#include "access/xact.h"
-#include "catalog/dependency.h"
-#include "catalog/namespace.h"
-#include "catalog/objectaddress.h"
-#include "catalog/pg_class_d.h"
-#include "commands/defrem.h"
-#include "commands/sequence.h"
-#include "commands/tablecmds.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/value.h"
-#include "parser/parse_node.h"
-#include "parser/parser.h"
-#include "storage/lockdefs.h"
-#include "tcop/dest.h"
-#include "tcop/utility.h"
-#include "utils/acl.h"
-#include "utils/builtins.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-
-#include "catalog/ag_graph.h"
-#include "catalog/ag_label.h"
-#include "commands/label_commands.h"
-#include "utils/ag_cache.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
#define AGE_VERTIX 1
#define AGE_EDGE 2
diff --git a/src/include/utils/load/age_load.h
b/src/include/utils/load/age_load.h
index 9034ee13..f3c251ae 100644
--- a/src/include/utils/load/age_load.h
+++ b/src/include/utils/load/age_load.h
@@ -17,42 +17,14 @@
* under the License.
*/
-#include "postgres.h"
-
-#include "access/heapam.h"
-#include "access/xact.h"
-#include "catalog/dependency.h"
-#include "catalog/namespace.h"
-#include "catalog/objectaddress.h"
-#include "catalog/pg_class_d.h"
-#include "commands/defrem.h"
#include "commands/sequence.h"
-#include "commands/tablecmds.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/value.h"
-#include "parser/parse_node.h"
-#include "parser/parser.h"
-#include "storage/lockdefs.h"
-#include "tcop/dest.h"
-#include "tcop/utility.h"
-#include "utils/acl.h"
#include "utils/builtins.h"
-#include "utils/inval.h"
#include "utils/lsyscache.h"
-#include "utils/rel.h"
#include "catalog/ag_graph.h"
#include "catalog/ag_label.h"
#include "commands/label_commands.h"
#include "utils/ag_cache.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
#ifndef AGE_ENTITY_CREATOR_H
#define AGE_ENTITY_CREATOR_H
