diff --git a/cmds/filesystem.c b/cmds/filesystem.c
index a17db9b5..c03ef0e7 100644
--- a/cmds/filesystem.c
+++ b/cmds/filesystem.c
@@ -25,7 +25,6 @@
 #include <fcntl.h>
 #include <ftw.h>
 #include <mntent.h>
-#include <linux/limits.h>
 #include <linux/version.h>
 #include <getopt.h>
 #include <limits.h>
diff --git a/cmds/subvolume.c b/cmds/subvolume.c
index 6f5e688c..accdb183 100644
--- a/cmds/subvolume.c
+++ b/cmds/subvolume.c
@@ -27,7 +27,6 @@
 #include <limits.h>
 #include <getopt.h>
 #include <uuid/uuid.h>
-#include <linux/magic.h>
 
 #include <btrfsutil.h>
 
diff --git a/common/device-scan.c b/common/device-scan.c
index 659f48c4..7ff1ef6a 100644
--- a/common/device-scan.c
+++ b/common/device-scan.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <linux/limits.h>
 #include <blkid/blkid.h>
 #include <uuid/uuid.h>
 #include "kernel-lib/overflow.h"
diff --git a/common/path-utils.h b/common/path-utils.h
index dcbec284..86315760 100644
--- a/common/path-utils.h
+++ b/common/path-utils.h
@@ -18,6 +18,7 @@
 #define __BTRFS_PATH_UTILS_H__
 
 #include <sys/types.h>
+#include <linux/limits.h>
 
 char *path_canonicalize_dm_name(const char *ptname);
 char *path_canonicalize(const char *path);
diff --git a/common/utils.c b/common/utils.c
index 821dce34..5d2e8784 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -30,9 +30,6 @@
 #include <unistd.h>
 #include <mntent.h>
 #include <ctype.h>
-#include <linux/loop.h>
-#include <linux/major.h>
-#include <linux/kdev_t.h>
 #include <limits.h>
 #include <blkid/blkid.h>
 #include <sys/vfs.h>
diff --git a/convert/source-fs.h b/convert/source-fs.h
index 7cf587d9..fb1327a1 100644
--- a/convert/source-fs.h
+++ b/convert/source-fs.h
@@ -18,8 +18,6 @@
 #define __BTRFS_CONVERT_SOURCE_FS_H__
 
 #include "kerncompat.h"
-#include <linux/kdev_t.h>
-#include <sys/types.h>
 #include <pthread.h>
 #include <sys/types.h>
 
diff --git a/convert/source-reiserfs.c b/convert/source-reiserfs.c
index 29911c91..d117f05a 100644
--- a/convert/source-reiserfs.c
+++ b/convert/source-reiserfs.c
@@ -17,7 +17,6 @@
 #if BTRFSCONVERT_REISERFS
 
 #include "kerncompat.h"
-#include <linux/limits.h>
 #include <linux/fs.h>
 #include <limits.h>
 #include <sys/stat.h>
diff --git a/kernel-lib/bitops.h b/kernel-lib/bitops.h
index 0acb8e6f..e0b85215 100644
--- a/kernel-lib/bitops.h
+++ b/kernel-lib/bitops.h
@@ -1,7 +1,6 @@
 #ifndef _PERF_LINUX_BITOPS_H_
 #define _PERF_LINUX_BITOPS_H_
 
-#include <linux/kernel.h>
 #include <endian.h>
 #include "common/internal.h"
 
diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
index 97c3465a..2a6892b3 100644
--- a/kernel-shared/zoned.c
+++ b/kernel-shared/zoned.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include <sys/ioctl.h>
-#include <linux/fs.h>
 #include <unistd.h>
 
 #include "kernel-lib/list.h"