diff --git a/lib/libspl/libspl/include/sys/list.h b/lib/libspl/include/sys/list.h
similarity index 100%
rename from lib/libspl/libspl/include/sys/list.h
rename to lib/libspl/include/sys/list.h
diff --git a/lib/libspl/libspl/include/sys/list_impl.h b/lib/libspl/include/sys/list_impl.h
similarity index 100%
rename from lib/libspl/libspl/include/sys/list_impl.h
rename to lib/libspl/include/sys/list_impl.h
diff --git a/lib/libspl/libspl/list.c b/lib/libspl/list.c
similarity index 100%
rename from lib/libspl/libspl/list.c
rename to lib/libspl/list.c
diff --git a/lib/libspl/libspl/mkdirp.c b/lib/libspl/mkdirp.c
similarity index 100%
rename from lib/libspl/libspl/mkdirp.c
rename to lib/libspl/mkdirp.c
diff --git a/lib/libspl/libspl/strlcat.c b/lib/libspl/strlcat.c
similarity index 100%
rename from lib/libspl/libspl/strlcat.c
rename to lib/libspl/strlcat.c
diff --git a/lib/libspl/libspl/strlcpy.c b/lib/libspl/strlcpy.c
similarity index 100%
rename from lib/libspl/libspl/strlcpy.c
rename to lib/libspl/strlcpy.c
diff --git a/lib/libspl/libspl/strnlen.c b/lib/libspl/strnlen.c
similarity index 100%
rename from lib/libspl/libspl/strnlen.c
rename to lib/libspl/strnlen.c
diff --git a/lib/libspl/libspl/u8_textprep.c b/lib/libspl/u8_textprep.c
similarity index 100%
rename from lib/libspl/libspl/u8_textprep.c
rename to lib/libspl/u8_textprep.c