diff --git a/configure.ac b/configure.ac
index 720e7d0d6d..53acda0005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,7 @@ AC_CHECK_HEADERS([ \
 	inttypes.h \
 	lastlog.h \
 	libutil.h \
+	linux/blkzoned.h \
 	linux/btrfs.h \
 	linux/capability.h \
 	linux/cdrom.h \
@@ -382,8 +383,6 @@ AC_CHECK_HEADERS([security/pam_misc.h],
 #endif
 ])
 
-AC_CHECK_HEADERS([linux/blkzoned.h])
-
 AC_CHECK_DECLS([BLK_ZONE_REP_CAPACITY], [], [], [
 	#include <linux/blkzoned.h>
 ])
diff --git a/meson.build b/meson.build
index c53fd36eb6..e0667b66fc 100644
--- a/meson.build
+++ b/meson.build
@@ -4,8 +4,8 @@ project('util-linux', 'c',
 
 pkgconfig = import('pkgconfig')
 
-libblkid_version = '1.1.0'
 libblkid_date = '11-Dec-2019'
+libblkid_version = '1.1.0'
 libuuid_version = '1.3.0'
 libmount_version = '1.1.0'
 libsmartcols_version = '1.1.0'
@@ -156,8 +156,10 @@ headers = '''
         linux/compiler.h
         linux/falloc.h
         linux/fd.h
-        linux/fs.h
+	linux/fiemap.h
+	linux/gsmmux.h
         linux/net_namespace.h
+        linux/nsfs.h
         linux/raw.h
         linux/securebits.h
         linux/tiocl.h
@@ -195,6 +197,7 @@ headers = '''
         sys/types.h
         sys/ucred.h
         sys/un.h
+	sys/xattr.h
 '''.split()
 
 lib_m = cc.find_library('m')