diff --git a/config/Rules.am b/config/Rules.am
index 9c0714c82..deffa352e 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/module/icp/include \
 	-I$(top_srcdir)/lib/libspl/include \
-	-I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@ \
-	-I$(top_srcdir)/lib/libzpool/include
+	-I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@
 
 AM_LIBTOOLFLAGS = --silent
 
diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am
index 4ad3b854c..8c286142f 100644
--- a/lib/libspl/include/Makefile.am
+++ b/lib/libspl/include/Makefile.am
@@ -24,6 +24,8 @@ libspl_rpc_HEADERS = \
 
 libspl_sysdir = $(libspldir)/sys
 libspl_sys_HEADERS = \
+	%D%/sys/abd_os.h \
+	%D%/sys/abd_impl_os.h \
 	%D%/sys/acl.h \
 	%D%/sys/acl_impl.h \
 	%D%/sys/asm_linkage.h \
diff --git a/lib/libzpool/include/sys/abd_impl_os.h b/lib/libspl/include/sys/abd_impl_os.h
similarity index 100%
rename from lib/libzpool/include/sys/abd_impl_os.h
rename to lib/libspl/include/sys/abd_impl_os.h
diff --git a/lib/libzpool/include/sys/abd_os.h b/lib/libspl/include/sys/abd_os.h
similarity index 100%
rename from lib/libzpool/include/sys/abd_os.h
rename to lib/libspl/include/sys/abd_os.h
diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index 829d626d4..8553b377a 100644
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -1,5 +1,3 @@
-include $(srcdir)/%D%/include/Makefile.am
-
 libzpool_la_CFLAGS  = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
 libzpool_la_CFLAGS += $(ZLIB_CFLAGS)
 
diff --git a/lib/libzpool/include/Makefile.am b/lib/libzpool/include/Makefile.am
deleted file mode 100644
index 2e0c4c561..000000000
--- a/lib/libzpool/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-libzpooldir = $(includedir)/libzpool
-libzpool_HEADERS = \
-	%D%/sys/abd_os.h \
-	%D%/sys/abd_impl_os.h