Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
===================================================================
--- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -24,8 +24,9 @@ Franklin Street, Fifth Floor, Boston, MA
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <aconf.h>
-#include <GString.h>
+#include <dirent.h>
+#include <poppler-config.h>
+#include <GooString.h>
 #include <gmem.h>
 #include <gfile.h>
 #include <config.h>
@@ -159,7 +160,7 @@ static PdfDocument *find_add_document(ch
     fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
             p->occurences);
 #endif
-    GString *docName = new GString(p->file_name);
+    GooString *docName = new GooString(p->file_name);
     p->doc = new PDFDoc(docName);       // takes ownership of docName
     if (!p->doc->isOk() || !p->doc->okToPrint()) {
         pdftex_fail("xpdf: reading PDF image failed");
@@ -520,7 +521,7 @@ static void copyObject(Object * obj)
     int i, l, c;
     Ref ref;
     char *p;
-    GString *s;
+    GooString *s;
     if (obj->isBool()) {
         pdf_printf("%s", obj->getBool()? "true" : "false");
     } else if (obj->isInt()) {
@@ -713,7 +714,7 @@ read_pdf_info(char *image_name, char *pa
     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
     if (page_name) {
         // get page by name
-        GString name(page_name);
+        GooString name(page_name);
         LinkDest *link = pdf_doc->doc->findDest(&name);
         if (link == 0 || !link->isOk())
             pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
===================================================================
--- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/utils.c
+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
@@ -35,7 +35,7 @@ Franklin Street, Fifth Floor, Boston, MA
 #include "zlib.h"
 #include "ptexlib.h"
 #include "png.h"
-#include "xpdf/config.h"        /* just to get the xpdf version */
+#include <poppler/poppler-config.h>        /* just to get the poppler version */
 
 static const char _svn_version[] =
     "$Id: pdftex-1.40.9-poppler.patch,v 1.1 2008/09/03 18:48:18 aballier Exp $ $URL: svn://192.168.0.1/svnroot/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $";
@@ -1267,7 +1267,7 @@ void initversionstring(char **versions)
     (void) asprintf(versions,
                     "Compiled with libpng %s; using libpng %s\n"
                     "Compiled with zlib %s; using zlib %s\n"
-                    "Compiled with xpdf version %s\n",
+                    "Compiled with poppler version %s\n",
                     PNG_LIBPNG_VER_STRING, png_libpng_ver,
                     ZLIB_VERSION, zlib_version, xpdfVersion);
 }