diff --git a/src/backend/catalog/ag_catalog.c b/src/backend/catalog/ag_catalog.c
index 7b8a96c13..bbc7c1b11 100644
--- a/src/backend/catalog/ag_catalog.c
+++ b/src/backend/catalog/ag_catalog.c
@@ -27,10 +27,8 @@
 #include "tcop/utility.h"
 #include "utils/lsyscache.h"
 
-#include "catalog/ag_catalog.h"
 #include "catalog/ag_graph.h"
 #include "catalog/ag_label.h"
-#include "catalog/ag_namespace.h"
 #include "utils/ag_cache.h"
 
 static object_access_hook_type prev_object_access_hook;
diff --git a/src/backend/catalog/ag_graph.c b/src/backend/catalog/ag_graph.c
index 7594eea59..8e1d052a7 100644
--- a/src/backend/catalog/ag_graph.c
+++ b/src/backend/catalog/ag_graph.c
@@ -21,19 +21,8 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/htup.h"
-#include "access/htup_details.h"
-#include "access/skey.h"
-#include "access/stratnum.h"
 #include "catalog/indexing.h"
-#include "catalog/namespace.h"
-#include "nodes/makefuncs.h"
-#include "storage/lockdefs.h"
-#include "utils/fmgroids.h"
-#include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
 
 #include "catalog/ag_graph.h"
 #include "utils/ag_cache.h"
diff --git a/src/backend/catalog/ag_label.c b/src/backend/catalog/ag_label.c
index bbaad5292..47f3669a3 100644
--- a/src/backend/catalog/ag_label.c
+++ b/src/backend/catalog/ag_label.c
@@ -20,29 +20,16 @@
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/htup_details.h"
-#include "access/skey.h"
-#include "access/stratnum.h"
 #include "catalog/indexing.h"
-#include "catalog/namespace.h"
-#include "fmgr.h"
-#include "nodes/execnodes.h"
 #include "nodes/makefuncs.h"
-#include "storage/lockdefs.h"
 #include "utils/builtins.h"
-#include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
 
 #include "catalog/ag_graph.h"
 #include "catalog/ag_label.h"
 #include "commands/label_commands.h"
 #include "executor/cypher_utils.h"
 #include "utils/ag_cache.h"
-#include "utils/graphid.h"
 
 /*
  * INSERT INTO ag_catalog.ag_label
diff --git a/src/backend/commands/graph_commands.c b/src/backend/commands/graph_commands.c
index 2d70e65a5..b8dd02d1e 100644
--- a/src/backend/commands/graph_commands.c
+++ b/src/backend/commands/graph_commands.c
@@ -21,27 +21,15 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "access/xact.h"
-#include "catalog/dependency.h"
-#include "catalog/objectaddress.h"
-#include "commands/defrem.h"
 #include "commands/schemacmds.h"
 #include "commands/tablecmds.h"
-#include "fmgr.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/value.h"
 #include "parser/parser.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
 
 #include "catalog/ag_graph.h"
 #include "catalog/ag_label.h"
 #include "commands/label_commands.h"
-#include "utils/graphid.h"
 #include "utils/name_validation.h"
 
 /*
diff --git a/src/backend/commands/label_commands.c b/src/backend/commands/label_commands.c
index a3a9768cc..c8ea7738e 100644
--- a/src/backend/commands/label_commands.c
+++ b/src/backend/commands/label_commands.c
@@ -19,27 +19,15 @@
 
 #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"
@@ -50,8 +38,6 @@
 #include "catalog/ag_label.h"
 #include "commands/label_commands.h"
 #include "utils/ag_cache.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
 #include "utils/name_validation.h"
 
 /*