Separate libs6rcrepo

50 files changed, 156 insertions, 144 deletions

diff --git a/package/deps.mak b/package/deps.mak
index 1e64adb..e720368 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -18,41 +18,7 @@ src/libs6rc/s6rc_livedir_create.o src/libs6rc/s6rc_livedir_create.lo: src/libs6r
 src/libs6rc/s6rc_livedir_prefix.o src/libs6rc/s6rc_livedir_prefix.lo: src/libs6rc/s6rc_livedir_prefix.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_livedir_prefixsize.o src/libs6rc/s6rc_livedir_prefixsize.lo: src/libs6rc/s6rc_livedir_prefixsize.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_lock.lo: src/libs6rc/s6rc_lock.c src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_ls.o src/libs6rc/s6rc_ls.lo: src/libs6rc/s6rc_ls.c src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_nlto0.o src/libs6rc/s6rc_nlto0.lo: src/libs6rc/s6rc_nlto0.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_read_uint.lo: src/libs6rc/s6rc_read_uint.c src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_badsub.o src/libs6rc/s6rc_repo_badsub.lo: src/libs6rc/s6rc_repo_badsub.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_checkset.o src/libs6rc/s6rc_repo_checkset.lo: src/libs6rc/s6rc_repo_checkset.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_cleanup.o src/libs6rc/s6rc_repo_cleanup.lo: src/libs6rc/s6rc_repo_cleanup.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_compile.o src/libs6rc/s6rc_repo_compile.lo: src/libs6rc/s6rc_repo_compile.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_fillset.o src/libs6rc/s6rc_repo_fillset.lo: src/libs6rc/s6rc_repo_fillset.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_fix.o src/libs6rc/s6rc_repo_fix.lo: src/libs6rc/s6rc_repo_fix.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_fixset.o src/libs6rc/s6rc_repo_fixset.lo: src/libs6rc/s6rc_repo_fixset.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_flattenservices.o src/libs6rc/s6rc_repo_flattenservices.lo: src/libs6rc/s6rc_repo_flattenservices.c src/include/s6-rc/config.h src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_getserviceflags.o src/libs6rc/s6rc_repo_getserviceflags.lo: src/libs6rc/s6rc_repo_getserviceflags.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_list_sets.o src/libs6rc/s6rc_repo_list_sets.lo: src/libs6rc/s6rc_repo_list_sets.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_listalldeps.o src/libs6rc/s6rc_repo_listalldeps.lo: src/libs6rc/s6rc_repo_listalldeps.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_listcontents.o src/libs6rc/s6rc_repo_listcontents.lo: src/libs6rc/s6rc_repo_listcontents.c src/include/s6-rc/config.h src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_listdeps.o src/libs6rc/s6rc_repo_listdeps.lo: src/libs6rc/s6rc_repo_listdeps.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_listdeps_internal.o src/libs6rc/s6rc_repo_listdeps_internal.lo: src/libs6rc/s6rc_repo_listdeps_internal.c src/include/s6-rc/config.h src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_listsub.o src/libs6rc/s6rc_repo_listsub.lo: src/libs6rc/s6rc_repo_listsub.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_lock.o src/libs6rc/s6rc_repo_lock.lo: src/libs6rc/s6rc_repo_lock.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_makedefbundle.o src/libs6rc/s6rc_repo_makedefbundle.lo: src/libs6rc/s6rc_repo_makedefbundle.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_makesetbundles.o src/libs6rc/s6rc_repo_makesetbundles.lo: src/libs6rc/s6rc_repo_makesetbundles.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_makestores.o src/libs6rc/s6rc_repo_makestores.lo: src/libs6rc/s6rc_repo_makestores.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_makesvlist.o src/libs6rc/s6rc_repo_makesvlist.lo: src/libs6rc/s6rc_repo_makesvlist.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_makesvlist_byname.o src/libs6rc/s6rc_repo_makesvlist_byname.lo: src/libs6rc/s6rc_repo_makesvlist_byname.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_moveservices.o src/libs6rc/s6rc_repo_moveservices.lo: src/libs6rc/s6rc_repo_moveservices.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_setcompile.o src/libs6rc/s6rc_repo_setcompile.lo: src/libs6rc/s6rc_repo_setcompile.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_setuptodate.o src/libs6rc/s6rc_repo_setuptodate.lo: src/libs6rc/s6rc_repo_setuptodate.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_subnames.o src/libs6rc/s6rc_repo_subnames.lo: src/libs6rc/s6rc_repo_subnames.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_sv_bcmpr.o src/libs6rc/s6rc_repo_sv_bcmpr.lo: src/libs6rc/s6rc_repo_sv_bcmpr.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_sv_cmpr.o src/libs6rc/s6rc_repo_sv_cmpr.lo: src/libs6rc/s6rc_repo_sv_cmpr.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_sync.o src/libs6rc/s6rc_repo_sync.lo: src/libs6rc/s6rc_repo_sync.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_syncset.o src/libs6rc/s6rc_repo_syncset.lo: src/libs6rc/s6rc_repo_syncset.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_syncset_tmp.o src/libs6rc/s6rc_repo_syncset_tmp.lo: src/libs6rc/s6rc_repo_syncset_tmp.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
-src/libs6rc/s6rc_repo_touch.o src/libs6rc/s6rc_repo_touch.lo: src/libs6rc/s6rc_repo_touch.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_touchset.o src/libs6rc/s6rc_repo_touchset.lo: src/libs6rc/s6rc_repo_touchset.c src/include/s6-rc/repo.h
 src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_sanitize_dir.lo: src/libs6rc/s6rc_sanitize_dir.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_block.lo: src/libs6rc/s6rc_servicedir_block.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_offline.lo: src/libs6rc/s6rc_servicedir_copy_offline.c src/include/s6-rc/s6rc-servicedir.h src/libs6rc/s6rc-servicedir-internal.h
@@ -61,7 +27,6 @@ src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_internal.lo:
 src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_manage.lo: src/libs6rc/s6rc_servicedir_manage.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_unblock.lo: src/libs6rc/s6rc_servicedir_unblock.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_unsupervise.o src/libs6rc/s6rc_servicedir_unsupervise.lo: src/libs6rc/s6rc_servicedir_unsupervise.c src/include/s6-rc/s6rc-servicedir.h
-src/libs6rc/s6rc_type_check.o src/libs6rc/s6rc_type_check.lo: src/libs6rc/s6rc_type_check.c src/include/s6-rc/s6rc-utils.h
 src/repo/s6-rc-repo-init.o src/repo/s6-rc-repo-init.lo: src/repo/s6-rc-repo-init.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/repo/s6-rc-repo-sync.o src/repo/s6-rc-repo-sync.lo: src/repo/s6-rc-repo-sync.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/repo/s6-rc-set-change.o src/repo/s6-rc-set-change.lo: src/repo/s6-rc-set-change.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
