diff --git a/app/core/gimp-cairo.h b/app/core/gimp-cairo.h
index 642c8d75e9..a98003c393 100644
--- a/app/core/gimp-cairo.h
+++ b/app/core/gimp-cairo.h
@@ -21,8 +21,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIMP_CAIRO_H__
-#define __GIMP_CAIRO_H__
+#ifndef __APP_GIMP_CAIRO_H__
+#define __APP_GIMP_CAIRO_H__
 
 
 GeglBuffer      * gimp_cairo_image_surface_create_buffer (cairo_surface_t *surface);
@@ -42,4 +42,4 @@ void              gimp_cairo_add_segments                (cairo_t         *cr,
                                                           gint             n_segs);
 
 
-#endif /* __GIMP_CAIRO_H__ */
+#endif /* __APP_GIMP_CAIRO_H__ */
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index 27fece1e86..8b54bb632e 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -69,8 +69,8 @@ libgimpcolor_2_0_la_SOURCES = \
 	gimpadaptivesupersample.h	\
 	gimpbilinear.c			\
 	gimpbilinear.h			\
-	gimpcairocolor.c		\
-	gimpcairocolor.h		\
+	gimpcairo.c			\
+	gimpcairo.h			\
 	gimpcmyk.c			\
 	gimpcmyk.h			\
 	gimpcolormanaged.c		\
@@ -92,7 +92,7 @@ libgimpcolorinclude_HEADERS = \
 	gimpcolortypes.h		\
 	gimpadaptivesupersample.h	\
 	gimpbilinear.h			\
-	gimpcairocolor.h		\
+	gimpcairo.h			\
 	gimpcmyk.h			\
 	gimpcolormanaged.h		\
 	gimpcolorspace.h		\
diff --git a/libgimpcolor/gimpcairocolor.c b/libgimpcolor/gimpcairo.c
similarity index 94%
rename from libgimpcolor/gimpcairocolor.c
rename to libgimpcolor/gimpcairo.c
index 5e4b657a7a..d0ab383339 100644
--- a/libgimpcolor/gimpcairocolor.c
+++ b/libgimpcolor/gimpcairo.c
@@ -1,9 +1,9 @@
 /* LIBGIMP - The GIMP Library
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * gimpcairocolor.c
- * Copyright (C) 2007 Sven Neumann <sven@gimp.org>
- *               2010 Michael Natterer <mitch@gimp.org>
+ * gimpcairo.c
+ * Copyright (C) 2007      Sven Neumann <sven@gimp.org>
+ *               2010-2012 Michael Natterer <mitch@gimp.org>
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,12 +29,12 @@
 
 #include "gimpcolortypes.h"
 
-#include "gimpcairocolor.h"
+#include "gimpcairo.h"
 
 
 /**
- * SECTION: gimpcairocolor
- * @title: GimpCairoColor
+ * SECTION: gimpcairo
+ * @title: GimpCairo
  * @short_description: Color utility functions for cairo
  *
  * Utility functions that make cairo easier to use with GIMP color
diff --git a/libgimpcolor/gimpcairocolor.h b/libgimpcolor/gimpcairo.h
similarity index 95%
rename from libgimpcolor/gimpcairocolor.h
rename to libgimpcolor/gimpcairo.h
index 8ead589614..2b005ed534 100644
--- a/libgimpcolor/gimpcairocolor.h
+++ b/libgimpcolor/gimpcairo.h
@@ -1,9 +1,9 @@
 /* LIBGIMP - The GIMP Library
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * gimpcairocolor.h
- * Copyright (C) 2007 Sven Neumann <sven@gimp.org>
- *               2010 Michael Natterer <mitch@gimp.org>
+ * gimpcairo.h
+ * Copyright (C) 2007      Sven Neumann <sven@gimp.org>
+ *               2010-2012 Michael Natterer <mitch@gimp.org>
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIMP_CAIRO_COLOR_H__
-#define __GIMP_CAIRO_COLOR_H__
+#ifndef __GIMP_CAIRO_H__
+#define __GIMP_CAIRO_H__
 
 
 void              gimp_cairo_set_source_rgb      (cairo_t       *cr,
@@ -153,4 +153,4 @@ cairo_pattern_t * gimp_cairo_checkerboard_create (cairo_t       *cr,
 #endif
 
 
-#endif /* __GIMP_CAIRO_COLOR_H__ */
+#endif /* __GIMP_CAIRO_H__ */
diff --git a/libgimpcolor/gimpcolor.h b/libgimpcolor/gimpcolor.h
index e23381c589..0cd1024ce5 100644
--- a/libgimpcolor/gimpcolor.h
+++ b/libgimpcolor/gimpcolor.h
@@ -25,7 +25,7 @@
 
 #include <libgimpcolor/gimpadaptivesupersample.h>
 #include <libgimpcolor/gimpbilinear.h>
-#include <libgimpcolor/gimpcairocolor.h>
+#include <libgimpcolor/gimpcairo.h>
 #include <libgimpcolor/gimpcolormanaged.h>
 #include <libgimpcolor/gimpcolorspace.h>
 #include <libgimpcolor/gimpcmyk.h>