diff --git a/libgimp/gimpcompat.h b/libgimp/gimpcompat.h
index 17c1c21165..c97e37ec31 100644
--- a/libgimp/gimpcompat.h
+++ b/libgimp/gimpcompat.h
@@ -25,12 +25,17 @@
 
 G_BEGIN_DECLS
 
-/* This file contains aliases that are kept for historical
- * reasons, because a wide code base depends on them.
+/* This file contains aliases that are kept for historical reasons,
+ * because a wide code base depends on them. We suggest that you
+ * only use this header temporarily while porting a plug-in to the
+ * new API.
  *
  * These defines will be removed in the next development cycle.
  */
 
+#ifndef GIMP_DISABLE_DEPRECATED
+
+
 #define GimpRunModeType                         GimpRunMode
 #define GimpExportReturnType                    GimpExportReturn
 
@@ -64,6 +69,10 @@ G_BEGIN_DECLS
 #define gimp_pattern_select_widget              gimp_pattern_select_widget_new
 #define gimp_pattern_select_widget_set_popup    gimp_pattern_select_widget_set
 #define gimp_pattern_select_widget_close_popup  gimp_pattern_select_widget_close
+#define INTENSITY(r,g,b)                        GIMP_RGB_INTENSITY(r,g,b)
+#define INTENSITY_RED                           GIMP_RGB_INTENSITY_RED
+#define INTENSITY_GREEN                         GIMP_RGB_INTENSITY_GREEN
+#define INTENSITY_BLUE                          GIMP_RGB_INTENSITY_BLUE
 
 
 enum
@@ -140,6 +149,9 @@ enum
   GIMP_SPIRAL_ANTICLOCKWISE = GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE
 };
 
+
+#endif  /* GIMP_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif  /* __GIMP_COMPAT_H__ */
diff --git a/libgimpcolor/gimprgb.h b/libgimpcolor/gimprgb.h
index 40fd7c4675..16566613b1 100644
--- a/libgimpcolor/gimprgb.h
+++ b/libgimpcolor/gimprgb.h
@@ -103,7 +103,7 @@ gdouble   gimp_rgba_distance  (const GimpRGB *rgba1,
 #define GIMP_RGB_INTENSITY_BLUE   0.11
 #define GIMP_RGB_INTENSITY(r,g,b) ((r) * GIMP_RGB_INTENSITY_RED   + \
 			           (g) * GIMP_RGB_INTENSITY_GREEN + \
-			           (b) * GIMP_RGB_INTENSITY_BLUE  + 0.001)
+			           (b) * GIMP_RGB_INTENSITY_BLUE)
 
 
 G_END_DECLS