diff --git a/src/chunk_adaptive.c b/src/chunk_adaptive.c
index 434bbeb96..759690a4c 100644
--- a/src/chunk_adaptive.c
+++ b/src/chunk_adaptive.c
@@ -13,7 +13,6 @@
 #include <utils/builtins.h>
 #include <utils/array.h>
 #include <utils/snapmgr.h>
-#include <utils/tqual.h>
 #include <utils/typcache.h>
 #include <funcapi.h>
 #include <math.h>
diff --git a/src/chunk_append/planner.c b/src/chunk_append/planner.c
index 2f8ab5b28..12b4327f7 100644
--- a/src/chunk_append/planner.c
+++ b/src/chunk_append/planner.c
@@ -9,7 +9,6 @@
 #include <nodes/extensible.h>
 #include <nodes/makefuncs.h>
 #include <nodes/nodeFuncs.h>
-#include <nodes/relation.h>
 #include <optimizer/clauses.h>
 #include <optimizer/pathnode.h>
 #include <optimizer/paths.h>
diff --git a/src/chunk_append/transform.c b/src/chunk_append/transform.c
index 567067b19..1b287217d 100644
--- a/src/chunk_append/transform.c
+++ b/src/chunk_append/transform.c
@@ -8,7 +8,6 @@
 #include <catalog/pg_type.h>
 #include <nodes/makefuncs.h>
 #include <nodes/nodeFuncs.h>
-#include <nodes/relation.h>
 #include <optimizer/clauses.h>
 #include <utils/lsyscache.h>
 
diff --git a/src/chunk_insert_state.c b/src/chunk_insert_state.c
index 50699d62e..16e1c4f4a 100644
--- a/src/chunk_insert_state.c
+++ b/src/chunk_insert_state.c
@@ -11,7 +11,6 @@
 #include <utils/builtins.h>
 #include <utils/guc.h>
 #include <nodes/plannodes.h>
-#include <nodes/relation.h>
 #include <access/xact.h>
 #include <optimizer/plancat.h>
 #include <optimizer/clauses.h>
diff --git a/src/hypertable_insert.c b/src/hypertable_insert.c
index 6667e3d2a..53a298d58 100644
--- a/src/hypertable_insert.c
+++ b/src/hypertable_insert.c
@@ -10,7 +10,6 @@
 #include <nodes/makefuncs.h>
 #include <nodes/nodeFuncs.h>
 #include <nodes/plannodes.h>
-#include <nodes/relation.h>
 #include <executor/nodeModifyTable.h>
 #include <utils/rel.h>
 #include <utils/lsyscache.h>
diff --git a/src/hypertable_restrict_info.c b/src/hypertable_restrict_info.c
index 9b67a63f9..9a402ced4 100644
--- a/src/hypertable_restrict_info.c
+++ b/src/hypertable_restrict_info.c
@@ -4,7 +4,6 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
-#include <nodes/relation.h>
 #include <utils/typcache.h>
 #include <optimizer/clauses.h>
 #include <utils/lsyscache.h>
diff --git a/src/plan_expand_hypertable.c b/src/plan_expand_hypertable.c
index 8b032145b..a2edd6561 100644
--- a/src/plan_expand_hypertable.c
+++ b/src/plan_expand_hypertable.c
@@ -4,7 +4,6 @@
  * LICENSE-APACHE for a copy of the license.
  */
 #include <postgres.h>
-#include <nodes/relation.h>
 #include <parser/parsetree.h>
 #include <optimizer/clauses.h>
 #include <optimizer/var.h>
diff --git a/src/planner.c b/src/planner.c
index 0dadbaf07..8dc03f850 100644
--- a/src/planner.c
+++ b/src/planner.c
@@ -5,7 +5,6 @@
  */
 #include <postgres.h>
 #include <nodes/plannodes.h>
-#include <nodes/relation.h>
 #include <parser/parsetree.h>
 #include <optimizer/clauses.h>
 #include <optimizer/planner.h>
diff --git a/src/scanner.c b/src/scanner.c
index 576870949..9379cbd64 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -9,7 +9,6 @@
 #include <storage/lmgr.h>
 #include <storage/bufmgr.h>
 #include <utils/rel.h>
-#include <utils/tqual.h>
 
 #include "scanner.h"
 
diff --git a/src/scanner.h b/src/scanner.h
index b3664ae00..c6058e94a 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -12,7 +12,6 @@
 #include <access/heapam.h>
 #include <nodes/lockoptions.h>
 #include <utils.h>
-#include <access/relscan.h>
 
 #include "export.h"