diff --git a/src/Makefile.am b/src/Makefile.am
index f5bf93fb..1b187b07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,7 @@ eekboard_system_client_CFLAGS = \
 
 eekboard_system_client_LDADD = \
 	$(top_builddir)/eekboard/libeekboard.la \
+	$(top_builddir)/eek/libeek.la \
 	$(top_builddir)/eek/libeek-xkl.la \
 	$(GIO2_LIBS) \
 	$(GTK_LIBS) \
@@ -64,6 +65,7 @@ eekboard_server_CFLAGS = \
 
 eekboard_server_LDADD = \
 	$(top_builddir)/eekboard/libeekboard.la \
+	$(top_builddir)/eek/libeek.la \
 	$(top_builddir)/eek/libeek-gtk.la \
 	$(GIO2_LIBS) \
 	$(GTK_LIBS)
@@ -82,6 +84,7 @@ eekboard_client_CFLAGS = \
 
 eekboard_client_LDADD = \
 	$(top_builddir)/eekboard/libeekboard.la \
+	$(top_builddir)/eek/libeek.la \
 	$(GIO2_LIBS)
 
 eekboard_client_SOURCES = client-main.c
@@ -98,7 +101,7 @@ eekboard_xml_LDADD = \
 	$(top_builddir)/eek/libeek-gtk.la \
 	$(GIO2_LIBS) \
 	$(GTK_LIBS) \
-	$(LIBXKLAVIER_CFLAGS)
+	$(LIBXKLAVIER_LIBS)
 
 eekboard_xml_headers = xklutil.h
 eekboard_xml_SOURCES = xklutil.c xml-main.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a25cafd5..bf06b5ef 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,10 +22,10 @@ TESTS = eek-simple-test eek-xkb-test eek-xml-test
 noinst_PROGRAMS = $(TESTS)
 
 eek_simple_test_SOURCES = eek-simple-test.c
-eek_simple_test_LDADD = $(top_builddir)/eek/libeek.la
+eek_simple_test_LDADD = $(top_builddir)/eek/libeek.la $(GIO2_LIBS)
 
 eek_xkb_test_SOURCES = eek-xkb-test.c
-eek_xkb_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkb.la
+eek_xkb_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkb.la  $(GIO2_LIBS) $(GTK_LIBS)
 
 eek_xml_test_SOURCES = eek-xml-test.c
-eek_xml_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkl.la
+eek_xml_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkl.la $(GIO2_LIBS) $(GTK_LIBS)