--- texk/web2c/xetexdir/XeTeX_ext.c
+++ texk/web2c/xetexdir/XeTeX_ext.c	2009-09-04 08:40:24.000000000 +0000
@@ -39,15 +39,15 @@ authorization from the copyright holders
 #include <kpathsea/config.h>
 
 #ifdef XETEX_OTHER
-#ifdef POPPLER_VERSION
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
-#include "poppler-config.h"
-#else
-#define xpdfString "xpdf"
-#include "xpdf/config.h"
-#endif
-#include "png.h"
+#  ifdef POPPLER_VERSION
+#  define xpdfVersion POPPLER_VERSION
+#    define xpdfString "poppler"
+#    include <poppler-config.h>
+#  else
+#    define xpdfString "xpdf"
+#    include "xpdf/config.h"
+#  endif
+#  include "png.h"
 #endif
 
 #include "zlib.h"
--- texk/web2c/xetexdir/pdfimage.cpp
+++ texk/web2c/xetexdir/pdfimage.cpp	2009-09-04 08:44:54.000000000 +0000
@@ -33,19 +33,27 @@ authorization from the copyright holders
 #include "pdfimage.h"
 
 #ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
+#  include <dirent.h>
+#  include <poppler-config.h>
+#  include <goo/GooString.h>
+#  include <goo/gmem.h>
+#  include <goo/gfile.h>
+#  define GString GooString
 #else
-#include "goo/GString.h"
+#  include "goo/GString.h"
 #endif
-
-#include "PDFDoc.h"
-#include "Catalog.h"
-#include "Page.h"
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Link.h>
+#include <Catalog.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
 
 #include "XeTeX_ext.h"
 
--- texk/web2c/xetexdir/xetexextra.h
+++ texk/web2c/xetexdir/xetexextra.h	2011-09-13 14:45:00.256426839 +0000
@@ -56,7 +56,11 @@ Foundation, Inc., 675 Mass Ave, Cambridg
 #include <xetexdir/etex_version.h> /* for ETEX_VERSION */
 #include <xetexdir/xetex_version.h> /* for XETEX_VERSION */
 
-#define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
+#ifdef POPPLER_VERSION
+#  define BANNER "This is XeTeX using libpoppler, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
+#else
+#  define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
+#endif
 #define COPYRIGHT_HOLDER "SIL International and Jonathan Kew"
 #define AUTHOR "Jonathan Kew"
 #define PROGRAM_HELP XETEXHELP
--- texk/web2c/luatexdir/image/epdf.h
+++ texk/web2c/luatexdir/image/epdf.h	2011-09-13 14:49:39.051927771 +0000
@@ -36,20 +36,20 @@
 #  include <goo/GooString.h>
 #  include <goo/gmem.h>
 #  include <goo/gfile.h>
