diff --git a/app/Makefile.am b/app/Makefile.am
index 59d14e0e27..e559433333 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -107,14 +107,12 @@ endif
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gimp\"		\
-	-DGIMP_APP_GLUE_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)		\
-	$(GTK_CFLAGS)		\
-	$(PANGOCAIRO_CFLAGS)	\
-	$(GEGL_CFLAGS)		\
-	-I$(includedir)		\
+	-DGIMP_APP_GLUE_COMPILATION	\
+	-I$(top_srcdir)			\
+	$(GTK_CFLAGS)			\
+	$(PANGOCAIRO_CFLAGS)		\
+	$(GEGL_CFLAGS)			\
+	-I$(includedir)			\
 	-I$(builddir)/gui
 
 # FIXME: core should not depend on xcf
diff --git a/app/actions/Makefile.am b/app/actions/Makefile.am
index cd6dcf7537..496a1d981b 100644
--- a/app/actions/Makefile.am
+++ b/app/actions/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Actions\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(GTK_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"Gimp-Actions\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappactions.a
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 7e709499df..a16887a035 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -8,17 +8,15 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
 libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Config\"	\
-	-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(CAIRO_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-Config\"				\
+	-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"	\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GEGL_CFLAGS)						\
+	$(CAIRO_CFLAGS)						\
+	$(GDK_PIXBUF_CFLAGS)					\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappconfig.a
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index ed543e20e0..df5435b769 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -2,16 +2,14 @@
 
 AM_CPPFLAGS = \
 	-DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\"	\
-	-DG_LOG_DOMAIN=\"Gimp-Core\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-Core\"			\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)/app				\
+	-I$(top_srcdir)/app				\
+	$(CAIRO_CFLAGS)					\
+	$(GEGL_CFLAGS)					\
+	$(GDK_PIXBUF_CFLAGS)				\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappcore.a
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
index 45e7d4a61c..63fdb64a45 100644
--- a/app/dialogs/Makefile.am
+++ b/app/dialogs/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Dialogs\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(GTK_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"Gimp-Dialogs\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappdialogs.a
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 336ccf36d6..c59f5206ef 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Display\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(GTK_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"Gimp-Display\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappdisplay.a
diff --git a/app/file/Makefile.am b/app/file/Makefile.am
index 2f34fe986c..19db33ba24 100644
--- a/app/file/Makefile.am
+++ b/app/file/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-File\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-File\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappfile.a
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
index 6e9238bb5c..01e353dccc 100644
--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-GEGL\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-GEGL\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappgegl.a
diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am
index fe75010c12..b5ea072a3c 100644
--- a/app/gui/Makefile.am
+++ b/app/gui/Makefile.am
@@ -1,18 +1,16 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-GUI\"	\
-	-DGIMP_COMMAND=\"@GIMP_COMMAND@\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GIO_UNIX_CFLAGS)	\
-	$(GEGL_CFLAGS)		\
-	$(GTK_CFLAGS)		\
-	$(DBUS_GLIB_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-GUI\"		\
+	-DGIMP_COMMAND=\"@GIMP_COMMAND@\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(GIO_UNIX_CFLAGS)			\
+	$(GEGL_CFLAGS)				\
+	$(GTK_CFLAGS)				\
+	$(DBUS_GLIB_CFLAGS)			\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappgui.a
diff --git a/app/menus/Makefile.am b/app/menus/Makefile.am
index b6865f2a8e..96b3b498d0 100644
--- a/app/menus/Makefile.am
+++ b/app/menus/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Menus\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(GTK_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"Gimp-Menus\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappmenus.a
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
index 86cfd8a960..2f68d3b8fb 100644
--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -2,16 +2,14 @@
 SUBDIRS = tests
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Operations\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-Operations\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)/app			\
+	-I$(top_srcdir)/app			\
+	$(CAIRO_CFLAGS)				\
+	$(GEGL_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappoperations.a
diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am
index c2c72e2a7e..efc4639440 100644
--- a/app/paint/Makefile.am
+++ b/app/paint/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Paint\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-Paint\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libapppaint.a
diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am
index 74e6351429..fffe894e99 100644
--- a/app/pdb/Makefile.am
+++ b/app/pdb/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-PDB\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-PDB\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libapppdb.a libappinternal-procs.a
diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am
index bd9053e47b..d757efd29d 100644
--- a/app/plug-in/Makefile.am
+++ b/app/plug-in/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Plug-In\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-Plug-In\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappplug-in.a
diff --git a/app/text/Makefile.am b/app/text/Makefile.am
index 779abf6a58..23de44b53d 100644
--- a/app/text/Makefile.am
+++ b/app/text/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Text\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(PANGOCAIRO_CFLAGS)	\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-Text\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(PANGOCAIRO_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libapptext.a
diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am
index 4c0b624d59..50ec6b8b18 100644
--- a/app/tools/Makefile.am
+++ b/app/tools/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Tools\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(GTK_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"Gimp-Tools\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(GEGL_CFLAGS)			\
+	$(GTK_CFLAGS)			\
 	-I$(includedir)
 
 noinst_LIBRARIES = libapptools.a
diff --git a/app/vectors/Makefile.am b/app/vectors/Makefile.am
index 86e37475f3..aa6e10d9e1 100644
--- a/app/vectors/Makefile.am
+++ b/app/vectors/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-Vectors\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-Vectors\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappvectors.a
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index c0485b6f7e..6369e7d9c0 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -3,15 +3,13 @@
 AM_CPPFLAGS = \
         -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\"		\
         -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\"	\
-	-DG_LOG_DOMAIN=\"Gimp-Widgets\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(GEGL_CFLAGS)		\
-	$(GTK_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"Gimp-Widgets\"				\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)/app					\
+	-I$(top_srcdir)/app					\
+	$(GEGL_CFLAGS)						\
+	$(GTK_CFLAGS)						\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappwidgets.a
diff --git a/app/xcf/Makefile.am b/app/xcf/Makefile.am
index 32f1cb4c93..65a3dc8a80 100644
--- a/app/xcf/Makefile.am
+++ b/app/xcf/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gimp-XCF\"
-
-INCLUDES = \
-	-I$(top_builddir)	\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)/app	\
-	-I$(top_srcdir)/app	\
-	$(CAIRO_CFLAGS)		\
-	$(GEGL_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DG_LOG_DOMAIN=\"Gimp-XCF\"	\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)/app		\
+	-I$(top_srcdir)/app		\
+	$(CAIRO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappxcf.a
diff --git a/devel-docs/tools/Makefile.am b/devel-docs/tools/Makefile.am
index 60246b811c..45548520b2 100644
--- a/devel-docs/tools/Makefile.am
+++ b/devel-docs/tools/Makefile.am
@@ -14,10 +14,10 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
 libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
 
 
-AM_CPPFLAGS = $(GTK_CFLAGS) -DTOP_SRCDIR=\"$(top_srcdir)\"
-
-INCLUDES = \
-	-I$(top_srcdir)	\
+AM_CPPFLAGS = \
+	$(GTK_CFLAGS)			\
+	 -DTOP_SRCDIR=\"$(top_srcdir)\"	\
+	-I$(top_srcdir)			\
 	$(GEGL_CFLAGS)
 
 AM_LDFLAGS = $(mwindows)
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 94ff4c91d3..775ed14ea8 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -64,13 +64,11 @@ gimpincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimp
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibGimp\"	\
-	-DGIMP_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)	\
-	$(GTK_CFLAGS)	\
-	$(GEGL_CFLAGS)	\
-	-I$(includedir)	\
+	-DGIMP_COMPILATION		\
+	-I$(top_srcdir)			\
+	$(GTK_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	-I$(includedir)			\
 	$(xobjective_c)
 
 lib_LTLIBRARIES = libgimp-@GIMP_API_VERSION@.la libgimpui-@GIMP_API_VERSION@.la
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index cc8c930657..40e860cd61 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -58,19 +58,17 @@ AM_CPPFLAGS = \
 	-DGIMP_SYSCONF_VERSION=\"$(GIMP_SYSCONF_VERSION)\"	\
 	-DGIMP_PLUGIN_VERSION=\"$(GIMP_PLUGIN_VERSION)\"	\
 	-DG_LOG_DOMAIN=\"LibGimpBase\"				\
-	-DGIMP_BASE_COMPILATION
+	-DGIMP_BASE_COMPILATION					\
+	-I$(top_srcdir)						\
+	$(GLIB_CFLAGS)						\
+	$(BINRELOC_CFLAGS)					\
+	-I$(includedir)						\
+	$(xobjective_c)
 
 AM_CCASFLAGS = \
 	-I$(top_builddir)	\
 	-I$(top_srcdir)
 
-INCLUDES = \
-	-I$(top_srcdir)		\
-	$(GLIB_CFLAGS)		\
-	$(BINRELOC_CFLAGS)	\
-	-I$(includedir)		\
-	$(xobjective_c)
-
 EXTRA_DIST = \
 	gimpbase.def
 
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index 20f43faf4c..c2fd45f284 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -48,13 +48,11 @@ libgimpcolorincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpcolor
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibGimpColor\"	\
-	-DGIMP_COLOR_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)		\
-	$(GEGL_CFLAGS)		\
-	$(CAIRO_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DGIMP_COLOR_COMPILATION	\
+	-I$(top_srcdir)			\
+	$(GEGL_CFLAGS)			\
+	$(CAIRO_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
 	-I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 2c6d46b805..8267c7e359 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -45,13 +45,11 @@ libgimpconfigincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpconfig
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibGimpConfig\"	\
-	-DGIMP_CONFIG_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)		\
-	$(GEGL_CFLAGS)		\
-	$(CAIRO_CFLAGS)		\
-	$(GDK_PIXBUF_CFLAGS)	\
+	-DGIMP_CONFIG_COMPILATION		\
+	-I$(top_srcdir)				\
+	$(GEGL_CFLAGS)				\
+	$(CAIRO_CFLAGS)				\
+	$(GDK_PIXBUF_CFLAGS)			\
 	-I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am
index 57d5020068..b2c8394a61 100644
--- a/libgimpmath/Makefile.am
+++ b/libgimpmath/Makefile.am
@@ -48,11 +48,9 @@ libgimpmathincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmath
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibGimpMath\"	\
-	-DGIMP_MATH_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)	\
-	$(GLIB_CFLAGS)	\
+	-DGIMP_MATH_COMPILATION		\
+	-I$(top_srcdir)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am
index 4379a62b7e..9b4d4d9ccd 100644
--- a/libgimpmodule/Makefile.am
+++ b/libgimpmodule/Makefile.am
@@ -43,12 +43,10 @@ libgimpmoduleincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmodule
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibGimpModule\"	\
-	-DGIMP_MODULE_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)			\
-	$(GLIB_CFLAGS)			\
-	$(GMODULE_NO_EXPORT_CFLAGS)	\
+	-DGIMP_MODULE_COMPILATION		\
+	-I$(top_srcdir)				\
+	$(GLIB_CFLAGS)				\
+	$(GMODULE_NO_EXPORT_CFLAGS)		\
 	-I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
index 081894bee2..3130592349 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -46,13 +46,11 @@ libgimpthumbincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpthumb
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibGimpThumb\"	\
-	-DGIMP_THUMB_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)		\
-	$(GDK_PIXBUF_CFLAGS)	\
-	$(GLIB_CFLAGS)		\
-	-I$(includedir)		\
+	-DGIMP_THUMB_COMPILATION	\
+	-I$(top_srcdir)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	$(GLIB_CFLAGS)			\
+	-I$(includedir)			\
 	$(xobjective_c)
 
 EXTRA_DIST = \
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 98fe0d64a4..5075155248 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -50,12 +50,10 @@ libgimpwidgetsincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpwidgets
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibGimpWidgets\"	\
-	-DGIMP_WIDGETS_COMPILATION
-
-INCLUDES = \
-	-I$(top_srcdir)	\
-	$(GEGL_CFLAGS)	\
-	$(GTK_CFLAGS)	\
+	-DGIMP_WIDGETS_COMPILATION		\
+	-I$(top_srcdir)				\
+	$(GEGL_CFLAGS)				\
+	$(GTK_CFLAGS)				\
 	-I$(includedir)
 
 lib_LTLIBRARIES = libgimpwidgets-@GIMP_API_VERSION@.la
diff --git a/modules/Makefile.am b/modules/Makefile.am
index b81659e778..7e8110fe38 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -12,7 +12,7 @@ endif
 
 libdir = $(gimpplugindir)/modules
 
-INCLUDES = \
+AM_CPPFLAGS = \
         -I$(top_srcdir)	\
 	$(GEGL_CFLAGS)	\
         $(GTK_CFLAGS)	\
diff --git a/plug-ins/color-rotate/Makefile.am b/plug-ins/color-rotate/Makefile.am
index 0a9912ce20..4751ef3abc 100644
--- a/plug-ins/color-rotate/Makefile.am
+++ b/plug-ins/color-rotate/Makefile.am
@@ -41,7 +41,7 @@ color_rotate_SOURCES = \
 	color-rotate-stock.c		\
 	color-rotate-stock.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index ac6864bd4c..5a2bb2b250 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = \
 	plugin-defs.pl	\
 	gimprc.common
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS)	\
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index e890190076..6ea30dc56a 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -88,7 +88,7 @@ EXTRA_DIST = \\
 	plugin-defs.pl$extra	\\
 	$rcfile
 
-INCLUDES = \\
+AM_CPPFLAGS = \\
 	-I\$(top_srcdir)	\\
 	\$(GTK_CFLAGS)	\\
 	\$(GEGL_CFLAGS)	\\
diff --git a/plug-ins/file-bmp/Makefile.am b/plug-ins/file-bmp/Makefile.am
index 5fc7138aff..c2014908d6 100644
--- a/plug-ins/file-bmp/Makefile.am
+++ b/plug-ins/file-bmp/Makefile.am
@@ -29,7 +29,7 @@ file_bmp_SOURCES = \
 	bmp-read.c	\
 	bmp-write.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/file-compressor/Makefile.am b/plug-ins/file-compressor/Makefile.am
index 710117b8f7..bbea43d4df 100644
--- a/plug-ins/file-compressor/Makefile.am
+++ b/plug-ins/file-compressor/Makefile.am
@@ -19,7 +19,7 @@ libexec_PROGRAMS = file-compressor
 file_compressor_SOURCES = \
 	file-compressor.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/file-exr/Makefile.am b/plug-ins/file-exr/Makefile.am
index e7c4ebe742..37b5f6eb6f 100644
--- a/plug-ins/file-exr/Makefile.am
+++ b/plug-ins/file-exr/Makefile.am
@@ -21,7 +21,7 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	  \
 	$(GTK_CFLAGS)	  \
 	$(GEGL_CFLAGS)    \
diff --git a/plug-ins/file-faxg3/Makefile.am b/plug-ins/file-faxg3/Makefile.am
index 77b2f3e730..799ffc35a7 100644
--- a/plug-ins/file-faxg3/Makefile.am
+++ b/plug-ins/file-faxg3/Makefile.am
@@ -28,7 +28,7 @@ file_faxg3_SOURCES = \
 	g3.c		\
 	g3.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	$(CAIRO_CFLAGS)		\
 	$(GDK_PIXBUF_CFLAGS)	\
diff --git a/plug-ins/file-fits/Makefile.am b/plug-ins/file-fits/Makefile.am
index 5ffb5376ac..25f2b99d6d 100644
--- a/plug-ins/file-fits/Makefile.am
+++ b/plug-ins/file-fits/Makefile.am
@@ -29,7 +29,7 @@ file_fits_SOURCES = \
 	fits-io.c	\
 	fits-io.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/file-fli/Makefile.am b/plug-ins/file-fli/Makefile.am
index 5d69880179..9fd8667607 100644
--- a/plug-ins/file-fli/Makefile.am
+++ b/plug-ins/file-fli/Makefile.am
@@ -28,7 +28,7 @@ file_fli_SOURCES = \
 	fli.c	\
 	fli-gimp.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/file-ico/Makefile.am b/plug-ins/file-ico/Makefile.am
index d57bd40617..867694747a 100644
--- a/plug-ins/file-ico/Makefile.am
+++ b/plug-ins/file-ico/Makefile.am
@@ -35,7 +35,7 @@ file_ico_SOURCES = \
 	ico-save.c	\
 	ico-save.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/file-jpeg/Makefile.am b/plug-ins/file-jpeg/Makefile.am
index bba866d3c8..5b3f2ae1dd 100644
--- a/plug-ins/file-jpeg/Makefile.am
+++ b/plug-ins/file-jpeg/Makefile.am
@@ -21,7 +21,7 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(EXIF_CFLAGS)	\
diff --git a/plug-ins/file-psd/Makefile.am b/plug-ins/file-psd/Makefile.am
index b4712923d9..0297581168 100644
--- a/plug-ins/file-psd/Makefile.am
+++ b/plug-ins/file-psd/Makefile.am
@@ -47,7 +47,7 @@ EXTRA_DIST = \
 	TODO.txt		\
 	new-resource-ids.txt
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	$(GTK_CFLAGS)		\
 	$(EXIF_CFLAGS)		\
diff --git a/plug-ins/file-sgi/Makefile.am b/plug-ins/file-sgi/Makefile.am
index 032a90f24a..77fc3a0139 100644
--- a/plug-ins/file-sgi/Makefile.am
+++ b/plug-ins/file-sgi/Makefile.am
@@ -28,7 +28,7 @@ file_sgi_SOURCES = \
 	sgi-lib.c	\
 	sgi-lib.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/file-uri/Makefile.am b/plug-ins/file-uri/Makefile.am
index 7f099d3a04..a260bd24d8 100644
--- a/plug-ins/file-uri/Makefile.am
+++ b/plug-ins/file-uri/Makefile.am
@@ -44,7 +44,7 @@ file_uri_SOURCES = \
 	uri-backend.h		\
 	$(backend_sources)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	$(backend_cflags)	\
 	$(GTK_CFLAGS)		\
diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am
index fc5a4ecc22..fa0f6a56b1 100644
--- a/plug-ins/flame/Makefile.am
+++ b/plug-ins/flame/Makefile.am
@@ -35,7 +35,7 @@ flame_SOURCES = \
 	rect.c		\
 	rect.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/fractal-explorer/Makefile.am b/plug-ins/fractal-explorer/Makefile.am
index e089a9fe94..56e18a73b4 100644
--- a/plug-ins/fractal-explorer/Makefile.am
+++ b/plug-ins/fractal-explorer/Makefile.am
@@ -33,7 +33,7 @@ fractal_explorer_SOURCES = \
 	fractal-explorer.c		\
 	fractal-explorer.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am
index 6f2b818e2e..bc86cc17d7 100644
--- a/plug-ins/gfig/Makefile.am
+++ b/plug-ins/gfig/Makefile.am
@@ -64,7 +64,7 @@ gfig_SOURCES = \
 
 EXTRA_DIST = README
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/gimpressionist/Makefile.am b/plug-ins/gimpressionist/Makefile.am
index 2708d41c06..653854c66d 100644
--- a/plug-ins/gimpressionist/Makefile.am
+++ b/plug-ins/gimpressionist/Makefile.am
@@ -22,15 +22,14 @@ gimpressionist_RC = gimpressionist.rc.o
 endif
 
 AM_CPPFLAGS = \
-	-DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\"
+	-DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\"	\
+	-I$(top_srcdir)	\
+	$(GTK_CFLAGS)	\
+	$(GEGL_CFLAGS)	\
+	-I$(includedir)
 
 AM_LDFLAGS = $(mwindows)
 
-INCLUDES = \
-	-I$(top_srcdir)	\
-	$(GTK_CFLAGS)	\
-	$(GEGL_CFLAGS) \
-	-I$(includedir)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
diff --git a/plug-ins/gradient-flare/Makefile.am b/plug-ins/gradient-flare/Makefile.am
index bec0055c23..40e5840c06 100644
--- a/plug-ins/gradient-flare/Makefile.am
+++ b/plug-ins/gradient-flare/Makefile.am
@@ -29,7 +29,7 @@ libexec_PROGRAMS = gradient-flare
 
 gradient_flare_SOURCES = gradient-flare.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/help-browser/Makefile.am b/plug-ins/help-browser/Makefile.am
index f521365e3b..2b9cdaa9f9 100644
--- a/plug-ins/help-browser/Makefile.am
+++ b/plug-ins/help-browser/Makefile.am
@@ -25,7 +25,7 @@ libexecdir = $(gimpplugindir)/plug-ins
 
 libexec_PROGRAMS = help-browser
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	$(WEBKIT_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/help/Makefile.am b/plug-ins/help/Makefile.am
index e7efde6481..8457c33055 100644
--- a/plug-ins/help/Makefile.am
+++ b/plug-ins/help/Makefile.am
@@ -16,7 +16,14 @@ include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
 help_RC = help.rc.o
 endif
 
-AM_CPPFLAGS = -DDATADIR=\""$(gimpdatadir)"\"
+AM_CPPFLAGS = \
+	-DDATADIR=\""$(gimpdatadir)"\"	\
+	-I$(top_srcdir)			\
+	$(CAIRO_CFLAGS)			\
+	$(GIO_CFLAGS)			\
+	$(GEGL_CFLAGS)			\
+	$(GDK_PIXBUF_CFLAGS)		\
+	-I$(includedir)
 
 AM_LDFLAGS = $(mwindows)
 
@@ -42,14 +49,6 @@ libexec_PROGRAMS = help
 
 help_SOURCES = help.c
 
-INCLUDES = \
-	-I$(top_srcdir)		\
-	$(CAIRO_CFLAGS)		\
-	$(GIO_CFLAGS)		\
-	$(GEGL_CFLAGS) \
-	$(GDK_PIXBUF_CFLAGS)	\
-	-I$(includedir)
-
 LDADD = \
 	$(libgimphelp)		\
 	$(libgimp)		\
diff --git a/plug-ins/ifs-compose/Makefile.am b/plug-ins/ifs-compose/Makefile.am
index be7dbabe6e..f9b6681c51 100644
--- a/plug-ins/ifs-compose/Makefile.am
+++ b/plug-ins/ifs-compose/Makefile.am
@@ -33,7 +33,7 @@ ifs_compose_SOURCES = \
 
 EXTRA_DIST = README.ifscompose
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am
index ec436c0200..018a95942a 100644
--- a/plug-ins/imagemap/Makefile.am
+++ b/plug-ins/imagemap/Makefile.am
@@ -131,7 +131,7 @@ imagemap_SOURCES = \
 	imap_taglist.c			\
 	imap_taglist.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/lighting/Makefile.am b/plug-ins/lighting/Makefile.am
index 659153717c..632868590b 100644
--- a/plug-ins/lighting/Makefile.am
+++ b/plug-ins/lighting/Makefile.am
@@ -43,7 +43,7 @@ lighting_SOURCES = \
 	lighting-ui.c		\
 	lighting-ui.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/map-object/Makefile.am b/plug-ins/map-object/Makefile.am
index f0c51fd7da..863829135c 100644
--- a/plug-ins/map-object/Makefile.am
+++ b/plug-ins/map-object/Makefile.am
@@ -43,7 +43,7 @@ map_object_SOURCES = \
 	map-object-ui.c		\
 	map-object-ui.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/maze/Makefile.am b/plug-ins/maze/Makefile.am
index fb9b7c597f..b517196d19 100644
--- a/plug-ins/maze/Makefile.am
+++ b/plug-ins/maze/Makefile.am
@@ -33,7 +33,7 @@ maze_SOURCES = \
 	maze-utils.c		\
 	maze-utils.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/metadata/Makefile.am b/plug-ins/metadata/Makefile.am
index 8babc5f93d..841d02044b 100644
--- a/plug-ins/metadata/Makefile.am
+++ b/plug-ins/metadata/Makefile.am
@@ -61,7 +61,7 @@ xmpdump_SOURCES = \
 	xmp-parse.h	\
 	xmp-parse.c	
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am
index a203aac188..5aa6d900d7 100644
--- a/plug-ins/pagecurl/Makefile.am
+++ b/plug-ins/pagecurl/Makefile.am
@@ -30,7 +30,7 @@ nodist_pagecurl_SOURCES = pagecurl-icons.h
 
 BUILT_SOURCES = pagecurl-icons.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am
index 23b748a8bd..b2a294f285 100644
--- a/plug-ins/print/Makefile.am
+++ b/plug-ins/print/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	$(GTK_CFLAGS)		\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/pygimp/Makefile.am b/plug-ins/pygimp/Makefile.am
index 62843b944f..897476987c 100644
--- a/plug-ins/pygimp/Makefile.am
+++ b/plug-ins/pygimp/Makefile.am
@@ -21,7 +21,12 @@ endif
 
 AM_CFLAGS = $(PYGIMP_EXTRA_CFLAGS)
 
-INCLUDES = -I$(top_srcdir) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTK_CFLAGS) $(GEGL_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)		\
+	$(PYTHON_INCLUDES)	\
+	$(PYGTK_CFLAGS)		\
+	$(GTK_CFLAGS)		\
+	$(GEGL_CFLAGS)
 
 pygimpbase = python
 
diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am
index e8352e5691..aacbd42c47 100644
--- a/plug-ins/script-fu/Makefile.am
+++ b/plug-ins/script-fu/Makefile.am
@@ -33,7 +33,7 @@ AM_CFLAGS = \
 	-DUSE_INTERFACE=1	\
 	-DUSE_STRLWR=0
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS)	\
diff --git a/plug-ins/selection-to-path/Makefile.am b/plug-ins/selection-to-path/Makefile.am
index 6785146871..b788ba445d 100644
--- a/plug-ins/selection-to-path/Makefile.am
+++ b/plug-ins/selection-to-path/Makefile.am
@@ -51,7 +51,7 @@ EXTRA_DIST = \
 	README		\
 	README.limn
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	$(GEGL_CFLAGS) \
diff --git a/plug-ins/twain/Makefile.am b/plug-ins/twain/Makefile.am
index 7abe073f21..8b24508092 100644
--- a/plug-ins/twain/Makefile.am
+++ b/plug-ins/twain/Makefile.am
@@ -53,10 +53,10 @@ EXTRA_DIST = \
 	tw_win.c	\
 	tw_mac.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
-	$(GEGL_CFLAGS) \
+	$(GEGL_CFLAGS)	\
 	-I$(includedir)
 
 LDADD = \
diff --git a/plug-ins/win-snap/Makefile.am b/plug-ins/win-snap/Makefile.am
index 57d6e49d5b..bd4d654707 100644
--- a/plug-ins/win-snap/Makefile.am
+++ b/plug-ins/win-snap/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = \
 	winsnap.ico	\
 	winsnap.rc
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	$(GTK_CFLAGS)		\
 	$(GEGL_CFLAGS)		\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b2e595e28e..7ca1d2c60a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -44,30 +44,28 @@ test_clipboard_LDADD = \
 	$(GTK_LIBS)
 
 AM_CPPFLAGS = \
-	-DGIMP_APP_VERSION=\"@GIMP_APP_VERSION@\"	\
-	-DLOCALEDIR=\""$(gimplocaledir)"\"		\
-	-DPREFIX=\""$(prefix)"\"			\
-	-DEXEC_PREFIX=\""$(exec_prefix)"\"		\
-	-DBINDIR=\""$(bindir)"\"			\
-	-DSBINDIR=\""$(sbindir)"\"			\
-	-DLIBEXECDIR=\""$(libexecdir)"\"		\
-	-DDATADIR=\""$(datadir)"\"			\
-	-DDATAROOTDIR=\""$(datarootdir)"\"		\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
-	-DSHAREDSTATEDIR=\""$(sharedstatedir)"\"	\
-	-DLOCALSTATEDIR=\""$(localstatedir)"\"		\
-	-DLIBDIR=\""$(libdir)"\"			\
-	-DINFODIR=\""$(infodir)"\"			\
-	-DMANDIR=\""$(mandir)"\"			\
-	-DGIMPPLUGINDIR=\""$(gimpplugindir)"\"		\
-	-DGIMPDATADIR=\""$(gimpdatadir)"\"		\
-	-DCC=\""$(CC)"\"				\
-	-DGIMPDIR=\""$(gimpdir)"\"			\
-	-DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"
-
-INCLUDES = \
-	-I$(top_srcdir)	\
-	$(GTK_CFLAGS)	\
+	-DGIMP_APP_VERSION=\"@GIMP_APP_VERSION@\"		\
+	-DLOCALEDIR=\""$(gimplocaledir)"\"			\
+	-DPREFIX=\""$(prefix)"\"				\
+	-DEXEC_PREFIX=\""$(exec_prefix)"\"			\
+	-DBINDIR=\""$(bindir)"\"				\
+	-DSBINDIR=\""$(sbindir)"\"				\
+	-DLIBEXECDIR=\""$(libexecdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	-DDATAROOTDIR=\""$(datarootdir)"\"			\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
+	-DSHAREDSTATEDIR=\""$(sharedstatedir)"\"		\
+	-DLOCALSTATEDIR=\""$(localstatedir)"\"			\
+	-DLIBDIR=\""$(libdir)"\"				\
+	-DINFODIR=\""$(infodir)"\"				\
+	-DMANDIR=\""$(mandir)"\"				\
+	-DGIMPPLUGINDIR=\""$(gimpplugindir)"\"			\
+	-DGIMPDATADIR=\""$(gimpdatadir)"\"			\
+	-DCC=\""$(CC)"\"					\
+	-DGIMPDIR=\""$(gimpdir)"\"				\
+	-DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"	\
+	-I$(top_srcdir)						\
+	$(GTK_CFLAGS)						\
 	-I$(includedir)
 
 EXTRA_DIST = \