diff --git a/include/c_common/pgdata_getters.h b/include/c_common/pgdata_getters.h
index 0fcd9f7687c..682fab2d784 100644
--- a/include/c_common/pgdata_getters.h
+++ b/include/c_common/pgdata_getters.h
@@ -50,8 +50,10 @@ extern "C" {
 
 #ifdef __cplusplus
 #include <cstddef>
+#include <cstdint>
 #else
 #include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 #endif
 
diff --git a/include/cpp_common/get_check_data.hpp b/include/cpp_common/get_check_data.hpp
index f06205f4770..caa93a06ac6 100644
--- a/include/cpp_common/get_check_data.hpp
+++ b/include/cpp_common/get_check_data.hpp
@@ -31,10 +31,12 @@ extern "C" {
 #include <postgres.h>
 #include <utils/array.h>
 #include <access/htup_details.h>
+#include <catalog/pg_type.h>
 }
 
 #include <vector>
 #include <string>
+#include <cstdint>
 
 
 using Column_info_t = struct Column_info_t;