diff --git a/clients/Makefile.am b/clients/Makefile.am
index 0c5495cd..c820f84b 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -85,7 +85,6 @@ libtoytoolkit_la_SOURCES =			\
 	workspaces-client-protocol.h
 
 libtoytoolkit_la_LIBADD =			\
-	$(PIXMAN_LIBS)				\
 	$(CLIENT_LIBS)				\
 	$(CAIRO_EGL_LIBS)			\
 	../shared/libshared-cairo.la -lrt -lm
@@ -107,7 +106,7 @@ image_LDADD = libtoytoolkit.la
 
 cliptest_SOURCES = cliptest.c
 cliptest_CPPFLAGS = $(AM_CPPFLAGS) $(PIXMAN_CFLAGS)
-cliptest_LDADD = libtoytoolkit.la
+cliptest_LDADD = libtoytoolkit.la $(PIXMAN_LIBS)
 
 dnd_SOURCES = dnd.c
 dnd_LDADD = libtoytoolkit.la
diff --git a/clients/window.c b/clients/window.c
index 799926ce..9c21f064 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -40,8 +40,6 @@
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 
-#include <pixman.h>
-
 #ifdef HAVE_CAIRO_EGL
 #include <wayland-egl.h>