diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 64d95fe80..99606d3bc 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -84,7 +84,7 @@ IGNORE_HFILES = \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = 				\
 	$(gio_INCLUDES)			\
 	$(GLIB_DEBUG_FLAGS)
 
diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
index 90c10aa23..53acd515f 100644
--- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am
+++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
@@ -17,16 +17,16 @@ HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
 CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
 
 # Headers to ignore
-IGNORE_HFILES=				\
+IGNORE_HFILES =				\
 	$(NULL)
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = 				\
 	$(gio_INCLUDES)			\
 	$(GLIB_DEBUG_FLAGS)
 
-GTKDOC_LIBS = \
+GTKDOC_LIBS = 						\
 	$(top_builddir)/glib/libglib-2.0.la		\
 	$(top_builddir)/gobject/libgobject-2.0.la	\
 	$(top_builddir)/gmodule/libgmodule-2.0.la	\
diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index 48d88f80c..dd8946468 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -33,11 +33,12 @@ IGNORE_HFILES = \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = 				\
 	-I$(srcdir) 			\
 	$(gobject_INCLUDES) 		\
 	$(GLIB_DEBUG_FLAGS)
-GTKDOC_LIBS = \
+
+GTKDOC_LIBS = 					\
 	$(top_builddir)/glib/libglib-2.0.la	\
 	$(top_builddir)/gobject/libgobject-2.0.la
 
diff --git a/gio/gdbus-2.0/codegen/Makefile.am b/gio/gdbus-2.0/codegen/Makefile.am
index 5111487cb..1afdaf08b 100644
--- a/gio/gdbus-2.0/codegen/Makefile.am
+++ b/gio/gdbus-2.0/codegen/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.decl
 NULL =
 bin_SCRIPTS =
 CLEANFILES =
-EXTRA_DIST =
 
 codegendir = $(datadir)/glib-2.0/codegen
 codegen_PYTHON =						\
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index d33b7f0e5..1f8e2cb92 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -6,14 +6,14 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gdbus-object-manager-example services
 
-INCLUDES = 			\
-	-DG_LOG_DOMAIN=\"GLib-GIO\" \
-	$(gio_INCLUDES)		\
-	$(GLIB_DEBUG_FLAGS)	\
-	-I$(top_builddir)/gio	\
-	-I$(top_srcdir)/gio	\
-	$(DBUS1_CFLAGS)		\
-	-DSRCDIR=\""$(srcdir)"\" \
+AM_CPPFLAGS = 				\
+	-DG_LOG_DOMAIN=\"GLib-GIO\" 	\
+	$(gio_INCLUDES)			\
+	$(GLIB_DEBUG_FLAGS)		\
+	-I$(top_builddir)/gio		\
+	-I$(top_srcdir)/gio		\
+	$(DBUS1_CFLAGS)			\
+	-DSRCDIR=\""$(srcdir)"\" 	\
 	-DTEST_SERVICES=\""$(abs_top_builddir)/gio/tests/services"\"
 
 
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
index 9861d0e08..6875210a6 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -4,7 +4,7 @@ CLEANFILES =
 
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-g 			\
 	$(gio_INCLUDES)		\
 	$(GLIB_DEBUG_FLAGS)	\
diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am
index 8ad4889b2..03e1d1860 100644
--- a/glib/gnulib/Makefile.am
+++ b/glib/gnulib/Makefile.am
@@ -1,8 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = $(glib_INCLUDES) -DG_LOG_DOMAIN=\"GLib\" \
-	$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
+AM_CPPFLAGS = 				\
+	$(glib_INCLUDES) 		\
+	-DG_LOG_DOMAIN=\"GLib\" 	\
+	$(GLIB_DEBUG_FLAGS) 		\
+	-DG_DISABLE_DEPRECATED 		\
+	-DGLIB_COMPILATION
 
 noinst_LTLIBRARIES = libgnulib.la
 
diff --git a/glib/libcharset/Makefile.am b/glib/libcharset/Makefile.am
index 0dd4f50b6..fb9a9785b 100644
--- a/glib/libcharset/Makefile.am
+++ b/glib/libcharset/Makefile.am
@@ -1,8 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 			\
-	-DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
+AM_CPPFLAGS = 				\
+	-DLIBDIR=\"$(libdir)\" 		\
+	$(config_h_INCLUDES)
 
 noinst_LTLIBRARIES = libcharset.la
 
diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am
index 212cbda60..28bd09dc6 100644
--- a/gobject/tests/Makefile.am
+++ b/gobject/tests/Makefile.am
@@ -1,9 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS = 					\
-	-DG_LOG_DOMAIN=\"GLib-GObject\"
-
-INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
+	-g					\
+	-DG_LOG_DOMAIN=\"GLib-GObject\"		\
+	$(gobject_INCLUDES)			\
+	$(GLIB_DEBUG_FLAGS)
 
 if CROSS_COMPILING
   glib_genmarshal=$(GLIB_GENMARSHAL)
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 9679e050b..e766b7a87 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	$(gmodule_INCLUDES)			\
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS	\
 	$(GLIB_DEBUG_FLAGS)
diff --git a/tests/refcount/Makefile.am b/tests/refcount/Makefile.am
index 3a7f8f5bf..34daca656 100644
--- a/tests/refcount/Makefile.am
+++ b/tests/refcount/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	$(gmodule_INCLUDES) 			\
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS	\
 	$(GLIB_DEBUG_FLAGS)