5 files changed, 12 insertions, 14 deletions
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 49ac2e802..6626ff20d 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -36,8 +36,12 @@
 # include "internal/emf-print.h"
 # include "internal/wmf-inout.h"
 # include "internal/wmf-print.h"
-#ifdef HAVE_CAIRO_PDF
+
+#include <cairo.h>
+#ifdef CAIRO_HAS_PDF_SURFACE
 # include "internal/cairo-renderer-pdf-out.h"
+#endif
+#ifdef CAIRO_HAS_PS_SURFACE
 # include "internal/cairo-ps-out.h"
 #endif
 #include "internal/pov-out.h"
@@ -151,10 +155,10 @@ init()
     Internal::Svg::init();
     Internal::Svgz::init();
 
-#ifdef HAVE_CAIRO_PDF
-    //g_print ("Using CairoRendererPdfOutput: new pdf exporter\n");
+#ifdef CAIRO_HAS_PDF_SURFACE
     Internal::CairoRendererPdfOutput::init();
-
+#endif
+#ifdef CAIRO_HAS_PS_SURFACE
     Internal::CairoPsOutput::init();
     Internal::CairoEpsOutput::init();
 #endif
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index ed5be808c..baa1cf1b0 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -19,7 +19,8 @@
 # include "config.h"  // only include where actually required!
 #endif
 
-#ifdef HAVE_CAIRO_PDF
+#include <cairo.h>
+#ifdef CAIRO_HAS_PS_SURFACE
 
 #include "cairo-ps.h"
 #include "cairo-ps-out.h"
diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h
index b0e14e5a8..974f9668a 100644
--- a/src/extension/internal/cairo-ps-out.h
+++ b/src/extension/internal/cairo-ps-out.h
@@ -23,8 +23,6 @@
 
 #include "extension/implementation/implementation.h"
 
-#ifdef HAVE_CAIRO_PDF
-
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
@@ -55,8 +53,6 @@ public:
 
 } } }  /* namespace Inkscape, Extension, Implementation */
 
-#endif /* HAVE_CAIRO_PDF */
-
 #endif /* !EXTENSION_INTERNAL_CAIRO_PS_OUT_H */
 
 /*
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index d2e96e31a..9ff3579ed 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -19,7 +19,8 @@
 # include "config.h"  // only include where actually required!
 #endif
 
-#ifdef HAVE_CAIRO_PDF
+#include <cairo.h>
+#ifdef CAIRO_HAS_PDF_SURFACE
 
 #include "cairo-renderer-pdf-out.h"
 #include "cairo-render-context.h"
diff --git a/src/extension/internal/cairo-renderer-pdf-out.h b/src/extension/internal/cairo-renderer-pdf-out.h
index c69b86ef6..dfb2ad3a9 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.h
+++ b/src/extension/internal/cairo-renderer-pdf-out.h
@@ -21,8 +21,6 @@
 
 #include "extension/implementation/implementation.h"
 
-#ifdef HAVE_CAIRO_PDF
-
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
@@ -39,8 +37,6 @@ public:
 
 } } }  /* namespace Inkscape, Extension, Internal */
 
-#endif /* HAVE_CAIRO_PDF */
-
 #endif /* !EXTENSION_INTERNAL_CAIRO_RENDERER_PDF_OUT_H */
 
 /*