diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index f9dc50cc65..a3f8a457b8 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -14,6 +14,7 @@
 #ifndef HIO_H
 #define HIO_H
 
+#include "access/heapam.h"
 #include "access/htup.h"
 #include "utils/relcache.h"
 #include "storage/buf.h"
diff --git a/src/include/utils/json.h b/src/include/utils/json.h
index fa0d4fcad7..c355e0f73e 100644
--- a/src/include/utils/json.h
+++ b/src/include/utils/json.h
@@ -15,6 +15,7 @@
 #define JSON_H
 
 #include "fmgr.h"
+#include "lib/stringinfo.h"
 
 extern Datum json_in(PG_FUNCTION_ARGS);
 extern Datum json_out(PG_FUNCTION_ARGS);