diff --git a/clients/Makefile.am b/clients/Makefile.am
index 18af2c00e..621c7c35d 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -82,7 +82,6 @@ libtoytoolkit_la_SOURCES =			\
 	workspaces-client-protocol.h
 
 libtoytoolkit_la_LIBADD =			\
-	$(PIXMAN_LIBS)				\
 	$(CLIENT_LIBS)				\
 	$(CAIRO_EGL_LIBS)			\
 	../shared/libshared-cairo.la -lrt -lm
@@ -104,7 +103,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 b7abfc8a4..3d23b3ae0 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -39,8 +39,6 @@
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 
-#include <pixman.h>
-
 #ifdef HAVE_CAIRO_EGL
 #include <wayland-egl.h>