diff --git a/src/backend/distributed/commands/comment.c b/src/backend/distributed/commands/comment.c
index 0445959c4..45f29f9de 100644
--- a/src/backend/distributed/commands/comment.c
+++ b/src/backend/distributed/commands/comment.c
@@ -2,12 +2,12 @@
 
 #include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/table.h"
 #include "catalog/pg_shdescription.h"
 
 #include "nodes/parsenodes.h"
-#include "server/access/table.h"
-#include "server/utils/rel.h"
 #include "utils/builtins.h"
+#include "utils/rel.h"
 
 #include "distributed/comment.h"
 
diff --git a/src/include/distributed/comment.h b/src/include/distributed/comment.h
index 14c7159e2..d4dd4acd5 100644
--- a/src/include/distributed/comment.h
+++ b/src/include/distributed/comment.h
@@ -1,6 +1,6 @@
 #include "postgres.h"
 
-#include "server/nodes/parsenodes.h"
+#include "nodes/parsenodes.h"
 
 typedef struct CommentStmtType
 {