diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc
index 01367b9085..74435398fe 100644
--- a/libs/gtkmm2ext/cairo_widget.cc
+++ b/libs/gtkmm2ext/cairo_widget.cc
@@ -55,7 +55,7 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
 	expose_area.width = ev->area.width;
 	expose_area.height = ev->area.height;
 
-#ifdef USE_CAIRO_IMAGE_SURFACE
+#ifdef USE_CAIRO_IMAGE_SURFACE_FOR_CAIRO_WIDGET
 	Cairo::RefPtr<Cairo::Context> cr;
     if (get_visible_window ()) {
 		expose_area.x = 0;
@@ -90,7 +90,7 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
 
 	render (cr->cobj(), &expose_area);
 
-#ifdef USE_CAIRO_IMAGE_SURFACE
+#ifdef USE_CAIRO_IMAGE_SURFACE_FOR_CAIRO_WIDGET
 	if(get_visible_window ()) {
 		_image_surface->flush();
 		/* now blit our private surface back to the GDK one */
@@ -133,7 +133,7 @@ CairoWidget::on_size_allocate (Gtk::Allocation& alloc)
 {
 	Gtk::EventBox::on_size_allocate (alloc);
 
-#ifdef USE_CAIRO_IMAGE_SURFACE
+#ifdef USE_CAIRO_IMAGE_SURFACE_FOR_CAIRO_WIDGET
 	_image_surface = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, alloc.get_width(), alloc.get_height());
 #endif
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h
index 632f9e5563..cd4ec36b6e 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h
@@ -109,7 +109,7 @@ protected:
 	static sigc::slot<void> focus_handler;
 
   private:
-#ifdef USE_CAIRO_IMAGE_SURFACE
+#ifdef USE_CAIRO_IMAGE_SURFACE_FOR_CANVAS
 	Cairo::RefPtr<Cairo::Surface> _image_surface;
 #endif
 	Glib::SignalProxyProperty _name_proxy;