--- a/Makefile	Tue Jul 12 20:20:51 2022 +0200
+++ b/Makefile	Fri Jul 15 11:11:48 2022 +0200
@@ -20,7 +20,10 @@
 
 include config.mk
 
-LIBSCI_SRCS=            lib/log.c                       \
+LIBSCI_SRCS=            extern/libsqlite/sqlite3.c      \
+                        lib/apic.c                      \
+                        lib/db.c                        \
+                        lib/log.c                       \
                         lib/types.c                     \
                         lib/util.c
 LIBSCI_OBJS=            ${LIBSCI_SRCS:.c=.o}
@@ -40,9 +43,7 @@
                         sql/worker-find-id.h            \
                         sql/worker-list.h
 
-SCID_SRCS=              extern/libsqlite/sqlite3.c      \
-                        scid/db.c                       \
-                        scid/http.c                     \
+SCID_SRCS=              scid/http.c                     \
                         scid/main.c                     \
                         scid/page-api-jobs.c            \
                         scid/page-api-projects.c        \
@@ -51,7 +52,9 @@
 SCID_OBJS=              ${SCID_SRCS:.c=.o}
 SCID_DEPS=              ${SCID_SRCS:.c=.d}
 
-SCIWORKERD_SRCS=        sciworkerd/main.c sciworkerd/task.c
+SCIWORKERD_SRCS=        sciworkerd/main.c \
+                        sciworkerd/sciworkerd.c \
+                        sciworkerd/task.c
 SCIWORKERD_OBJS=        ${SCIWORKERD_SRCS:.c=.o}
 SCIWORKERD_DEPS=        ${SCIWORKERD_SRCS:.c=.d}
 
@@ -63,9 +66,6 @@
 TESTS_OBJS=             ${TESTS:.c=}
 TESTS_DEPS=             ${TESTS:.c=.d}
 
-LIBBSD_INCS=            `pkg-config --silence-errors --cflags libbsd-overlay`
-LIBBSD_LIBS=            `pkg-config --silence-errors --libs libbsd-overlay`
-
 LIBCURL_INCS=           `pkg-config --cflags libcurl`
 LIBCURL_LIBS=           `pkg-config --libs libcurl`
 
@@ -76,6 +76,7 @@
 KCGI_LIBS=              `pkg-config --libs kcgi`
 
 INCS=                   -Iextern/libsqlite \
+                        -Iextern/libutlist \
                         -Iextern/libgreatest \
                         -Ilib \
                         -I.
@@ -93,11 +94,11 @@
 
 # for unit tests.
 .c:
-	${CC} ${INCS} ${DEFS} ${LIBBSD_INCS} ${KCGI_INCS} ${JANSSON_INCS} \
-		${CFLAGS} -MMD $< -o $@ libsci.a ${LIBBSD_LIBS} ${JANSSON_LIBS}
+	${CC} ${INCS} ${DEFS} ${KCGI_INCS} ${JANSSON_INCS} \
+		${CFLAGS} -MMD $< -o $@ lib/libsci.a ${JANSSON_LIBS}
 
 .c.o:
-	${CC} ${INCS} ${DEFS} ${LIBBSD_INCS} ${KCGI_INCS} ${JANSSON_INCS} \
+	${CC} ${INCS} ${DEFS} ${KCGI_INCS} ${JANSSON_INCS} \
 		${CFLAGS} -MMD -c $< -o $@
 
 .in:
@@ -147,6 +148,8 @@
 	rm -f sciworkerd/sciworkerd ${SCIWORKERD_OBJS} ${SCIWORKERD_DEPS}
 	rm -f ${TESTS_OBJS} ${TESTS_DEPS}
 
+${TESTS_OBJS}: lib/libsci.a
+
 tests: lib/libsci.a ${TESTS_OBJS}
 	for t in ${TESTS_OBJS}; do $$t -v; done