diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index 77cf608bb1..089a9a0a65 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -24,6 +24,7 @@
 #include "catalog/pg_type.h"
 #include "storage/lmgr.h"
 #include "miscadmin.h"
+#include "nodes/value.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/fmgroids.h"
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index fd123827dd..b0478f78bd 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -19,6 +19,7 @@
 
 #include "catalog/pg_type.h"
 #include "libpq/pqformat.h"
+#include "nodes/value.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index e1bb344e4f..d57c94c677 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -15,7 +15,6 @@
 #define BUILTINS_H
 
 #include "fmgr.h"
-#include "nodes/parsenodes.h"
 #include "utils/sortsupport.h"
 
 /*