diff --git a/src/Makefile.am b/src/Makefile.am
index 7d452a9490ef03068107eb06dc5d1c513bb9c2fd..0b562dc25088cce577916d8a6037bf535f262bd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -851,7 +851,7 @@ libvirt_iohelper_LDFLAGS = \
 		$(PIE_LDFLAGS) \
 		$(NULL)
 libvirt_iohelper_LDADD = \
-		libvirt_util.la \
+		libvirt.la \
 		../gnulib/lib/libgnu.la
 if WITH_DTRACE_PROBES
 libvirt_iohelper_LDADD += libvirt_probes.lo
diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index 98586d15847e1c801c21bfdc16e43e3b44fe561e..3d68f6ce0a716266a3400cbd93c01a9aaff2c321 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -176,6 +176,7 @@ virNetServerClientSetAuthLocked;
 virNetServerClientSetAuthPendingLocked;
 virNetServerClientSetCloseHook;
 virNetServerClientSetDispatcher;
+virNetServerClientSetQuietEOF;
 virNetServerClientSetReadonly;
 virNetServerClientStartKeepAlive;
 virNetServerClientWantCloseLocked;
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index da26fab91f116b071c7ccb50a0b11745cff819ec..46ab11c2a9bb15121b6567fb27ce81506ed88e26 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -145,10 +145,8 @@ virtlockd_LDFLAGS = \
 	$(NO_UNDEFINED_LDFLAGS) \
 	$(NULL)
 virtlockd_LDADD = \
+	libvirt.la \
 	libvirt_driver_admin.la \
-	libvirt-net-rpc-server.la \
-	libvirt-net-rpc.la \
-	libvirt_util.la \
 	../gnulib/lib/libgnu.la \
 	$(CYGWIN_EXTRA_LIBADD) \
 	$(NULL)
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index f5eba2a4f787bfd4197ba569bc5d4bc3aa4fa4ee..d57394cbdebd902984d946635e39c04fcf703a1a 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -80,9 +80,7 @@ virtlogd_LDFLAGS = \
 		$(NULL)
 virtlogd_LDADD = \
 		libvirt_driver_admin.la \
-		libvirt-net-rpc-server.la \
-		libvirt-net-rpc.la \
-		libvirt_util.la \
+		libvirt.la \
 		../gnulib/lib/libgnu.la \
 		$(CYGWIN_EXTRA_LIBADD) \
 		$(NULL)
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 3fed59c13b2bc8ab6b5062dd48f1021644d38207..52270049d565ec03a0bd3d452268bf2aea72662c 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -56,7 +56,7 @@ libvirt_leaseshelper_LDFLAGS = \
 	$(PIE_LDFLAGS) \
 	$(NULL)
 libvirt_leaseshelper_LDADD = \
-	libvirt_util.la \
+	libvirt.la \
 	../gnulib/lib/libgnu.la
 if WITH_DTRACE_PROBES
 libvirt_leaseshelper_LDADD += libvirt_probes.lo
diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am
index 7fb6d8cc4f762159697fbd0f72cb9b41c21a6768..64e0f468573082c52c1358d458ee9c31035b3262 100644
--- a/src/security/Makefile.inc.am
+++ b/src/security/Makefile.inc.am
@@ -72,8 +72,6 @@ virt_aa_helper_LDFLAGS = \
 	$(NULL)
 virt_aa_helper_LDADD = \
 	libvirt.la \
-	libvirt_conf.la \
-	libvirt_util.la \
 	libvirt_driver_storage_impl.la \
 	../gnulib/lib/libgnu.la \
 	$(NULL)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index ea4681f70e087849416c8e97fe266280564429a3..538709256db42c13c2916b56341861477fcece78 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -378,7 +378,7 @@ libvirt_parthelper_LDFLAGS = \
 	$(NULL)
 libvirt_parthelper_LDADD = \
 	$(LIBPARTED_LIBS) \
-	libvirt_util.la \
+	libvirt.la \
 	../gnulib/lib/libgnu.la \
 	$(NULL)
 if WITH_DTRACE_PROBES