diff --git a/config/kernel.m4 b/config/kernel.m4
index a1dd4f04b6..2e232286e4 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -8,6 +8,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 
 	dnl # Kernel build cpp flags
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL "
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unknown-pragmas "
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR"
 
 	dnl # Required for pread() functionality an other GNU goodness
diff --git a/configure b/configure
index a24e975062..325416dc51 100755
--- a/configure
+++ b/configure
@@ -19202,7 +19202,6 @@ echo "${ECHO_T}$zfsconfig" >&6;
 
 
 	echo "creating symlinks for additional kernel make targets"
-	ln -f -s $LIBDIR/libport/u8_textprep.c      $LIBDIR/libport/ku8_textprep.c
 	ln -f -s $LIBDIR/libavl/avl.c               $LIBDIR/libavl/kavl.c
 	ln -f -s $LIBDIR/libavl/avl.c               $LIBDIR/libavl/uavl.c
 	ln -f -s $LIBDIR/libnvpair/nvpair.c         $LIBDIR/libnvpair/knvpair.c
@@ -19210,8 +19209,6 @@ echo "${ECHO_T}$zfsconfig" >&6;
 	ln -f -s $LIBDIR/libzcommon/zfs_deleg.c     $LIBDIR/libzcommon/kzfs_deleg.c
 	ln -f -s $LIBDIR/libzcommon/zfs_prop.c      $LIBDIR/libzcommon/kzfs_prop.c
 	ln -f -s $LIBDIR/libzcommon/zprop_common.c  $LIBDIR/libzcommon/kzprop_common.c
-	ln -f -s $LIBDIR/libzcommon/compress.c      $LIBDIR/libzcommon/kcompress.c
-	ln -f -s $LIBDIR/libzcommon/list.c          $LIBDIR/libzcommon/klist.c
 	ln -f -s $LIBDIR/libzcommon/zfs_namecheck.c $LIBDIR/libzcommon/kzfs_namecheck.c
 	ln -f -s $LIBDIR/libzcommon/zfs_comutil.c   $LIBDIR/libzcommon/kzfs_comutil.c
 	ln -f -s $LIBDIR/libzcommon/zpool_prop.c    $LIBDIR/libzcommon/kzpool_prop.c