diff --git a/config/Rules.am b/config/Rules.am
index 9c0714c82..ecc7ab23c 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
 	-include $(top_builddir)/zfs_config.h \
 	-I$(top_builddir)/include \
 	-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
diff --git a/include/sys/crypto/common.h b/include/sys/crypto/common.h
index 4a9b4f0e1..2428fb273 100644
--- a/include/sys/crypto/common.h
+++ b/include/sys/crypto/common.h
@@ -38,6 +38,8 @@ extern "C" {
 #endif
 
 #include <sys/zfs_context.h>
+#include <sys/types.h>
+#include <sys/uio.h>
 
 /* Cryptographic Mechanisms */
 
diff --git a/lib/libicp/Makefile.am b/lib/libicp/Makefile.am
index 23adba10b..b83ec461f 100644
--- a/lib/libicp/Makefile.am
+++ b/lib/libicp/Makefile.am
@@ -1,6 +1,9 @@
 libicp_la_CCASFLAGS = $(AM_CCASFLAGS)
 libicp_la_CFLAGS    = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
 
+libicp_la_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+libicp_la_CPPFLAGS += -I$(top_srcdir)/module/icp/include
+
 noinst_LTLIBRARIES += libicp.la
 
 nodist_libicp_la_SOURCES = \
diff --git a/module/icp/spi/kcf_spi.c b/module/icp/spi/kcf_spi.c
index 806c0b028..35fe55b25 100644
--- a/module/icp/spi/kcf_spi.c
+++ b/module/icp/spi/kcf_spi.c
@@ -31,7 +31,6 @@
  */
 
 
-#include <sys/zfs_context.h>
 #include <sys/crypto/common.h>
 #include <sys/crypto/impl.h>
 #include <sys/crypto/sched_impl.h>