@@ -70,6 +35,41 @@ src/repo/s6-rc-set-copy.o src/repo/s6-rc-set-copy.lo: src/repo/s6-rc-set-copy.c
 src/repo/s6-rc-set-delete.o src/repo/s6-rc-set-delete.lo: src/repo/s6-rc-set-delete.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/repo/s6-rc-set-install.o src/repo/s6-rc-set-install.lo: src/repo/s6-rc-set-install.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/repo/s6-rc-set-new.o src/repo/s6-rc-set-new.lo: src/repo/s6-rc-set-new.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
+src/repo/s6rc_repo_badsub.o src/repo/s6rc_repo_badsub.lo: src/repo/s6rc_repo_badsub.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_checkset.o src/repo/s6rc_repo_checkset.lo: src/repo/s6rc_repo_checkset.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_cleanup.o src/repo/s6rc_repo_cleanup.lo: src/repo/s6rc_repo_cleanup.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_compile.o src/repo/s6rc_repo_compile.lo: src/repo/s6rc_repo_compile.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
+src/repo/s6rc_repo_fillset.o src/repo/s6rc_repo_fillset.lo: src/repo/s6rc_repo_fillset.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_fix.o src/repo/s6rc_repo_fix.lo: src/repo/s6rc_repo_fix.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_fixset.o src/repo/s6rc_repo_fixset.lo: src/repo/s6rc_repo_fixset.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_flattenservices.o src/repo/s6rc_repo_flattenservices.lo: src/repo/s6rc_repo_flattenservices.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
+src/repo/s6rc_repo_getserviceflags.o src/repo/s6rc_repo_getserviceflags.lo: src/repo/s6rc_repo_getserviceflags.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
+src/repo/s6rc_repo_list_sets.o src/repo/s6rc_repo_list_sets.lo: src/repo/s6rc_repo_list_sets.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_listalldeps.o src/repo/s6rc_repo_listalldeps.lo: src/repo/s6rc_repo_listalldeps.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_listcontents.o src/repo/s6rc_repo_listcontents.lo: src/repo/s6rc_repo_listcontents.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
+src/repo/s6rc_repo_listdeps.o src/repo/s6rc_repo_listdeps.lo: src/repo/s6rc_repo_listdeps.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_listdeps_internal.o src/repo/s6rc_repo_listdeps_internal.lo: src/repo/s6rc_repo_listdeps_internal.c src/include/s6-rc/config.h src/include/s6-rc/repo.h
+src/repo/s6rc_repo_listsub.o src/repo/s6rc_repo_listsub.lo: src/repo/s6rc_repo_listsub.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_lock.o src/repo/s6rc_repo_lock.lo: src/repo/s6rc_repo_lock.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_ls.o src/repo/s6rc_repo_ls.lo: src/repo/s6rc_repo_ls.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_makedefbundle.o src/repo/s6rc_repo_makedefbundle.lo: src/repo/s6rc_repo_makedefbundle.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_makesetbundles.o src/repo/s6rc_repo_makesetbundles.lo: src/repo/s6rc_repo_makesetbundles.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_makestores.o src/repo/s6rc_repo_makestores.lo: src/repo/s6rc_repo_makestores.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_makesvlist.o src/repo/s6rc_repo_makesvlist.lo: src/repo/s6rc_repo_makesvlist.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_makesvlist_byname.o src/repo/s6rc_repo_makesvlist_byname.lo: src/repo/s6rc_repo_makesvlist_byname.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_moveservices.o src/repo/s6rc_repo_moveservices.lo: src/repo/s6rc_repo_moveservices.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_nlto0.o src/repo/s6rc_repo_nlto0.lo: src/repo/s6rc_repo_nlto0.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_setcompile.o src/repo/s6rc_repo_setcompile.lo: src/repo/s6rc_repo_setcompile.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_setuptodate.o src/repo/s6rc_repo_setuptodate.lo: src/repo/s6rc_repo_setuptodate.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_subnames.o src/repo/s6rc_repo_subnames.lo: src/repo/s6rc_repo_subnames.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_sv_bcmpr.o src/repo/s6rc_repo_sv_bcmpr.lo: src/repo/s6rc_repo_sv_bcmpr.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_sv_cmpr.o src/repo/s6rc_repo_sv_cmpr.lo: src/repo/s6rc_repo_sv_cmpr.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_sync.o src/repo/s6rc_repo_sync.lo: src/repo/s6rc_repo_sync.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_syncset.o src/repo/s6rc_repo_syncset.lo: src/repo/s6rc_repo_syncset.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_syncset_tmp.o src/repo/s6rc_repo_syncset_tmp.lo: src/repo/s6rc_repo_syncset_tmp.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_touch.o src/repo/s6rc_repo_touch.lo: src/repo/s6rc_repo_touch.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_touchset.o src/repo/s6rc_repo_touchset.lo: src/repo/s6rc_repo_touchset.c src/include/s6-rc/repo.h
+src/repo/s6rc_repo_type_check.o src/repo/s6rc_repo_type_check.lo: src/repo/s6rc_repo_type_check.c src/include/s6-rc/repo.h
 src/s6-rc/s6-rc-bundle.o src/s6-rc/s6-rc-bundle.lo: src/s6-rc/s6-rc-bundle.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-compile.o src/s6-rc/s6-rc-compile.lo: src/s6-rc/s6-rc-compile.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-db.o src/s6-rc/s6-rc-db.lo: src/s6-rc/s6-rc-db.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
@@ -82,31 +82,41 @@ src/s6-rc/s6-rc-update.o src/s6-rc/s6-rc-update.lo: src/s6-rc/s6-rc-update.c src
 src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
-libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_live_state_size.o src/libs6rc/s6rc_live_state_read.o src/libs6rc/s6rc_livedir_canon.o src/libs6rc/s6rc_livedir_create.o src/libs6rc/s6rc_livedir_prefix.o src/libs6rc/s6rc_livedir_prefixsize.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_ls.o src/libs6rc/s6rc_nlto0.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_repo_badsub.o src/libs6rc/s6rc_repo_checkset.o src/libs6rc/s6rc_repo_cleanup.o src/libs6rc/s6rc_repo_compile.o src/libs6rc/s6rc_repo_fillset.o src/libs6rc/s6rc_repo_fixset.o src/libs6rc/s6rc_repo_flattenservices.o src/libs6rc/s6rc_repo_getserviceflags.o src/libs6rc/s6rc_repo_list_sets.o src/libs6rc/s6rc_repo_listalldeps.o src/libs6rc/s6rc_repo_listcontents.o src/libs6rc/s6rc_repo_listdeps.o src/libs6rc/s6rc_repo_listdeps_internal.o src/libs6rc/s6rc_repo_listsub.o src/libs6rc/s6rc_repo_lock.o src/libs6rc/s6rc_repo_makedefbundle.o src/libs6rc/s6rc_repo_makesetbundles.o src/libs6rc/s6rc_repo_makestores.o src/libs6rc/s6rc_repo_makesvlist.o src/libs6rc/s6rc_repo_makesvlist_byname.o src/libs6rc/s6rc_repo_moveservices.o src/libs6rc/s6rc_repo_setcompile.o src/libs6rc/s6rc_repo_setuptodate.o src/libs6rc/s6rc_repo_subnames.o src/libs6rc/s6rc_repo_sv_bcmpr.o src/libs6rc/s6rc_repo_sv_cmpr.o src/libs6rc/s6rc_repo_sync.o src/libs6rc/s6rc_repo_syncset.o src/libs6rc/s6rc_repo_syncset_tmp.o src/libs6rc/s6rc_repo_touch.o src/libs6rc/s6rc_repo_touchset.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_unsupervise.o src/libs6rc/s6rc_type_check.o
+libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_live_state_size.o src/libs6rc/s6rc_live_state_read.o src/libs6rc/s6rc_livedir_canon.o src/libs6rc/s6rc_livedir_create.o src/libs6rc/s6rc_livedir_prefix.o src/libs6rc/s6rc_livedir_prefixsize.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_unsupervise.o
 else
-libs6rc.a.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_ls.lo src/libs6rc/s6rc_nlto0.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_badsub.lo src/libs6rc/s6rc_repo_checkset.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_compile.lo src/libs6rc/s6rc_repo_fillset.lo src/libs6rc/s6rc_repo_fixset.lo src/libs6rc/s6rc_repo_flattenservices.lo src/libs6rc/s6rc_repo_getserviceflags.lo src/libs6rc/s6rc_repo_list_sets.lo src/libs6rc/s6rc_repo_listalldeps.lo src/libs6rc/s6rc_repo_listcontents.lo src/libs6rc/s6rc_repo_listdeps.lo src/libs6rc/s6rc_repo_listdeps_internal.lo src/libs6rc/s6rc_repo_listsub.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_makedefbundle.lo src/libs6rc/s6rc_repo_makesetbundles.lo src/libs6rc/s6rc_repo_makestores.lo src/libs6rc/s6rc_repo_makesvlist.lo src/libs6rc/s6rc_repo_makesvlist_byname.lo src/libs6rc/s6rc_repo_moveservices.lo src/libs6rc/s6rc_repo_setcompile.lo src/libs6rc/s6rc_repo_setuptodate.lo src/libs6rc/s6rc_repo_subnames.lo src/libs6rc/s6rc_repo_sv_bcmpr.lo src/libs6rc/s6rc_repo_sv_cmpr.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_repo_syncset.lo src/libs6rc/s6rc_repo_syncset_tmp.lo src/libs6rc/s6rc_repo_touch.lo src/libs6rc/s6rc_repo_touchset.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
+libs6rc.a.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
 endif
 libs6rc.pc: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB}
 libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB}
-libs6rc.so.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_ls.lo src/libs6rc/s6rc_nlto0.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_badsub.lo src/libs6rc/s6rc_repo_checkset.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_compile.lo src/libs6rc/s6rc_repo_fillset.lo src/libs6rc/s6rc_repo_fixset.lo src/libs6rc/s6rc_repo_flattenservices.lo src/libs6rc/s6rc_repo_getserviceflags.lo src/libs6rc/s6rc_repo_list_sets.lo src/libs6rc/s6rc_repo_listalldeps.lo src/libs6rc/s6rc_repo_listcontents.lo src/libs6rc/s6rc_repo_listdeps.lo src/libs6rc/s6rc_repo_listdeps_internal.lo src/libs6rc/s6rc_repo_listsub.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_makedefbundle.lo src/libs6rc/s6rc_repo_makesetbundles.lo src/libs6rc/s6rc_repo_makestores.lo src/libs6rc/s6rc_repo_makesvlist.lo src/libs6rc/s6rc_repo_makesvlist_byname.lo src/libs6rc/s6rc_repo_moveservices.lo src/libs6rc/s6rc_repo_setcompile.lo src/libs6rc/s6rc_repo_setuptodate.lo src/libs6rc/s6rc_repo_subnames.lo src/libs6rc/s6rc_repo_sv_bcmpr.lo src/libs6rc/s6rc_repo_sv_cmpr.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_repo_syncset.lo src/libs6rc/s6rc_repo_syncset_tmp.lo src/libs6rc/s6rc_repo_touch.lo src/libs6rc/s6rc_repo_touchset.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
+libs6rc.so.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
 libs6rc.dylib.xyzzy: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB}
