diff --git a/configure.ac b/configure.ac
index 49006a29f..8a065c168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PATH_PROG(MD2MAN, go-md2man)
 
 AM_CONDITIONAL([HAVE_MD2MAN], [test "x$ac_cv_path_MD2MAN" != x])
 
-AC_CHECK_HEADERS([error.h linux/openat2.h stdatomic.h linux/ioprio.h])
+AC_CHECK_HEADERS([error.h linux/filter.h linux/ioprio.h linux/limits.h linux/magic.h linux/netlink.h linux/openat2.h linux/sched.h stdatomic.h sys/epoll.h sys/personality.h sys/prctl.h sys/signalfd.h sys/statfs.h sys/sys/vfs.h sys/sysmacros.h])
 
 AC_CHECK_TYPES([atomic_int], [], [], [[#include <stdatomic.h>]])
 
diff --git a/src/libcrun/cgroup-cgroupfs.c b/src/libcrun/cgroup-cgroupfs.c
index 3a7b1e392..7b9e32799 100644
--- a/src/libcrun/cgroup-cgroupfs.c
+++ b/src/libcrun/cgroup-cgroupfs.c
@@ -28,7 +28,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
+#ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#endif
 #include <inttypes.h>
 #include <time.h>
 
diff --git a/src/libcrun/cgroup-resources.c b/src/libcrun/cgroup-resources.c
index 71893cd87..fae3140a7 100644
--- a/src/libcrun/cgroup-resources.c
+++ b/src/libcrun/cgroup-resources.c
@@ -29,7 +29,10 @@
 #include "status.h"
 #include <string.h>
 #include <sys/types.h>
+#include <sys/mount.h>
+#ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#endif
 #include <inttypes.h>
 #include <time.h>
 
diff --git a/src/libcrun/cgroup-setup.c b/src/libcrun/cgroup-setup.c
index 913b42122..62092bc86 100644
--- a/src/libcrun/cgroup-setup.c
+++ b/src/libcrun/cgroup-setup.c
@@ -29,7 +29,11 @@
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <sys/mount.h>
+#ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#endif
+
 #include <inttypes.h>
 #include <time.h>
 
diff --git a/src/libcrun/cgroup-systemd.c b/src/libcrun/cgroup-systemd.c
index 621a3ff4c..5b4de3ea6 100644
--- a/src/libcrun/cgroup-systemd.c
+++ b/src/libcrun/cgroup-systemd.c
@@ -30,7 +30,10 @@
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <sys/mount.h>
+#ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#endif
 #include <inttypes.h>
 #include <fcntl.h>
 #include <time.h>
diff --git a/src/libcrun/cgroup-utils.c b/src/libcrun/cgroup-utils.c
index 347d9ad21..ea58ce35c 100644
--- a/src/libcrun/cgroup-utils.c
+++ b/src/libcrun/cgroup-utils.c
@@ -30,11 +30,17 @@
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <sys/mount.h>
+#ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#endif
 #include <inttypes.h>
 #include <time.h>
 
 #include <sys/stat.h>
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
 #include <sys/types.h>
 #include <fcntl.h>
 #include <libgen.h>
diff --git a/src/libcrun/cgroup.c b/src/libcrun/cgroup.c
index 625591d96..b7268a59a 100644
--- a/src/libcrun/cgroup.c
+++ b/src/libcrun/cgroup.c
@@ -33,7 +33,9 @@
 #include <sched.h>
 #include <sys/types.h>
 #include <signal.h>
+#ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#endif
 #include <inttypes.h>
 #include <time.h>
 
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
index 1d907a8bc..991eb61de 100644
--- a/src/libcrun/container.c
+++ b/src/libcrun/container.c
@@ -45,9 +45,15 @@
 #include "io_priority.h"
 #include "cgroup.h"
 #include "cgroup-utils.h"
+#ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
+#endif
+#ifdef HAVE_SYS_SIGNALFD_H
 #include <sys/signalfd.h>
+#endif
+#ifdef HAVE_SYS_EPOLL_H
 #include <sys/epoll.h>
+#endif
 #include <sys/socket.h>
 #ifdef HAVE_CAP
 #  include <sys/capability.h>
diff --git a/src/libcrun/handlers/krun.c b/src/libcrun/handlers/krun.c
index c1c870ea3..88762b72b 100644
--- a/src/libcrun/handlers/krun.c
+++ b/src/libcrun/handlers/krun.c
@@ -27,7 +27,9 @@
 #include <errno.h>
 #include <sys/param.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SYSMACROS_H
 #include <sys/sysmacros.h>
+#endif
 #include <fcntl.h>
 #include <sched.h>
 #include <ocispec/runtime_spec_schema_config_schema.h>
diff --git a/src/libcrun/intelrdt.c b/src/libcrun/intelrdt.c
index db517ef75..80bef77a3 100644
--- a/src/libcrun/intelrdt.c
+++ b/src/libcrun/intelrdt.c
@@ -25,7 +25,13 @@
 #include <string.h>
 #include <sched.h>
 #include <fcntl.h>
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#include <sys/mount.h>
+#ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#endif
 
 #define INTEL_RDT_MOUNT_POINT "/sys/fs/resctrl"
 #define SCHEMATA_FILE "schemata"
diff --git a/src/libcrun/io_priority.c b/src/libcrun/io_priority.c
index 3864f21e8..e798d020f 100644
--- a/src/libcrun/io_priority.c
+++ b/src/libcrun/io_priority.c
@@ -27,7 +27,10 @@
 #include "linux.h"
 #include "utils.h"
 #include "io_priority.h"
+#include <sys/types.h>
+#ifdef HAVE_SYS_SYSMAROS_H
 #include <sys/sysmacros.h>
+#endif
 
 #ifdef HAVE_LINUX_IOPRIO_H
 static int
diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
index eb61f30f4..82bd29f84 100644
--- a/src/libcrun/linux.c
+++ b/src/libcrun/linux.c
@@ -34,6 +34,7 @@
 #endif
 
 #include <sys/prctl.h>
+
 #ifdef HAVE_CAP
 #  include <sys/capability.h>
 #endif
diff --git a/src/libcrun/scheduler.c b/src/libcrun/scheduler.c
index 2bc633343..bacf02ddc 100644
--- a/src/libcrun/scheduler.c
+++ b/src/libcrun/scheduler.c
@@ -22,8 +22,12 @@
 #include "linux.h"
 #include "utils.h"
 #include <sched.h>
+#ifdef HAVE_LINUX_SCHED_H
 #include <linux/sched.h>
+#endif
+#ifdef HAVE_SYS_SYSMACROS_H
 #include <sys/sysmacros.h>
+#endif
 #include <limits.h>
 #include <inttypes.h>
 #include <ocispec/runtime_spec_schema_config_schema.h>
diff --git a/src/libcrun/seccomp.c b/src/libcrun/seccomp.c
index ae50f137a..3bcfdc8ed 100644
--- a/src/libcrun/seccomp.c
+++ b/src/libcrun/seccomp.c
@@ -29,10 +29,14 @@
 #include <unistd.h>
 #include <sys/mount.h>
 #include <sys/syscall.h>
+#if HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
+#endif
 #include <sys/time.h>
 #include <sys/resource.h>
+#ifdef HAVE_SYS_SYSMACROS_H
 #include <sys/sysmacros.h>
+#endif
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/stat.h>
@@ -47,10 +51,11 @@
 
 #ifdef HAVE_SECCOMP
 #  include <seccomp.h>
-#endif
 #include <linux/seccomp.h>
+#endif
+#ifdef HAVE_LINUX_FILTER_H
 #include <linux/filter.h>
-#include <sys/prctl.h>
+#endif
 #include <sys/syscall.h>
 
 #ifndef __NR_seccomp
diff --git a/tests/init.c b/tests/init.c
index d32faf509..e90289c1b 100644
--- a/tests/init.c
+++ b/tests/init.c
@@ -18,7 +18,9 @@
 #define _GNU_SOURCE
 
 #include <config.h>
+#ifdef HAVE_LINUX_LIMITS_H
 #include <linux/limits.h>
+#endif
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -33,7 +35,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/syscall.h>
+#ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
+#endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sched.h>
diff --git a/tests/tests_libcrun_fuzzer.c b/tests/tests_libcrun_fuzzer.c
index 38b19d4dd..d347c9969 100644
--- a/tests/tests_libcrun_fuzzer.c
+++ b/tests/tests_libcrun_fuzzer.c
@@ -32,7 +32,9 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <limits.h>
+#ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
+#endif
 
 static int test_mode = -1;