diff --git a/src/backend/columnar/columnar_customscan.c b/src/backend/columnar/columnar_customscan.c
index e6f866078..5e5410116 100644
--- a/src/backend/columnar/columnar_customscan.c
+++ b/src/backend/columnar/columnar_customscan.c
@@ -16,8 +16,6 @@
 
 #include "miscadmin.h"
 
-#include "nodes/execnodes.h"     /* for ExprState, ExprContext, etc. */
-#include "executor/executor.h"   /* for ExecInitExprWithParams(), ExecEvalExpr() */
 #include "access/amapi.h"
 #include "access/skey.h"
 #include "catalog/pg_am.h"
diff --git a/src/backend/distributed/connection/worker_log_messages.c b/src/backend/distributed/connection/worker_log_messages.c
index 96ab36613..7bce64050 100644
--- a/src/backend/distributed/connection/worker_log_messages.c
+++ b/src/backend/distributed/connection/worker_log_messages.c
@@ -16,7 +16,6 @@
 #include "distributed/connection_management.h"
 #include "distributed/error_codes.h"
 #include "distributed/errormessage.h"
-#include "utils/memutils.h"   /* for TopTransactionContext */
 #include "distributed/log_utils.h"
 #include "distributed/worker_log_messages.h"