-libs6rc.dylib.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_ls.lo src/libs6rc/s6rc_nlto0.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_badsub.lo src/libs6rc/s6rc_repo_checkset.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_compile.lo src/libs6rc/s6rc_repo_fillset.lo src/libs6rc/s6rc_repo_fixset.lo src/libs6rc/s6rc_repo_flattenservices.lo src/libs6rc/s6rc_repo_getserviceflags.lo src/libs6rc/s6rc_repo_list_sets.lo src/libs6rc/s6rc_repo_listalldeps.lo src/libs6rc/s6rc_repo_listcontents.lo src/libs6rc/s6rc_repo_listdeps.lo src/libs6rc/s6rc_repo_listdeps_internal.lo src/libs6rc/s6rc_repo_listsub.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_makedefbundle.lo src/libs6rc/s6rc_repo_makesetbundles.lo src/libs6rc/s6rc_repo_makestores.lo src/libs6rc/s6rc_repo_makesvlist.lo src/libs6rc/s6rc_repo_makesvlist_byname.lo src/libs6rc/s6rc_repo_moveservices.lo src/libs6rc/s6rc_repo_setcompile.lo src/libs6rc/s6rc_repo_setuptodate.lo src/libs6rc/s6rc_repo_subnames.lo src/libs6rc/s6rc_repo_sv_bcmpr.lo src/libs6rc/s6rc_repo_sv_cmpr.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_repo_syncset.lo src/libs6rc/s6rc_repo_syncset_tmp.lo src/libs6rc/s6rc_repo_touch.lo src/libs6rc/s6rc_repo_touchset.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
-s6-rc-repo-init: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-repo-init: src/repo/s6-rc-repo-init.o ${LIBS6RC} -lskarnet
-s6-rc-repo-sync: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-repo-sync: src/repo/s6-rc-repo-sync.o ${LIBS6RC} -lskarnet
-s6-rc-set-change: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-set-change: src/repo/s6-rc-set-change.o ${LIBS6RC} -lskarnet
-s6-rc-set-commit: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-set-commit: src/repo/s6-rc-set-commit.o ${LIBS6RC} -lskarnet
-s6-rc-set-copy: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-set-copy: src/repo/s6-rc-set-copy.o ${LIBS6RC} -lskarnet
-s6-rc-set-delete: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-set-delete: src/repo/s6-rc-set-delete.o ${LIBS6RC} -lskarnet
-s6-rc-set-install: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-set-install: src/repo/s6-rc-set-install.o ${LIBS6RC} -lskarnet
-s6-rc-set-new: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-set-new: src/repo/s6-rc-set-new.o ${LIBS6RC} -lskarnet
+libs6rc.dylib.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
+ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
+libs6rcrepo.a.xyzzy: src/repo/s6rc_repo_badsub.o src/repo/s6rc_repo_checkset.o src/repo/s6rc_repo_cleanup.o src/repo/s6rc_repo_compile.o src/repo/s6rc_repo_fillset.o src/repo/s6rc_repo_fixset.o src/repo/s6rc_repo_flattenservices.o src/repo/s6rc_repo_getserviceflags.o src/repo/s6rc_repo_list_sets.o src/repo/s6rc_repo_listalldeps.o src/repo/s6rc_repo_listcontents.o src/repo/s6rc_repo_listdeps.o src/repo/s6rc_repo_listdeps_internal.o src/repo/s6rc_repo_listsub.o src/repo/s6rc_repo_lock.o src/repo/s6rc_repo_ls.o src/repo/s6rc_repo_makedefbundle.o src/repo/s6rc_repo_makesetbundles.o src/repo/s6rc_repo_makestores.o src/repo/s6rc_repo_makesvlist.o src/repo/s6rc_repo_makesvlist_byname.o src/repo/s6rc_repo_moveservices.o src/repo/s6rc_repo_nlto0.o src/repo/s6rc_repo_setcompile.o src/repo/s6rc_repo_setuptodate.o src/repo/s6rc_repo_subnames.o src/repo/s6rc_repo_sv_bcmpr.o src/repo/s6rc_repo_sv_cmpr.o src/repo/s6rc_repo_sync.o src/repo/s6rc_repo_syncset.o src/repo/s6rc_repo_syncset_tmp.o src/repo/s6rc_repo_touch.o src/repo/s6rc_repo_touchset.o src/repo/s6rc_repo_type_check.o
+else
+libs6rcrepo.a.xyzzy:src/repo/s6rc_repo_badsub.lo src/repo/s6rc_repo_checkset.lo src/repo/s6rc_repo_cleanup.lo src/repo/s6rc_repo_compile.lo src/repo/s6rc_repo_fillset.lo src/repo/s6rc_repo_fixset.lo src/repo/s6rc_repo_flattenservices.lo src/repo/s6rc_repo_getserviceflags.lo src/repo/s6rc_repo_list_sets.lo src/repo/s6rc_repo_listalldeps.lo src/repo/s6rc_repo_listcontents.lo src/repo/s6rc_repo_listdeps.lo src/repo/s6rc_repo_listdeps_internal.lo src/repo/s6rc_repo_listsub.lo src/repo/s6rc_repo_lock.lo src/repo/s6rc_repo_ls.lo src/repo/s6rc_repo_makedefbundle.lo src/repo/s6rc_repo_makesetbundles.lo src/repo/s6rc_repo_makestores.lo src/repo/s6rc_repo_makesvlist.lo src/repo/s6rc_repo_makesvlist_byname.lo src/repo/s6rc_repo_moveservices.lo src/repo/s6rc_repo_nlto0.lo src/repo/s6rc_repo_setcompile.lo src/repo/s6rc_repo_setuptodate.lo src/repo/s6rc_repo_subnames.lo src/repo/s6rc_repo_sv_bcmpr.lo src/repo/s6rc_repo_sv_cmpr.lo src/repo/s6rc_repo_sync.lo src/repo/s6rc_repo_syncset.lo src/repo/s6rc_repo_syncset_tmp.lo src/repo/s6rc_repo_touch.lo src/repo/s6rc_repo_touchset.lo src/repo/s6rc_repo_type_check.lo
+endif
+libs6rcrepo.pc: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
+libs6rcrepo.so.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
+libs6rcrepo.so.xyzzy:src/repo/s6rc_repo_badsub.lo src/repo/s6rc_repo_checkset.lo src/repo/s6rc_repo_cleanup.lo src/repo/s6rc_repo_compile.lo src/repo/s6rc_repo_fillset.lo src/repo/s6rc_repo_fixset.lo src/repo/s6rc_repo_flattenservices.lo src/repo/s6rc_repo_getserviceflags.lo src/repo/s6rc_repo_list_sets.lo src/repo/s6rc_repo_listalldeps.lo src/repo/s6rc_repo_listcontents.lo src/repo/s6rc_repo_listdeps.lo src/repo/s6rc_repo_listdeps_internal.lo src/repo/s6rc_repo_listsub.lo src/repo/s6rc_repo_lock.lo src/repo/s6rc_repo_ls.lo src/repo/s6rc_repo_makedefbundle.lo src/repo/s6rc_repo_makesetbundles.lo src/repo/s6rc_repo_makestores.lo src/repo/s6rc_repo_makesvlist.lo src/repo/s6rc_repo_makesvlist_byname.lo src/repo/s6rc_repo_moveservices.lo src/repo/s6rc_repo_nlto0.lo src/repo/s6rc_repo_setcompile.lo src/repo/s6rc_repo_setuptodate.lo src/repo/s6rc_repo_subnames.lo src/repo/s6rc_repo_sv_bcmpr.lo src/repo/s6rc_repo_sv_cmpr.lo src/repo/s6rc_repo_sync.lo src/repo/s6rc_repo_syncset.lo src/repo/s6rc_repo_syncset_tmp.lo src/repo/s6rc_repo_touch.lo src/repo/s6rc_repo_touchset.lo src/repo/s6rc_repo_type_check.lo
+libs6rcrepo.dylib.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
+libs6rcrepo.dylib.xyzzy:src/repo/s6rc_repo_badsub.lo src/repo/s6rc_repo_checkset.lo src/repo/s6rc_repo_cleanup.lo src/repo/s6rc_repo_compile.lo src/repo/s6rc_repo_fillset.lo src/repo/s6rc_repo_fixset.lo src/repo/s6rc_repo_flattenservices.lo src/repo/s6rc_repo_getserviceflags.lo src/repo/s6rc_repo_list_sets.lo src/repo/s6rc_repo_listalldeps.lo src/repo/s6rc_repo_listcontents.lo src/repo/s6rc_repo_listdeps.lo src/repo/s6rc_repo_listdeps_internal.lo src/repo/s6rc_repo_listsub.lo src/repo/s6rc_repo_lock.lo src/repo/s6rc_repo_ls.lo src/repo/s6rc_repo_makedefbundle.lo src/repo/s6rc_repo_makesetbundles.lo src/repo/s6rc_repo_makestores.lo src/repo/s6rc_repo_makesvlist.lo src/repo/s6rc_repo_makesvlist_byname.lo src/repo/s6rc_repo_moveservices.lo src/repo/s6rc_repo_nlto0.lo src/repo/s6rc_repo_setcompile.lo src/repo/s6rc_repo_setuptodate.lo src/repo/s6rc_repo_subnames.lo src/repo/s6rc_repo_sv_bcmpr.lo src/repo/s6rc_repo_sv_cmpr.lo src/repo/s6rc_repo_sync.lo src/repo/s6rc_repo_syncset.lo src/repo/s6rc_repo_syncset_tmp.lo src/repo/s6rc_repo_touch.lo src/repo/s6rc_repo_touchset.lo src/repo/s6rc_repo_type_check.lo
+s6-rc-repo-init: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-repo-init: src/repo/s6-rc-repo-init.o ${LIBS6RCREPO} -lskarnet
+s6-rc-repo-sync: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-repo-sync: src/repo/s6-rc-repo-sync.o ${LIBS6RCREPO} -lskarnet
+s6-rc-set-change: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-set-change: src/repo/s6-rc-set-change.o ${LIBS6RCREPO} -lskarnet
+s6-rc-set-commit: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-set-commit: src/repo/s6-rc-set-commit.o ${LIBS6RCREPO} -lskarnet
+s6-rc-set-copy: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-set-copy: src/repo/s6-rc-set-copy.o ${LIBS6RCREPO} -lskarnet
+s6-rc-set-delete: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-set-delete: src/repo/s6-rc-set-delete.o ${LIBS6RCREPO} -lskarnet
+s6-rc-set-install: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-set-install: src/repo/s6-rc-set-install.o ${LIBS6RCREPO} -lskarnet
+s6-rc-set-new: EXTRA_LIBS := ${SPAWN_LIB}
+s6-rc-set-new: src/repo/s6-rc-set-new.o ${LIBS6RCREPO} -lskarnet
 s6-rc: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
 s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -ls6 -lskarnet
 s6-rc-bundle: EXTRA_LIBS :=
