Index: poppler/SecurityHandler.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/SecurityHandler.h,v
retrieving revision 1.2
diff -u -r1.2 SecurityHandler.h
--- poppler/SecurityHandler.h	25 Apr 2007 19:59:10 -0000	1.2
+++ poppler/SecurityHandler.h	13 Jun 2007 12:45:14 -0000
@@ -9,7 +9,7 @@
 #ifndef SECURITYHANDLER_H
 #define SECURITYHANDLER_H
 
-#include <config.h>
+#include "poppler-config.h"
 
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
Index: poppler/poppler-config.h.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler/poppler-config.h.in,v
retrieving revision 1.5
diff -u -r1.5 poppler-config.h.in
--- poppler/poppler-config.h.in	23 Jan 2006 18:52:48 -0000	1.5
+++ poppler/poppler-config.h.in	13 Jun 2007 12:45:15 -0000
@@ -15,10 +15,20 @@
 // redefining those symbols.
 
 /* Enable multithreading support. */
-#ifndef MULTITHREADING
+#ifndef MULTITHREADED
 #undef MULTITHREADED
 #endif
 
+/* Enable exceptions. */
+#ifndef USE_EXCEPTIONS
+#undef USE_EXCEPTIONS
+#endif
+
+/* Use fixedpoint. */
+#ifndef USE_FIXEDPOINT
+#undef USE_FIXEDPOINT
+#endif
+
 /* Full path for the system-wide xpdfrc file. */
 #ifndef SYSTEM_XPDFRC
 #undef SYSTEM_XPDFRC
Index: goo/gmem.h
===================================================================
RCS file: /cvs/poppler/poppler/goo/gmem.h,v
retrieving revision 1.5
diff -u -r1.5 gmem.h
--- goo/gmem.h	25 Apr 2007 19:59:10 -0000	1.5
+++ goo/gmem.h	13 Jun 2007 12:45:14 -0000
@@ -10,7 +10,7 @@
 #define GMEM_H
 
 #include <stdio.h>
-#include <config.h>
+#include <poppler/poppler-config.h>
 
 #if USE_EXCEPTIONS
 
Index: goo/FixedPoint.h
===================================================================
RCS file: /cvs/poppler/poppler/goo/FixedPoint.h,v
retrieving revision 1.3
diff -u -r1.3 FixedPoint.h
--- goo/FixedPoint.h	25 Apr 2007 19:59:10 -0000	1.3
+++ goo/FixedPoint.h	13 Jun 2007 12:45:14 -0000
@@ -11,7 +11,7 @@
 #ifndef FIXEDPOINT_H
 #define FIXEDPOINT_H
 
-#include <config.h>
+#include <poppler/poppler-config.h>
 
 #if USE_FIXEDPOINT
 
Index: utils/ImageOutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/utils/ImageOutputDev.h,v
retrieving revision 1.2
diff -u -r1.2 ImageOutputDev.h
--- utils/ImageOutputDev.h	22 May 2006 19:58:41 -0000	1.2
+++ utils/ImageOutputDev.h	13 Jun 2007 12:45:15 -0000
@@ -9,7 +9,7 @@
 #ifndef IMAGEOUTPUTDEV_H
 #define IMAGEOUTPUTDEV_H
 
-#include <poppler-config.h>
+#include <poppler/poppler-config.h>
 
 #ifdef USE_GCC_PRAGMAS
 #pragma interface