diff --git a/clients/Makefile.am b/clients/Makefile.am
index 9f9ceca..a259b6a 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -12,17 +12,12 @@ noinst_PROGRAMS =				\
 
 noinst_LTLIBRARIES = libtoytoolkit.la
 
-INCLUDES =					\
-	-I$(top_srcdir)/wayland			\
-	-I$(top_builddir)/wayland			\
-	$(CLIENT_CFLAGS)
-
-LDADD = libtoytoolkit.la				\
-	$(top_builddir)/wayland/libwayland-client.la	\
-	$(CLIENT_LIBS) -lrt -lm
-
 AM_CFLAGS = $(GCC_CFLAGS)
-AM_CPPFLAGS = -DDATADIR='"$(datadir)"'
+AM_CPPFLAGS =					\
+	-DDATADIR='"$(datadir)"'		\
+	-I$(top_srcdir)/wayland			\
+	-I$(top_builddir)/wayland		\
+	$(CLIENT_CFLAGS)
 
 libtoytoolkit_la_SOURCES =			\
 	window.c				\
@@ -32,15 +27,38 @@ libtoytoolkit_la_SOURCES =			\
 	cairo-util.c				\
 	cairo-util.h
 
-flower_SOURCES = flower.c
-smoke_SOURCES = smoke.c
+toolkit_libs =						\
+	libtoytoolkit.la				\
+	$(top_builddir)/wayland/libwayland-client.la	\
+	$(CLIENT_LIBS) -lrt -lm
+
 gears_SOURCES = gears.c
+gears_LDADD = $(toolkit_libs)
+
+flower_SOURCES = flower.c
+flower_LDADD = $(toolkit_libs)
+
 screenshot_SOURCES = screenshot.c screenshooter-protocol.c
+screenshot_LDADD = $(toolkit_libs)
+
 terminal_SOURCES = terminal.c
+terminal_LDADD = $(toolkit_libs) -lutil
+
 image_SOURCES = image.c
+image_LDADD = $(toolkit_libs)
+
 dnd_SOURCES = dnd.c
+dnd_LDADD = $(toolkit_libs)
+
+smoke_SOURCES = smoke.c
+smoke_LDADD = $(toolkit_libs)
+
 resizor_SOURCES = resizor.c
+resizor_LDADD = $(toolkit_libs)
+
 simple_client_SOURCES = simple-client.c
+simple_client_LDADD = \
+	$(top_builddir)/wayland/libwayland-client.la -lm $(GLES2_LIBS)
 
 BUILT_SOURCES =					\
 	screenshooter-client-protocol.h		\
@@ -50,11 +68,9 @@ CLEANFILES = $(BUILT_SOURCES)
 
 include $(top_srcdir)/wayland/scanner.mk
 
-terminal_LDADD = $(LDADD) -lutil
-
 if HAVE_POPPLER
 poppler_programs = view
 view_SOURCES = view.c
-view_LDADD = $(LDADD) $(POPPLER_LIBS)
+view_LDADD = $(toolkit_libs) $(POPPLER_LIBS)
 view_CPPFLAGS = $(POPPLER_CFLAGS)
 endif
diff --git a/configure.ac b/configure.ac
index 8ff535f..bcc1e83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ PKG_CHECK_MODULES(FFI, [libffi])
 
 PKG_CHECK_MODULES(COMPOSITOR,
 		  [egl glesv2 gdk-pixbuf-2.0 libudev >= 136 libdrm >= 2.4.17] xcb-dri2 xcb-xfixes)
+PKG_CHECK_MODULES(GLES2, [egl glesv2 libdrm])
 PKG_CHECK_MODULES(CLIENT, [egl gl cairo gdk-pixbuf-2.0 glib-2.0 gobject-2.0 xkbcommon libdrm])
 PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0],
 			   [have_poppler=yes], [have_poppler=no])