diff --git a/package/targets.mak b/package/targets.mak
index 08f564b..d996293 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -20,4 +20,4 @@ LIBEXEC_TARGETS := \
 s6-rc-fdholder-filler \
 s6-rc-oneshot-run
 
-LIB_DEFS := S6RC=s6rc
+LIB_DEFS := S6RC=s6rc S6RCREPO=s6rcrepo
diff --git a/src/include/s6-rc/repo.h b/src/include/s6-rc/repo.h
index ca17b4b..17b7047 100644
--- a/src/include/s6-rc/repo.h
+++ b/src/include/s6-rc/repo.h
@@ -19,6 +19,10 @@ struct s6rc_repo_sv_s
 extern int s6rc_repo_sv_cmpr (void const *, void const *, void *) ;
 extern int s6rc_repo_sv_bcmpr (void const *a, void const *b, void *aux) ;
 
+extern int s6rc_repo_nlto0 (char *, size_t, size_t, genalloc *) ;
+extern int s6rc_repo_type_check (char const *) ;
+extern int s6rc_repo_ls (char const *, stralloc *, genalloc *) ;
+
 extern char const s6rc_repo_subnames[4][7] ;
 
 extern int s6rc_repo_makestores (char const *, char const *const *, uint16_t, char *) ;
diff --git a/src/include/s6-rc/s6rc-utils.h b/src/include/s6-rc/s6rc-utils.h
index 7da49ee..84f035b 100644
--- a/src/include/s6-rc/s6rc-utils.h
+++ b/src/include/s6-rc/s6rc-utils.h
@@ -7,8 +7,6 @@
 #include <stdint.h>
 
 #include <skalibs/stralloc.h>
-#include <skalibs/genalloc.h>
-#include <skalibs/avltree.h>
 
 #include <s6-rc/s6rc-db.h>
 
@@ -25,8 +23,4 @@ extern int s6rc_livedir_canon (char const **) ;
 extern int s6rc_live_state_size (char const *, uint32_t *, uint32_t *) ;
 extern int s6rc_live_state_read (char const *, unsigned char *, uint32_t) ;
 
-extern int s6rc_ls (char const *, stralloc *, genalloc *) ;
-extern int s6rc_type_check (int, char const *) ;
-extern int s6rc_nlto0 (char *, size_t, size_t, genalloc *) ;
-
 #endif
diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index ec22808..9f677f7 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -12,40 +12,7 @@ s6rc_livedir_create.o
 s6rc_livedir_prefix.o
 s6rc_livedir_prefixsize.o
 s6rc_lock.o
-s6rc_ls.o
-s6rc_nlto0.o
 s6rc_read_uint.o
-s6rc_repo_badsub.o
-s6rc_repo_checkset.o
-s6rc_repo_cleanup.o
-s6rc_repo_compile.o
-s6rc_repo_fillset.o
-s6rc_repo_fixset.o
-s6rc_repo_flattenservices.o
-s6rc_repo_getserviceflags.o
-s6rc_repo_list_sets.o
-s6rc_repo_listalldeps.o
-s6rc_repo_listcontents.o
-s6rc_repo_listdeps.o
-s6rc_repo_listdeps_internal.o
-s6rc_repo_listsub.o
-s6rc_repo_lock.o
-s6rc_repo_makedefbundle.o
-s6rc_repo_makesetbundles.o
-s6rc_repo_makestores.o
-s6rc_repo_makesvlist.o
-s6rc_repo_makesvlist_byname.o
-s6rc_repo_moveservices.o
-s6rc_repo_setcompile.o
-s6rc_repo_setuptodate.o
-s6rc_repo_subnames.o
-s6rc_repo_sv_bcmpr.o
-s6rc_repo_sv_cmpr.o
-s6rc_repo_sync.o
-s6rc_repo_syncset.o
-s6rc_repo_syncset_tmp.o
-s6rc_repo_touch.o
-s6rc_repo_touchset.o
 s6rc_sanitize_dir.o
 s6rc_servicedir_internal.o
 s6rc_servicedir_block.o
@@ -54,7 +21,6 @@ s6rc_servicedir_copy_offline.o
 s6rc_servicedir_copy_online.o
 s6rc_servicedir_manage.o
 s6rc_servicedir_unsupervise.o
