diff -ru poppler-0.8.5.orig/poppler/PreScanOutputDev.h poppler-0.8.5/poppler/PreScanOutputDev.h
--- poppler-0.8.5.orig/poppler/PreScanOutputDev.h	2008-08-19 16:05:18.000000000 +0100
+++ poppler-0.8.5/poppler/PreScanOutputDev.h	2008-08-19 16:06:25.000000000 +0100
@@ -13,7 +13,7 @@
 #pragma interface
 #endif
 
-#include "gtypes.h"
+#include "goo/gtypes.h"
 #include "GfxState.h"
 #include "OutputDev.h"
 
diff -ru poppler-0.8.5.orig/poppler/SecurityHandler.h poppler-0.8.5/poppler/SecurityHandler.h
--- poppler-0.8.5.orig/poppler/SecurityHandler.h	2008-08-19 16:05:18.000000000 +0100
+++ poppler-0.8.5/poppler/SecurityHandler.h	2008-08-19 16:05:57.000000000 +0100
@@ -15,7 +15,7 @@
 #pragma interface
 #endif
 
-#include "gtypes.h"
+#include "goo/gtypes.h"
 #include "Object.h"
 
 class GooString;