diff --git a/zfs/lib/libspl/getexecname.c b/lib/libspl/getexecname.c
similarity index 100%
rename from zfs/lib/libspl/getexecname.c
rename to lib/libspl/getexecname.c
diff --git a/zfs/lib/libspl/gethrtime.c b/lib/libspl/gethrtime.c
similarity index 100%
rename from zfs/lib/libspl/gethrtime.c
rename to lib/libspl/gethrtime.c
diff --git a/zfs/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
similarity index 100%
rename from zfs/lib/libspl/include/assert.h
rename to lib/libspl/include/assert.h
diff --git a/zfs/lib/libspl/include/atomic.h b/lib/libspl/include/atomic.h
similarity index 100%
rename from zfs/lib/libspl/include/atomic.h
rename to lib/libspl/include/atomic.h
diff --git a/zfs/lib/libspl/include/stdlib.h b/lib/libspl/include/stdlib.h
similarity index 100%
rename from zfs/lib/libspl/include/stdlib.h
rename to lib/libspl/include/stdlib.h
diff --git a/zfs/lib/libspl/include/string.h b/lib/libspl/include/string.h
similarity index 100%
rename from zfs/lib/libspl/include/string.h
rename to lib/libspl/include/string.h
diff --git a/zfs/lib/libspl/include/strings.h b/lib/libspl/include/strings.h
similarity index 100%
rename from zfs/lib/libspl/include/strings.h
rename to lib/libspl/include/strings.h
diff --git a/zfs/lib/libspl/include/sys/bitmap.h b/lib/libspl/include/sys/bitmap.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/bitmap.h
rename to lib/libspl/include/sys/bitmap.h
diff --git a/zfs/lib/libspl/include/sys/byteorder.h b/lib/libspl/include/sys/byteorder.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/byteorder.h
rename to lib/libspl/include/sys/byteorder.h
diff --git a/zfs/lib/libspl/include/sys/cmn_err.h b/lib/libspl/include/sys/cmn_err.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/cmn_err.h
rename to lib/libspl/include/sys/cmn_err.h
diff --git a/zfs/lib/libspl/include/sys/cred.h b/lib/libspl/include/sys/cred.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/cred.h
rename to lib/libspl/include/sys/cred.h
diff --git a/zfs/lib/libspl/include/sys/debug.h b/lib/libspl/include/sys/debug.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/debug.h
rename to lib/libspl/include/sys/debug.h
diff --git a/zfs/lib/libspl/include/sys/feature_tests.h b/lib/libspl/include/sys/feature_tests.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/feature_tests.h
rename to lib/libspl/include/sys/feature_tests.h
diff --git a/zfs/lib/libspl/include/sys/file.h b/lib/libspl/include/sys/file.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/file.h
rename to lib/libspl/include/sys/file.h
diff --git a/zfs/lib/libspl/include/sys/frame.h b/lib/libspl/include/sys/frame.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/frame.h
rename to lib/libspl/include/sys/frame.h
diff --git a/zfs/lib/libspl/include/sys/int_limits.h b/lib/libspl/include/sys/int_limits.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/int_limits.h
rename to lib/libspl/include/sys/int_limits.h
diff --git a/zfs/lib/libspl/include/sys/int_types.h b/lib/libspl/include/sys/int_types.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/int_types.h
rename to lib/libspl/include/sys/int_types.h
diff --git a/zfs/lib/libspl/include/sys/inttypes.h b/lib/libspl/include/sys/inttypes.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/inttypes.h
rename to lib/libspl/include/sys/inttypes.h
diff --git a/zfs/lib/libspl/include/sys/isa_defs.h b/lib/libspl/include/sys/isa_defs.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/isa_defs.h
rename to lib/libspl/include/sys/isa_defs.h
diff --git a/zfs/lib/libspl/include/sys/kmem.h b/lib/libspl/include/sys/kmem.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/kmem.h
rename to lib/libspl/include/sys/kmem.h
diff --git a/zfs/lib/libspl/include/sys/kstat.h b/lib/libspl/include/sys/kstat.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/kstat.h
rename to lib/libspl/include/sys/kstat.h
diff --git a/zfs/lib/libspl/include/sys/machelf.h b/lib/libspl/include/sys/machelf.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/machelf.h
rename to lib/libspl/include/sys/machelf.h
diff --git a/zfs/lib/libspl/include/sys/note.h b/lib/libspl/include/sys/note.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/note.h
rename to lib/libspl/include/sys/note.h
diff --git a/zfs/lib/libspl/include/sys/param.h b/lib/libspl/include/sys/param.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/param.h
rename to lib/libspl/include/sys/param.h
diff --git a/zfs/lib/libspl/include/sys/processor.h b/lib/libspl/include/sys/processor.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/processor.h
rename to lib/libspl/include/sys/processor.h
diff --git a/zfs/lib/libspl/include/sys/sdt.h b/lib/libspl/include/sys/sdt.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/sdt.h
rename to lib/libspl/include/sys/sdt.h
diff --git a/zfs/lib/libspl/include/sys/stack.h b/lib/libspl/include/sys/stack.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/stack.h
rename to lib/libspl/include/sys/stack.h
diff --git a/zfs/lib/libspl/include/sys/sysevent.h b/lib/libspl/include/sys/sysevent.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/sysevent.h
rename to lib/libspl/include/sys/sysevent.h
diff --git a/zfs/lib/libspl/include/sys/sysevent/eventdefs.h b/lib/libspl/include/sys/sysevent/eventdefs.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/sysevent/eventdefs.h
rename to lib/libspl/include/sys/sysevent/eventdefs.h
diff --git a/zfs/lib/libspl/include/sys/sysmacros.h b/lib/libspl/include/sys/sysmacros.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/sysmacros.h
rename to lib/libspl/include/sys/sysmacros.h
diff --git a/zfs/lib/libspl/include/sys/time.h b/lib/libspl/include/sys/time.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/time.h
rename to lib/libspl/include/sys/time.h
diff --git a/zfs/lib/libspl/include/sys/types.h b/lib/libspl/include/sys/types.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/types.h
rename to lib/libspl/include/sys/types.h
diff --git a/zfs/lib/libspl/include/sys/types32.h b/lib/libspl/include/sys/types32.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/types32.h
rename to lib/libspl/include/sys/types32.h
diff --git a/zfs/lib/libspl/include/sys/u8_textprep.h b/lib/libspl/include/sys/u8_textprep.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/u8_textprep.h
rename to lib/libspl/include/sys/u8_textprep.h
diff --git a/zfs/lib/libspl/include/sys/u8_textprep_data.h b/lib/libspl/include/sys/u8_textprep_data.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/u8_textprep_data.h
rename to lib/libspl/include/sys/u8_textprep_data.h
diff --git a/zfs/lib/libspl/include/sys/uio.h b/lib/libspl/include/sys/uio.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/uio.h
rename to lib/libspl/include/sys/uio.h
diff --git a/zfs/lib/libspl/include/sys/va_list.h b/lib/libspl/include/sys/va_list.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/va_list.h
rename to lib/libspl/include/sys/va_list.h
diff --git a/zfs/lib/libspl/include/sys/zfs_debug.h b/lib/libspl/include/sys/zfs_debug.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/zfs_debug.h
rename to lib/libspl/include/sys/zfs_debug.h
diff --git a/zfs/lib/libspl/include/thread.h b/lib/libspl/include/thread.h
similarity index 100%
rename from zfs/lib/libspl/include/thread.h
rename to lib/libspl/include/thread.h
diff --git a/zfs/lib/libspl/include/unistd.h b/lib/libspl/include/unistd.h
similarity index 100%
rename from zfs/lib/libspl/include/unistd.h
rename to lib/libspl/include/unistd.h
diff --git a/zfs/lib/libspl/include/sys/sysevent/Makefile.in b/zfs/lib/libspl/include/sys/sysevent/Makefile.in
deleted file mode 100644
index 4938c56594..0000000000
--- a/zfs/lib/libspl/include/sys/sysevent/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-DISTFILES = eventdefs.h