-s6rc_type_check.o
 -ls6
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-repo-init b/src/repo/deps-exe/s6-rc-repo-init
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-repo-init
+++ b/src/repo/deps-exe/s6-rc-repo-init
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-repo-sync b/src/repo/deps-exe/s6-rc-repo-sync
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-repo-sync
+++ b/src/repo/deps-exe/s6-rc-repo-sync
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-change b/src/repo/deps-exe/s6-rc-set-change
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-change
+++ b/src/repo/deps-exe/s6-rc-set-change
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-commit b/src/repo/deps-exe/s6-rc-set-commit
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-commit
+++ b/src/repo/deps-exe/s6-rc-set-commit
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-copy b/src/repo/deps-exe/s6-rc-set-copy
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-copy
+++ b/src/repo/deps-exe/s6-rc-set-copy
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-delete b/src/repo/deps-exe/s6-rc-set-delete
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-delete
+++ b/src/repo/deps-exe/s6-rc-set-delete
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-install b/src/repo/deps-exe/s6-rc-set-install
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-install
+++ b/src/repo/deps-exe/s6-rc-set-install
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-new b/src/repo/deps-exe/s6-rc-set-new
index 6dd7af7..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-new
+++ b/src/repo/deps-exe/s6-rc-set-new
@@ -1,3 +1,3 @@
-${LIBS6RC}
+${LIBS6RCREPO}
 -lskarnet
-${SYSCLOCK_LIB}
+${SPAWN_LIB}
diff --git a/src/repo/deps-lib/s6rcrepo b/src/repo/deps-lib/s6rcrepo
new file mode 100644
index 0000000..a3afeb5
--- /dev/null
+++ b/src/repo/deps-lib/s6rcrepo
@@ -0,0 +1,36 @@
+s6rc_repo_badsub.o
+s6rc_repo_checkset.o
+s6rc_repo_cleanup.o
+s6rc_repo_compile.o
+s6rc_repo_fillset.o
+s6rc_repo_fixset.o
+s6rc_repo_flattenservices.o
+s6rc_repo_getserviceflags.o
+s6rc_repo_list_sets.o
+s6rc_repo_listalldeps.o
+s6rc_repo_listcontents.o
+s6rc_repo_listdeps.o
+s6rc_repo_listdeps_internal.o
+s6rc_repo_listsub.o
+s6rc_repo_lock.o
+s6rc_repo_ls.o
+s6rc_repo_makedefbundle.o
+s6rc_repo_makesetbundles.o
+s6rc_repo_makestores.o
+s6rc_repo_makesvlist.o
+s6rc_repo_makesvlist_byname.o
+s6rc_repo_moveservices.o
+s6rc_repo_nlto0.o
+s6rc_repo_setcompile.o
+s6rc_repo_setuptodate.o
+s6rc_repo_subnames.o
+s6rc_repo_sv_bcmpr.o
+s6rc_repo_sv_cmpr.o
+s6rc_repo_sync.o
+s6rc_repo_syncset.o
+s6rc_repo_syncset_tmp.o
+s6rc_repo_touch.o
+s6rc_repo_touchset.o
+s6rc_repo_type_check.o
+-lskarnet
+${SPAWN_LIB}
diff --git a/src/libs6rc/s6rc_repo_badsub.c b/src/repo/s6rc_repo_badsub.c
index 69697eb..69697eb 100644
--- a/src/libs6rc/s6rc_repo_badsub.c
+++ b/src/repo/s6rc_repo_badsub.c
diff --git a/src/libs6rc/s6rc_repo_checkset.c b/src/repo/s6rc_repo_checkset.c
index adf8674..a5b994e 100644
--- a/src/libs6rc/s6rc_repo_checkset.c
+++ b/src/repo/s6rc_repo_checkset.c
@@ -6,7 +6,6 @@
 #include <skalibs/stat.h>
 #include <skalibs/strerr.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_checkset (char const *repo, char const *set)
diff --git a/src/libs6rc/s6rc_repo_cleanup.c b/src/repo/s6rc_repo_cleanup.c
index 05881cd..05881cd 100644
--- a/src/libs6rc/s6rc_repo_cleanup.c
+++ b/src/repo/s6rc_repo_cleanup.c
diff --git a/src/libs6rc/s6rc_repo_compile.c b/src/repo/s6rc_repo_compile.c
index ac4207d..ac4207d 100644
--- a/src/libs6rc/s6rc_repo_compile.c
+++ b/src/repo/s6rc_repo_compile.c
diff --git a/src/libs6rc/s6rc_repo_fillset.c b/src/repo/s6rc_repo_fillset.c
index 15832c3..15832c3 100644
--- a/src/libs6rc/s6rc_repo_fillset.c
+++ b/src/repo/s6rc_repo_fillset.c
diff --git a/src/libs6rc/s6rc_repo_fix.c b/src/repo/s6rc_repo_fix.c
index b379d30..b379d30 100644
--- a/src/libs6rc/s6rc_repo_fix.c
+++ b/src/repo/s6rc_repo_fix.c
diff --git a/src/libs6rc/s6rc_repo_fixset.c b/src/repo/s6rc_repo_fixset.c
index 8ad64bc..8ad64bc 100644
--- a/src/libs6rc/s6rc_repo_fixset.c
+++ b/src/repo/s6rc_repo_fixset.c
diff --git a/src/libs6rc/s6rc_repo_flattenservices.c b/src/repo/s6rc_repo_flattenservices.c
index 15363ac..5693129 100644
--- a/src/libs6rc/s6rc_repo_flattenservices.c
+++ b/src/repo/s6rc_repo_flattenservices.c
@@ -14,7 +14,6 @@
 #include <skalibs/djbunix.h>
 
 #include <s6-rc/config.h>
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_flattenservices (char const *repo, char const *const *services, uint32_t n, stralloc *storage, genalloc *indices)
@@ -61,7 +60,7 @@ int s6rc_repo_flattenservices (char const *repo, char const *const *services, ui
     if (WEXITSTATUS(wstat)) return WEXITSTATUS(wstat) ;
   }
 