-#  include "Object.h"
-#  include "Stream.h"
-#  include "Gfx.h"
-#  include "Annot.h"
-#  include "Array.h"
-#  include "Dict.h"
-#  include "XRef.h"
-#  include "Catalog.h"
-#  include "Link.h"
-#  include "Page.h"
-#  include "GfxFont.h"
-#  include "PDFDoc.h"
-#  include "GlobalParams.h"
-#  include "Error.h"
+#  include <Object.h>
+#  include <Stream.h>
+#  include <Gfx.h>
+#  include <Annot.h>
+#  include <Array.h>
+#  include <Dict.h>
+#  include <XRef.h>
+#  include <Catalog.h>
+#  include <Link.h>
+#  include <Page.h>
+#  include <GfxFont.h>
+#  include <PDFDoc.h>
+#  include <GlobalParams.h>
+#  include <Error.h>
 
 extern "C" {
 
--- texk/web2c/pdftexdir/pdftexextra.h
+++ texk/web2c/pdftexdir/pdftexextra.h	2011-09-13 14:46:22.147926062 +0000
@@ -25,7 +25,11 @@ with this program.  If not, see <http://
 #include <pdftexdir/pdftex_version.h> /* for PDFTEX_VERSION */
 #include <pdftexdir/etex_version.h> /* for ETEX_VERSION */
 
-#define BANNER "This is pdfTeX, Version 3.1415926-" ETEX_VERSION "-" PDFTEX_VERSION
+#ifdef POPPLER_VERSION
+#  define BANNER "This is pdfTeX using libpoppler, Version 3.1415926-" ETEX_VERSION "-" PDFTEX_VERSION
+#else
+#  define BANNER "This is pdfTeX, Version 3.1415926-" ETEX_VERSION "-" PDFTEX_VERSION
+#endif
 #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
 #define AUTHOR NULL
 #define PROGRAM_HELP PDFTEXHELP
--- texk/web2c/pdftexdir/pdftoepdf.cc
+++ texk/web2c/pdftexdir/pdftoepdf.cc	2010-11-12 12:15:38.000000000 +0000
@@ -21,44 +21,41 @@ with this program.  If not, see <http://
    conflicting with the definition for Pascal's boolean as 'int'
    in <kpathsea/types.h>.
 */
-#define boolean MINGW32_boolean
-
 #include <stdlib.h>
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-
+extern "C" {
+#include <config.h>
+}
 #ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
+#  include <dirent.h>
+#  include <poppler-config.h>
+#  include <goo/GooString.h>
+#  include <goo/gmem.h>
+#  include <goo/gfile.h>
+#  define GString GooString
 #else
-#include <aconf.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
-#include <assert.h>
+#  include <aconf.h>
+#  include <GString.h>
+#  include <gmem.h>
+#  include <gfile.h>
 #endif
-
-#include "Object.h"
-#include "Stream.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
-#include "Catalog.h"
-#include "Link.h"
-#include "Page.h"
-#include "GfxFont.h"
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
-
-#undef boolean
+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Catalog.h>
+#include <Link.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
 
 // This file is mostly C and not very much C++; it's just used to interface
 // the functions of xpdf, which happens to be written in C++.
--- texk/web2c/pdftexdir/pdftosrc.cc
+++ texk/web2c/pdftexdir/pdftosrc.cc	2009-09-04 08:56:10.000000000 +0000
@@ -22,33 +22,35 @@ with this program.  If not, see <http://
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-
+extern "C" {
+#include <config.h>
+}
 #ifdef POPPLER_VERSION
-#define GString GooString
-#define xpdfVersion POPPLER_VERSION
-#include <dirent.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
+#  define GString GooString
+#  define xpdfVersion POPPLER_VERSION
+#  include <dirent.h>
+#  include <goo/GooString.h>
+#  include <goo/gmem.h>
+#  include <goo/gfile.h>
 #else
-#include <aconf.h>
-#include <assert.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
+#  include <aconf.h>
+#  include <GString.h>
+#  include <gmem.h>
+#  include <gfile.h>
 #endif
-
-#include "Object.h"
-#include "Stream.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
-#include "Catalog.h"
-#include "Page.h"
-#include "GfxFont.h"
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Link.h>
+#include <Catalog.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
 
 static XRef *xref = 0;
 
--- texk/web2c/pdftexdir/utils.c
+++ texk/web2c/pdftexdir/utils.c	2009-09-04 08:38:04.000000000 +0000
@@ -42,12 +42,12 @@ with this program.  If not, see <http://
 #include "ptexlib.h"
 #include "png.h"
 #ifdef POPPLER_VERSION
-#include "poppler-config.h"
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
+#  include <poppler-config.h>
+#  define xpdfVersion POPPLER_VERSION
+#  define xpdfString "poppler"
 #else
-#include "xpdf/config.h"        /* just to get the xpdf version */
-#define xpdfString "xpdf"
+#  include "xpdf/config.h"        /* just to get the xpdf version */
+#  define xpdfString "xpdf"
 #endif
 
 #define check_nprintf(size_get, size_want) \
--- texk/web2c/pdftexdir/writefont.c
+++ texk/web2c/pdftexdir/writefont.c	2009-09-04 08:39:19.000000000 +0000
@@ -17,6 +17,9 @@ You should have received a copy of the G
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef POPPLER_VERSION
+#  include <goo/gmem.h>
+#endif
 #include "ptexlib.h"
 
 /**********************************************************************/