  if BUILD_LIBJPEG
  libjpeg_includes = $(LIBJPEG_CFLAGS)
  endif
+@@ -67,6 +73,7 @@ libpoppler_cpp_la_CXXFLAGS =			\
+ 
+ libpoppler_cpp_la_LIBADD = 			\
+ 	$(top_builddir)/poppler/libpoppler.la	\
++	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(LIBICONV)
+ 
+ libpoppler_cpp_la_LDFLAGS = -version-info 2:0:2 @create_shared_lib@ @auto_import_flags@
 diff --git a/cpp/Makefile.in b/cpp/Makefile.in
-index 77b8af3..dd19e9a 100644
+index 77b8af3..76c7005 100644
 --- a/cpp/Makefile.in
 +++ b/cpp/Makefile.in
 @@ -491,8 +491,12 @@ INCLUDES = \

 @BUILD_LIBJPEG_TRUE@libjpeg_includes = $(LIBJPEG_CFLAGS)
 @BUILD_LIBTIFF_TRUE@libtiff_includes = $(LIBTIFF_CFLAGS)
 @BUILD_LIBOPENJPEG_TRUE@libjpeg2000_includes = $(LIBOPENJPEG_CFLAGS)
diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
index 1c24b47..732c252 100644
--- a/cpp/poppler-document.cpp

 //------------------------------------------------------------------------
 
 // A '1' in this array means the character is white space.  A '1' or
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index c78d5ca..7c83593 100644
--- a/poppler/PDFDoc.cc
