diff --git a/lib/Makefile b/lib/Makefile
index 38c643a5..eb8d3ae7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -14,12 +14,12 @@ SHAREDLIB_LDFLAGS += -shared -Wl,-soname,libxbps.so.$(LIBMAJOR)
 LIBFETCH_OBJS = fetch/common.o fetch/fetch.o fetch/file.o fetch/ftp.o fetch/http.o
 
 # libxbps
-OBJS +=	configure.o cmpver.o depends.o download.o fexec.o findpkg.o
-OBJS +=	humanize_number.o orphans.o plist.o purge.o register.o remove.o
-OBJS +=	repository.o requiredby.o sha256.o sortdeps.o state.o
-OBJS +=	sync_remote_pkgidx.o unpack.o util.o pkgmatch.o mkpath.o
-OBJS +=	regpkgs_dictionary.o repository_plist.o repository_pool.o
-OBJS += remove_obsoletes.o config_files.o
+OBJS += configure.o config_files.o cmpver.o download.o fexec.o
+OBJS += humanize_number.o orphans.o plist.o purge.o register.o
+OBJS += regpkgs_dictionary.o remove.o remove_obsoletes.o repository.o
+OBJS += repository_finddeps.o repository_findpkg.o repository_plist.o
+OBJS += repository_pool.o requiredby.o sha256.o sortdeps.o state.o
+OBJS += sync_remote_pkgidx.o unpack.o util.o pkgmatch.o mkpath.o
 
 .PHONY: all
 all: libfetch libxbps.so libxbps.a
diff --git a/lib/depends.c b/lib/repository_finddeps.c
similarity index 100%
rename from lib/depends.c
rename to lib/repository_finddeps.c
diff --git a/lib/findpkg.c b/lib/repository_findpkg.c
similarity index 100%
rename from lib/findpkg.c
rename to lib/repository_findpkg.c