diff --git a/support/check_mem_access.h b/support/check_mem_access.h
index 116e1f7c8a..424fa40c3a 100644
--- a/support/check_mem_access.h
+++ b/support/check_mem_access.h
@@ -19,6 +19,7 @@
 #ifndef SUPPORT_CHECK_MEM_ACCESS_H
 #define SUPPORT_CHECK_MEM_ACCESS_H
 
+#include <stdbool.h>
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
diff --git a/support/support_mem_access.c b/support/support_mem_access.c
index aa5127b41f..e5a1666106 100644
--- a/support/support_mem_access.c
+++ b/support/support_mem_access.c
@@ -19,8 +19,11 @@
 
 #include <setjmp.h>
 #include <signal.h>
+#include <stddef.h>
 #include <support/xsignal.h>
 
+#include "check_mem_access.h"
+
 static sigjmp_buf sigsegv_jmp_buf;
 
 static void