diff --git a/configure b/configure
index f56d6769c..dbffb7041 100755
--- a/configure
+++ b/configure
@@ -3678,7 +3678,7 @@ LOGSRVD=
 LOGSRVD_SRC=logsrvd
 LOGSRV_SRC=lib/logsrv
 LOGSRVD_CONF='sudo_logsrvd.conf'
-LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la'
+LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'
 PPFILES='$(srcdir)/etc/sudo.pp'
 
 RTLD_PRELOAD_VAR="LD_PRELOAD"
diff --git a/configure.ac b/configure.ac
index 25e290268..541f62066 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,7 @@ LOGSRVD=
 LOGSRVD_SRC=logsrvd
 LOGSRV_SRC=lib/logsrv
 LOGSRVD_CONF='sudo_logsrvd.conf'
-LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la'
+LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'
 PPFILES='$(srcdir)/etc/sudo.pp'
 
 dnl
diff --git a/lib/iolog/Makefile.in b/lib/iolog/Makefile.in
index 8a45db76f..780a9c220 100644
--- a/lib/iolog/Makefile.in
+++ b/lib/iolog/Makefile.in
@@ -38,8 +38,7 @@ SHA1SUM = @SHA1SUM@
 SED = @SED@
 
 # Libraries
-LT_LIBS = $(top_builddir)/lib/eventlog/libsudo_eventlog.la \
-	  $(top_builddir)/lib/util/libsudo_util.la
+LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la
 LIBS = @LIBS@ @ZLIB@ $(LT_LIBS)
 
 # C preprocessor flags
@@ -78,7 +77,8 @@ PVS_IGNORE = 'V707,V011,V002,V536'
 PVS_LOG_OPTS = -a 'GA:1,2' -e -t errorfile -d $(PVS_IGNORE)
 
 # Regression tests
-TEST_PROGS = check_iolog_filter check_iolog_json check_iolog_mkpath check_iolog_path check_iolog_timing host_port_test
+TEST_PROGS = check_iolog_filter check_iolog_json check_iolog_mkpath \
+	     check_iolog_path check_iolog_timing host_port_test
 TEST_LIBS = @LIBS@
 TEST_LDFLAGS = @LDFLAGS@
 TEST_VERBOSE =
@@ -88,7 +88,8 @@ LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la
 LIB_FUZZING_ENGINE = @FUZZ_ENGINE@
 FUZZ_PROGS = fuzz_iolog_json fuzz_iolog_legacy fuzz_iolog_timing
 FUZZ_SEED_CORPUS = ${FUZZ_PROGS:=_seed_corpus.zip}
-FUZZ_LIBS = $(LIB_FUZZING_ENGINE) @LIBS@
+FUZZ_LIBS = $(LIB_FUZZING_ENGINE) @LIBS@ \
+	    $(top_builddir)/lib/eventlog/libsudo_eventlog.la
 FUZZ_LDFLAGS = @LDFLAGS@
 FUZZ_MAX_LEN = 4096
 FUZZ_RUNS = 8192
diff --git a/lib/logsrv/Makefile.in b/lib/logsrv/Makefile.in
index 12701cc06..119ebf05a 100644
--- a/lib/logsrv/Makefile.in
+++ b/lib/logsrv/Makefile.in
@@ -35,7 +35,7 @@ CC = @CC@
 LIBTOOL = @LIBTOOL@
 
 # Libraries
-LT_LIBS = $(top_builddir)/lib/protobuf-c/libprotobuf-c.la
+LT_LIBS =
 
 # C preprocessor flags
 CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
diff --git a/logsrvd/Makefile.in b/logsrvd/Makefile.in
index 9fc1020fc..2dae672ca 100644
--- a/logsrvd/Makefile.in
+++ b/logsrvd/Makefile.in
@@ -45,7 +45,9 @@ INSTALL_BACKUP = @INSTALL_BACKUP@
 
 # Libraries
 LT_LIBS = $(top_builddir)/lib/iolog/libsudo_iolog.la \
-	  $(top_builddir)/lib/logsrv/liblogsrv.la
+	  $(top_builddir)/lib/eventlog/libsudo_eventlog.la \
+	  $(top_builddir)/lib/logsrv/liblogsrv.la \
+	  $(top_builddir)/lib/protobuf-c/libprotobuf-c.la
 LIBS = $(LT_LIBS) @LIBTLS@
 
 # C preprocessor defines
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 713f72c32..02abbca69 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -58,7 +58,7 @@ INSTALL_BACKUP = @INSTALL_BACKUP@
 # Libraries
 LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la
 LIBEVENTLOG = $(top_builddir)/lib/eventlog/libsudo_eventlog.la
-LIBIOLOG = $(top_builddir)/lib/iolog/libsudo_iolog.la
+LIBIOLOG = $(top_builddir)/lib/iolog/libsudo_iolog.la $(LIBEVENTLOG)
 LIBLOGSRV = @LIBLOGSRV@
 LIBUTIL = $(top_builddir)/lib/util/libsudo_util.la
 LIBS = $(LIBUTIL)