-  if (!s6rc_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
+  if (!s6rc_repo_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
   return 0 ;
 
  err:
diff --git a/src/libs6rc/s6rc_repo_getserviceflags.c b/src/repo/s6rc_repo_getserviceflags.c
index 0ad68e7..0ad68e7 100644
--- a/src/libs6rc/s6rc_repo_getserviceflags.c
+++ b/src/repo/s6rc_repo_getserviceflags.c
diff --git a/src/libs6rc/s6rc_repo_list_sets.c b/src/repo/s6rc_repo_list_sets.c
index 99f2162..1698460 100644
--- a/src/libs6rc/s6rc_repo_list_sets.c
+++ b/src/repo/s6rc_repo_list_sets.c
@@ -2,7 +2,6 @@
 
 #include <string.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_list_sets (char const *repo, stralloc *sa, genalloc *ga)
@@ -11,5 +10,5 @@ int s6rc_repo_list_sets (char const *repo, stralloc *sa, genalloc *ga)
   char fn[repolen + 9] ;
   memcpy(fn, repo, repolen) ;
   memcpy(fn + repolen, "/sources", 9) ;
-  return s6rc_ls(fn, sa, ga) ;
+  return s6rc_repo_ls(fn, sa, ga) ;
 }
diff --git a/src/libs6rc/s6rc_repo_listalldeps.c b/src/repo/s6rc_repo_listalldeps.c
index 7e9aca6..7e9aca6 100644
--- a/src/libs6rc/s6rc_repo_listalldeps.c
+++ b/src/repo/s6rc_repo_listalldeps.c
diff --git a/src/libs6rc/s6rc_repo_listcontents.c b/src/repo/s6rc_repo_listcontents.c
index 0e493c6..e3ffc84 100644
--- a/src/libs6rc/s6rc_repo_listcontents.c
+++ b/src/repo/s6rc_repo_listcontents.c
@@ -14,7 +14,6 @@
 #include <skalibs/djbunix.h>
 
 #include <s6-rc/config.h>
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_listcontents (char const *repo, char const *bundle, stralloc *storage, genalloc *indices)
@@ -56,7 +55,7 @@ int s6rc_repo_listcontents (char const *repo, char const *bundle, stralloc *stor
     return (WEXITSTATUS(wstat) < 99) - 1 ;
   }
 
- if (!s6rc_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
+ if (!s6rc_repo_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
  return 1 ;
 
  err:
diff --git a/src/libs6rc/s6rc_repo_listdeps.c b/src/repo/s6rc_repo_listdeps.c
index 4dfb495..4dfb495 100644
--- a/src/libs6rc/s6rc_repo_listdeps.c
+++ b/src/repo/s6rc_repo_listdeps.c
diff --git a/src/libs6rc/s6rc_repo_listdeps_internal.c b/src/repo/s6rc_repo_listdeps_internal.c
index 30ecf26..6d66796 100644
--- a/src/libs6rc/s6rc_repo_listdeps_internal.c
+++ b/src/repo/s6rc_repo_listdeps_internal.c
@@ -14,7 +14,6 @@
 #include <skalibs/djbunix.h>
 
 #include <s6-rc/config.h>
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_listdeps_internal (char const *repo, char const *const *services, uint32_t n, stralloc *storage, genalloc *indices, uint32_t options)
@@ -62,7 +61,7 @@ int s6rc_repo_listdeps_internal (char const *repo, char const *const *services,
     if (WEXITSTATUS(wstat)) return wait_estatus(wstat) ;
   }
 
- if (!s6rc_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
+ if (!s6rc_repo_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
  return 0 ;
 
  err:
diff --git a/src/libs6rc/s6rc_repo_listsub.c b/src/repo/s6rc_repo_listsub.c
index eed5cb4..1ee23bf 100644
--- a/src/libs6rc/s6rc_repo_listsub.c
+++ b/src/repo/s6rc_repo_listsub.c
@@ -2,7 +2,6 @@
 
 #include <string.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_listsub (char const *repo, char const *set, char const *sub, stralloc *sa, genalloc *ga)
@@ -16,5 +15,5 @@ int s6rc_repo_listsub (char const *repo, char const *set, char const *sub, stral
   memcpy(fn + repolen + 9, set, setlen) ;
   memcpy(fn + repolen + 9 + setlen, sub, sublen + 1) ;
 
-  return s6rc_ls(fn, sa, ga) ;
+  return s6rc_repo_ls(fn, sa, ga) ;
 }
diff --git a/src/libs6rc/s6rc_repo_lock.c b/src/repo/s6rc_repo_lock.c
index 472ff15..472ff15 100644
--- a/src/libs6rc/s6rc_repo_lock.c
+++ b/src/repo/s6rc_repo_lock.c
diff --git a/src/libs6rc/s6rc_ls.c b/src/repo/s6rc_repo_ls.c
index 75f90f2..1294f48 100644
--- a/src/libs6rc/s6rc_ls.c
+++ b/src/repo/s6rc_repo_ls.c
@@ -7,9 +7,9 @@
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 
-#include <s6-rc/s6rc-utils.h>
+#include <s6-rc/repo.h>
 
-int s6rc_ls (char const *fn, stralloc *sa, genalloc *ga)
+int s6rc_repo_ls (char const *fn, stralloc *sa, genalloc *ga)
 {
   size_t sabase = sa->len ;
   size_t gabase = genalloc_len(size_t, ga) ;
diff --git a/src/libs6rc/s6rc_repo_makedefbundle.c b/src/repo/s6rc_repo_makedefbundle.c
index 5c67917..5c67917 100644
--- a/src/libs6rc/s6rc_repo_makedefbundle.c
+++ b/src/repo/s6rc_repo_makedefbundle.c
diff --git a/src/libs6rc/s6rc_repo_makesetbundles.c b/src/repo/s6rc_repo_makesetbundles.c
index 81267b9..81267b9 100644
--- a/src/libs6rc/s6rc_repo_makesetbundles.c
+++ b/src/repo/s6rc_repo_makesetbundles.c
diff --git a/src/libs6rc/s6rc_repo_makestores.c b/src/repo/s6rc_repo_makestores.c
index f61f94c..f61f94c 100644
--- a/src/libs6rc/s6rc_repo_makestores.c
+++ b/src/repo/s6rc_repo_makestores.c
diff --git a/src/libs6rc/s6rc_repo_makesvlist.c b/src/repo/s6rc_repo_makesvlist.c
index 99a174e..99a174e 100644
--- a/src/libs6rc/s6rc_repo_makesvlist.c
+++ b/src/repo/s6rc_repo_makesvlist.c
diff --git a/src/libs6rc/s6rc_repo_makesvlist_byname.c b/src/repo/s6rc_repo_makesvlist_byname.c
index c017be6..c017be6 100644
--- a/src/libs6rc/s6rc_repo_makesvlist_byname.c
+++ b/src/repo/s6rc_repo_makesvlist_byname.c
diff --git a/src/libs6rc/s6rc_repo_moveservices.c b/src/repo/s6rc_repo_moveservices.c
index 3cc3b92..3cc3b92 100644
--- a/src/libs6rc/s6rc_repo_moveservices.c
+++ b/src/repo/s6rc_repo_moveservices.c
diff --git a/src/libs6rc/s6rc_nlto0.c b/src/repo/s6rc_repo_nlto0.c
index 6436cdb..9076bd3 100644
--- a/src/libs6rc/s6rc_nlto0.c
+++ b/src/repo/s6rc_repo_nlto0.c
@@ -4,9 +4,9 @@
 
 #include <skalibs/genalloc.h>
 
-#include <s6-rc/s6rc-utils.h>
+#include <s6-rc/repo.h>
 
-int s6rc_nlto0 (char *s, size_t start, size_t len, genalloc *indices)
+int s6rc_repo_nlto0 (char *s, size_t start, size_t len, genalloc *indices)
 {
   size_t origlen = genalloc_len(size_t, indices) ;
   size_t pos = start ;
diff --git a/src/libs6rc/s6rc_repo_setcompile.c b/src/repo/s6rc_repo_setcompile.c
index 5da136a..5da136a 100644
--- a/src/libs6rc/s6rc_repo_setcompile.c
+++ b/src/repo/s6rc_repo_setcompile.c
diff --git a/src/libs6rc/s6rc_repo_setuptodate.c b/src/repo/s6rc_repo_setuptodate.c
index 9e9fe58..3dded26 100644
--- a/src/libs6rc/s6rc_repo_setuptodate.c
+++ b/src/repo/s6rc_repo_setuptodate.c
@@ -8,7 +8,6 @@
 #include <skalibs/stat.h>
 #include <skalibs/strerr.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_setuptodate (char const *repo, char const *set)
diff --git a/src/libs6rc/s6rc_repo_subnames.c b/src/repo/s6rc_repo_subnames.c
index 2653f01..2653f01 100644
--- a/src/libs6rc/s6rc_repo_subnames.c
+++ b/src/repo/s6rc_repo_subnames.c
diff --git a/src/libs6rc/s6rc_repo_sv_bcmpr.c b/src/repo/s6rc_repo_sv_bcmpr.c
index bcc4d80..bcc4d80 100644
--- a/src/libs6rc/s6rc_repo_sv_bcmpr.c
+++ b/src/repo/s6rc_repo_sv_bcmpr.c
diff --git a/src/libs6rc/s6rc_repo_sv_cmpr.c b/src/repo/s6rc_repo_sv_cmpr.c
index 80b07c9..80b07c9 100644
--- a/src/libs6rc/s6rc_repo_sv_cmpr.c
+++ b/src/repo/s6rc_repo_sv_cmpr.c
diff --git a/src/libs6rc/s6rc_repo_sync.c b/src/repo/s6rc_repo_sync.c
index 9458dcb..6a17876 100644
--- a/src/libs6rc/s6rc_repo_sync.c
+++ b/src/repo/s6rc_repo_sync.c
@@ -18,7 +18,6 @@
 #include <skalibs/skamisc.h>
 #include <skalibs/unix-transactional.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 static inline void cleanup (char const *ato, char const *bun)
@@ -104,7 +103,7 @@ int s6rc_repo_sync (char const *repo, unsigned int verbosity, char const *fdhuse
         memcpy(src + 16, store + repolen + 8, 4) ;
         src[20] = '/' ;
         memcpy(src + 21, d->d_name, len+1) ;
-        switch (s6rc_type_check(-1, src))
+        switch (s6rc_repo_type_check(src))
         {
           case 1 :
           case 2 : x = ato ; break ;
diff --git a/src/libs6rc/s6rc_repo_syncset.c b/src/repo/s6rc_repo_syncset.c
index 929d9c4..929d9c4 100644
--- a/src/libs6rc/s6rc_repo_syncset.c
+++ b/src/repo/s6rc_repo_syncset.c
diff --git a/src/libs6rc/s6rc_repo_syncset_tmp.c b/src/repo/s6rc_repo_syncset_tmp.c
index b555bc2..44e5b52 100644
--- a/src/libs6rc/s6rc_repo_syncset_tmp.c
+++ b/src/repo/s6rc_repo_syncset_tmp.c
@@ -11,7 +11,6 @@
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 
-#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 static int unlink_stales_in_sub (char const *repo, size_t repolen, char const *set, char const *sub, uint32_t where, stralloc *sa, genalloc *ga, unsigned int verbosity)
diff --git a/src/libs6rc/s6rc_repo_touch.c b/src/repo/s6rc_repo_touch.c
index 069ed78..069ed78 100644
--- a/src/libs6rc/s6rc_repo_touch.c
+++ b/src/repo/s6rc_repo_touch.c
diff --git a/src/libs6rc/s6rc_repo_touchset.c b/src/repo/s6rc_repo_touchset.c
index 684bfc4..684bfc4 100644
--- a/src/libs6rc/s6rc_repo_touchset.c
+++ b/src/repo/s6rc_repo_touchset.c
diff --git a/src/libs6rc/s6rc_type_check.c b/src/repo/s6rc_repo_type_check.c
index 9ce84b9..8793819 100644
--- a/src/libs6rc/s6rc_type_check.c
+++ b/src/repo/s6rc_repo_type_check.c
@@ -6,21 +6,17 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-transactional.h>
 
-#include <s6-rc/s6rc-utils.h>
+#include <s6-rc/repo.h>
 
-int s6rc_type_check (int dfd, char const *src)
+int s6rc_repo_type_check (char const *src)
 {
-  char type[8] ;
   ssize_t r ;
-  if (dfd >= 0) r = openreadnclose_at(dfd, "type", type, 8) ;
-  else
-  {
-    size_t srclen = strlen(src) ;
-    char fn[srclen + 6] ;
-    memcpy(fn, src, srclen) ;
-    memcpy(fn + srclen, "/type", 6) ;
-    r = openreadnclose(fn, type, 8) ;
-  }
+  char type[8] ;
+  size_t srclen = strlen(src) ;
+  char fn[srclen + 6] ;
+  memcpy(fn, src, srclen) ;
+  memcpy(fn + srclen, "/type", 6) ;
+  r = openreadnclose(fn, type, 8) ;
   if (r == -1) return -1 ;
   if (r < 6) return 0 ;
   if (type[r-1] == '\n') r-- ;
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index 4e390ac..5c29f84 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -145,6 +145,21 @@ static char const *typestr (servicetype_t type)
          "unknown" ;
 }
 
+static inline int type_check (int dfd)
+{
+  char type[8] ;
+  ssize_t r = openreadnclose_at(dfd, "type", type, 8) ;
+  if (r == -1) return -1 ;
+  if (r < 6) return 0 ;
+  if (type[r-1] == '\n') r-- ;
+  if (r == 8) return 0 ;
+  type[r++] = 0 ;
+  return
+    !strcmp(type, "longrun") ? 1 :
+    !strcmp(type, "oneshot") ? 2 :
+    !strcmp(type, "bundle")  ? 3 : 0 ;
+}
+
 static int add_name_nocheck (before_t *be, char const *srcdir, char const *name, servicetype_t type, unsigned int *pos, unsigned int *kpos)
 {
   uint32_t id ;
@@ -529,7 +544,7 @@ static inline void add_bundle (before_t *be, int dfd, char const *srcdir, char c
 static inline void add_source (before_t *be, int dfd, char const *srcdir, char const *name)
 {
   if (verbosity >= 2) strerr_warni4x("parsing ", srcdir, "/", name) ;
-  switch (s6rc_type_check(dfd, 0))
+  switch (type_check(dfd))
   {
     case 0 : strerr_dief6x(1, "invalid ", srcdir, "/", name, "/type", ": must be oneshot, longrun, or bundle") ;
     case 1 : add_longrun(be, dfd, srcdir, name) ; break ;