diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in
index 7469069157..8d5e6d7a25 100644
--- a/cmd/zdb/Makefile.in
+++ b/cmd/zdb/Makefile.in
@@ -207,9 +207,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
 zdb_SOURCES = \
 	zdb.c \
diff --git a/cmd/zdump/Makefile.in b/cmd/zdump/Makefile.in
index 91f1fd9334..4349a7a230 100644
--- a/cmd/zdump/Makefile.in
+++ b/cmd/zdump/Makefile.in
@@ -207,9 +207,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
 zdump_SOURCES = \
 	zdump.c
diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in
index ece9880a91..0162186a0f 100644
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@@ -207,9 +207,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
 zfs_SOURCES = \
 	zfs_iter.c \
diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in
index a3c365d936..b6e3c1d9a8 100644
--- a/cmd/zinject/Makefile.in
+++ b/cmd/zinject/Makefile.in
@@ -207,9 +207,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
 zinject_SOURCES = \
 	translate.c \
diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in
index 2027ecf16c..8267ac1391 100644
--- a/cmd/zpios/Makefile.in
+++ b/cmd/zpios/Makefile.in
@@ -208,9 +208,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 zpios_SOURCES = \
 	$(top_srcdir)/cmd/zpios/zpios.h \
 	$(top_srcdir)/cmd/zpios/zpios_main.c \
diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in
index c975168520..309a91535f 100644
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@@ -208,9 +208,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
 zpool_SOURCES = \
 	zpool_iter.c \
diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in
index 5944c33726..8845f42936 100644
--- a/cmd/ztest/Makefile.in
+++ b/cmd/ztest/Makefile.in
@@ -207,9 +207,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = -I${top_srcdir}/lib/libspl/include
 ztest_SOURCES = \
 	ztest.c
diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in
index f937ce1c6e..2a2275c5c7 100644
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@@ -212,9 +212,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = \
 	-I${top_srcdir}/module/avl/include \
 	-I${top_srcdir}/lib/libspl/include
diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index dcdfe0e668..d5627b8ac4 100644
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -212,9 +212,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = \
 	-I${top_srcdir}/module/nvpair/include \
 	-I${top_srcdir}/lib/libnvpair/include \
diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in
index 96d35b8d4b..a5356789d4 100644
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@@ -213,9 +213,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = \
 	-I${top_srcdir}/lib/libspl/include
 
diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in
index 459ecb30d9..3f74259d7f 100644
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@@ -214,9 +214,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = \
 	-I${top_srcdir}/lib/libuutil/include \
 	-I${top_srcdir}/lib/libspl/include \
diff --git a/lib/libzcommon/Makefile.in b/lib/libzcommon/Makefile.in
index d7d379aa14..12273a409d 100644
--- a/lib/libzcommon/Makefile.in
+++ b/lib/libzcommon/Makefile.in
@@ -213,14 +213,16 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = \
-	-I${top_srcdir}/module/zcommon/include \
+	-I${top_srcdir}/lib/libzpool/include \
 	-I${top_srcdir}/lib/libspl/include \
 	-I${top_srcdir}/lib/libnvpair/include \
+	-I${top_srcdir}/module/zcommon/include \
 	-I${top_srcdir}/module/nvpair/include \
+	-I${top_srcdir}/module/avl/include \
 	-I${top_srcdir}/module/zfs/include
 
 lib_LTLIBRARIES = libzcommon.la
diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index f418f862f1..896f384ea6 100644
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -215,9 +215,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = \
 	-I${top_srcdir}/lib/libzfs/include \
 	-I${top_srcdir}/lib/libspl/include
diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index 2705c812cd..7c49dca945 100644
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -212,9 +212,9 @@ target_vendor = @target_vendor@
 AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \
 	-Wno-unused -Wno-missing-braces -Wno-unknown-pragmas \
 	-Wno-parentheses -Wno-uninitialized -fno-strict-aliasing \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT \
-	-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 DEFAULT_INCLUDES = \
 	-I${top_srcdir}/module/zpool/include \
 	-I${top_srcdir}/module/zcommon/include \