diff --git a/glib/Makefile.am b/glib/Makefile.am
index a38e052..acd86f3 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -72,7 +72,6 @@ libpoppler_glib_la_SOURCES =			\
 
 libpoppler_glib_la_LIBADD =				\
 	$(top_builddir)/poppler/libpoppler.la		\
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
 	$(POPPLER_GLIB_LIBS)				\
 	$(FREETYPE_LIBS)
 
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 9fe09d0..2737bb4 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -41,7 +41,13 @@ cairo_includes =				\
 	$(CAIRO_CFLAGS)
 
 cairo_libs =					\
-	$(CAIRO_LIBS)
+	$(CAIRO_LIBS)               \
+	libpoppler-cairo.la
+
+cairo_headers =                 \
+	CairoFontEngine.h			\
+	CairoOutputDev.h			\
+	CairoRescaleBox.h
 
 libpoppler_cairo_la_SOURCES =			\
 	CairoFontEngine.cc			\
@@ -166,6 +172,7 @@ libpoppler_la_LIBADD =				\
 	$(top_builddir)/fofi/libfofi.la		\
 	$(cms_libs)				\
 	$(splash_libs)				\
+	$(cairo_libs)				\
 	$(libtiff_libs)				\
 	$(libjpeg_libs)				\
 	$(libpng_libs)				\
@@ -185,6 +192,7 @@ poppler_includedir = $(includedir)/poppler
 poppler_include_HEADERS =	\
 	$(splash_headers)	\
 	$(curl_headers)		\
+	$(cairo_headers)    \
 	Annot.h			\
 	Array.h			\
 	BuiltinFont.h		\
diff --git a/test/Makefile.am b/test/Makefile.am
index b3289c7..4fc5762 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -59,7 +59,6 @@ pdf_inspector_SOURCES =			\
        pdf-inspector.cc
 
 pdf_inspector_LDADD =					\
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
 	$(top_builddir)/poppler/libpoppler.la		\
 	$(CAIRO_LIBS)					\
 	$(FREETYPE_LIBS)				\
diff --git a/utils/Makefile.am b/utils/Makefile.am
index d56cc9c..8c484dd 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -34,7 +34,6 @@ PDFTOCAIRO_LIBS += $(LCMS_LIBS)
 endif
 
 pdftocairo_LDADD =				\
-	$(top_builddir)/poppler/libpoppler-cairo.la \
 	$(LDADD) $(PDFTOCAIRO_LIBS)