diff --git a/client/Makefile.am b/client/Makefile.am
index 80a2a41b..7e0598c3 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -6,14 +6,21 @@ SUBDIRS = utils
 
 AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
-noinst_LTLIBRARIES = libclient.la
+noinst_LTLIBRARIES = libclient.la libproxy.la
 
 libclient_la_SOURCES =			\
 	types.cc	types.h		\
 	commands.cc	commands.h	\
 	errors.cc	errors.h
 
-libclient_la_LIBADD = utils/libutils.la ../dbus/libdbus.la
+libclient_la_LIBADD = 			\
+	utils/libutils.la		\
+	../dbus/libdbus.la
+
+libproxy_la_SOURCES =			\
+	proxy.cc	proxy.h		\
+	proxy-dbus.cc	proxy-dbus.h	\
+	proxy-lib.cc	proxy-lib.h
 
 bin_PROGRAMS = snapper
 
@@ -40,20 +47,18 @@ snapper_SOURCES =					\
 	cmd-cleanup.cc					\
 	cmd-debug.cc					\
 	cleanup.cc		cleanup.h		\
-	proxy.cc		proxy.h			\
-	proxy-dbus.cc		proxy-dbus.h		\
-	proxy-lib.cc		proxy-lib.h		\
 	locker.cc		locker.h		\
 	misc.cc			misc.h			\
 	MyFiles.cc		MyFiles.h		\
 	GlobalOptions.cc	GlobalOptions.h
 
 snapper_LDADD = 			\
+	libproxy.la			\
 	libclient.la			\
 	../snapper/libsnapper.la	\
 	utils/libutils.la		\
 	../dbus/libdbus.la		\
-	$(JSONC_LIBS)
+	$(JSON_C_LIBS)
 
 libexecdir = /usr/lib/snapper
 
@@ -62,13 +67,15 @@ libexec_PROGRAMS = systemd-helper
 systemd_helper_SOURCES =		\
 	systemd-helper.cc		\
 	cleanup.cc	cleanup.h	\
-	proxy.cc	proxy.h		\
-	proxy-dbus.cc	proxy-dbus.h	\
-	proxy-lib.cc	proxy-lib.h	\
 	locker.cc	locker.h	\
 	misc.cc		misc.h
 
-systemd_helper_LDADD = libclient.la ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la
+systemd_helper_LDADD = 			\
+	libproxy.la 			\
+	libclient.la 			\
+	../snapper/libsnapper.la	\
+	utils/libutils.la		\
+	../dbus/libdbus.la
 
 if ENABLE_BTRFS
 
diff --git a/configure.ac b/configure.ac
index 899d4744..a3147195 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,7 @@ fi
 
 PKG_CHECK_MODULES(DBUS, dbus-1)
 PKG_CHECK_MODULES(XML2, libxml-2.0)
-PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
+PKG_CHECK_MODULES(JSON_C, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
 PKG_CHECK_MODULES(ZLIB, zlib)
 
 # Conditional support for libbtrfsutil based on existence of pkg-config file
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4ae904b7..a6289e1e 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -39,7 +39,7 @@ table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutil
 
 csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 
-json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
+json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSON_C_LIBS)
 
 getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 
diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
index 2fd99b8c..de58ebef 100644
--- a/zypp-plugin/Makefile.am
+++ b/zypp-plugin/Makefile.am
@@ -9,7 +9,7 @@ if HAVE_ZYPP
 plugindir = /usr/lib/zypp/plugins/commit
 plugin_PROGRAMS = snapper-zypp-plugin
 
-AM_CPPFLAGS = $(DBUS_CFLAGS) $(XML2_CFLAGS) $(JSONC_CFLAGS)
+AM_CPPFLAGS = $(DBUS_CFLAGS) $(XML2_CFLAGS) $(JSON_C_CFLAGS)
 
 snapper_zypp_plugin_SOURCES = \
 	snapper-zypp-plugin.cc snapper-zypp-plugin.h \
@@ -22,7 +22,7 @@ snapper_zypp_plugin_LDADD = \
 	../snapper/libsnapper.la \
 	../dbus/libdbus.la \
 	../stomp/libstomp.la \
-	$(JSONC_LIBS)
+	$(JSON_C_LIBS)
 
 check_PROGRAMS = solvable-matcher.test forwarding-zypp-plugin