diff --git a/lib/glib28/Makefile.am b/lib/glib28/Makefile.am
index a605024787..fc4b051822 100644
--- a/lib/glib28/Makefile.am
+++ b/lib/glib28/Makefile.am
@@ -13,6 +13,6 @@ endif
 
 libgnc_glib_la_LIBADD = ${GLIB26_LIBS}
 
-AM_CFLAGS = ${GLIB_CFLAGS}
+AM_CPPFLAGS = ${GLIB_CFLAGS}
 
 EXTRA_DIST = $(DUMMYSRCS) $(REALSRCS) $(REALHDRS)
diff --git a/lib/libc/Makefile.am b/lib/libc/Makefile.am
index 8e258904ef..74eabae943 100644
--- a/lib/libc/Makefile.am
+++ b/lib/libc/Makefile.am
@@ -18,7 +18,7 @@ LTLIBOBJS = $(shell echo "$(LIBOBJS)" | sed '@LIBOBJS_SEDSCRIPT@' | \
 libc_missing_la_LIBADD = $(LTLIBOBJS)
 
 if OS_WIN32
-  AM_CFLAGS = -DOS_WIN32
+  AM_CPPFLAGS = -DOS_WIN32
 endif
 
 # Not currently used.  If added to AC_REPLACE_FUNCS then this line
diff --git a/lib/libqof/backend/file/Makefile.am b/lib/libqof/backend/file/Makefile.am
index 70dda56885..adf3e92cc2 100644
--- a/lib/libqof/backend/file/Makefile.am
+++ b/lib/libqof/backend/file/Makefile.am
@@ -2,13 +2,13 @@ SUBDIRS = .
 
 pkglib_LTLIBRARIES = libgncqof-backend-qsf.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I.. -I../.. \
+  -I$(top_srcdir)/lib/libc \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
   ${QOF_CFLAGS} \
   ${LIBXML2_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  -I$(top_srcdir)/lib/libc
+  ${GLIB_CFLAGS}
 
 libgncqof_backend_qsf_la_SOURCES = \
   qsf-backend.c \
diff --git a/lib/libqof/qof/Makefile.am b/lib/libqof/qof/Makefile.am
index 6b22b3a975..2b9da97313 100644
--- a/lib/libqof/qof/Makefile.am
+++ b/lib/libqof/qof/Makefile.am
@@ -6,9 +6,9 @@ libgnc_qof_la_LIBADD= \
   $(REGEX_LIBS) \
   $(top_builddir)/lib/libc/libc-missing.la
 
-AM_CFLAGS = \
-  $(GLIB_CFLAGS) \
-  -I$(top_srcdir)/lib/libc
+AM_CPPFLAGS = \
+  -I$(top_srcdir)/lib/libc \
+  $(GLIB_CFLAGS)
 
 libgnc_qof_la_SOURCES =  \
    gnc-date.c        \
diff --git a/lib/stf/Makefile.am b/lib/stf/Makefile.am
index 1ed48c8fdf..91acf4f009 100644
--- a/lib/stf/Makefile.am
+++ b/lib/stf/Makefile.am
@@ -8,6 +8,6 @@ noinst_HEADERS = ${REALHDRS}
 
 libgnc_stf_la_LIBADD = $(GOFFICE_LIBS)
 
-AM_CFLAGS = $(GOFFICE_CFLAGS)
+AM_CPPFLAGS = $(GOFFICE_CFLAGS)
 
 EXTRA_DIST = $(REALSRCS) $(REALHDRS)
diff --git a/packaging/win32/Makefile.am b/packaging/win32/Makefile.am
index dfccd74cb7..cf93d30abb 100644
--- a/packaging/win32/Makefile.am
+++ b/packaging/win32/Makefile.am
@@ -19,7 +19,7 @@ if OS_WIN32
   bin_PROGRAMS = redirect
   redirect_SOURCES = redirect.c
   redirect_LDADD = $(GLIB_LIBS)
-  AM_CFLAGS = $(GLIB_CFLAGS)
+  AM_CPPFLAGS = $(GLIB_CFLAGS)
   pkgdata_DATA = Greek-4-5.1.11.isl
 else
   EXTRA_DIST += redirect.c
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index b5e0cee4df..83f31dcdfb 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-app-utils.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/libc \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
@@ -10,9 +10,9 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/calculation \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GCONF_CFLAGS} \
   ${GTK_CFLAGS}
 
diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am
index 065073a0b6..695e38c8aa 100644
--- a/src/app-utils/test/Makefile.am
+++ b/src/app-utils/test/Makefile.am
@@ -55,7 +55,7 @@ check_PROGRAMS = \
 EXTRA_DIST = \
   test-load-module
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
@@ -63,7 +63,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/core-utils \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GCONF_CFLAGS}
diff --git a/src/backend/file/Makefile.am b/src/backend/file/Makefile.am
index d2b7af325a..ecf2666b64 100644
--- a/src/backend/file/Makefile.am
+++ b/src/backend/file/Makefile.am
@@ -4,15 +4,15 @@ SUBDIRS = . test
 lib_LTLIBRARIES = libgnc-backend-xml-utils.la
 pkglib_LTLIBRARIES = libgncmod-backend-xml.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I.. -I../.. \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
   -I${top_srcdir}/src/backend \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/core-utils\
   -I${top_srcdir}/lib/libc\
-  ${LIBXML2_CFLAGS} \
   ${QOF_CFLAGS} \
+  ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS}
 
diff --git a/src/backend/file/test/Makefile.am b/src/backend/file/test/Makefile.am
index da5b80ac9e..bd4c3b550a 100644
--- a/src/backend/file/test/Makefile.am
+++ b/src/backend/file/test/Makefile.am
@@ -228,7 +228,7 @@ LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
         ${QOF_LIBS} \
         ${top_builddir}/lib/libc/libc-missing.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
@@ -238,9 +238,9 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine/test-core \
   -I${top_srcdir}/src/backend/file \
   -I${top_srcdir}/src/backend/qsf \
+  ${QOF_CFLAGS} \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GCONF_CFLAGS}
 
diff --git a/src/backend/postgres/Makefile.am b/src/backend/postgres/Makefile.am
index fb02894ffa..c0a265350d 100644
--- a/src/backend/postgres/Makefile.am
+++ b/src/backend/postgres/Makefile.am
@@ -2,14 +2,14 @@ SUBDIRS = . test
 
 lib_LTLIBRARIES = libgnc-backend-postgres.la 
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I.. -I../.. \
   -I../../engine \
   -I${srcdir}/../.. \
   -I${top_srcdir}/src/backend \
   -I${top_srcdir}/src/engine \
-  ${PGSQL_CFLAGS} \
   ${QOF_CFLAGS} \
+  ${PGSQL_CFLAGS} \
   ${GLIB_CFLAGS}
 
 libgnc_backend_postgres_la_LDFLAGS = -module -avoid-version
diff --git a/src/backend/postgres/test/Makefile.am b/src/backend/postgres/test/Makefile.am
index b8651513aa..ae4cad8183 100644
--- a/src/backend/postgres/test/Makefile.am
+++ b/src/backend/postgres/test/Makefile.am
@@ -61,7 +61,7 @@ test_escape_SOURCES = \
   ${top_srcdir}/src/backend/postgres/putil.c \
   test-escape.c
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   ${QOF_CFLAGS} \
   -I${top_srcdir}/src/test-core \
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index d575c6c069..6b649957b1 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,9 +1,7 @@
 # Order is important here.
 SUBDIRS = . overrides test
 
-AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
-  ${GUILE_INCS} \
-  ${QOF_CFLAGS} \
+AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
   -DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
   -DPKGDATADIR=\"${GNC_SHAREDIR}\" \
   -DGNC_HELPDIR=\"${GNC_HELPDIR}\" \
@@ -15,7 +13,9 @@ AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnome \
   -I${top_builddir}/src/gnome-utils \
-  -I${top_srcdir}/src/gnc-module
+  -I${top_srcdir}/src/gnc-module \
+  ${QOF_CFLAGS} \
+  ${GUILE_INCS}
 
 bin_PROGRAMS = gnucash-bin
 gnucash_bin_SOURCES = gnucash-bin.c
diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am
index 1f345a7aa3..ba175f4606 100644
--- a/src/business/business-core/Makefile.am
+++ b/src/business/business-core/Makefile.am
@@ -2,14 +2,14 @@ SUBDIRS = . sql test file
 
 pkglib_LTLIBRARIES = libgncmod-business-core.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} \
   ${QOF_CFLAGS} \
-  ${GLIB_CFLAGS} 
+  ${GUILE_INCS} \
+  ${GLIB_CFLAGS}
 
 libgncmod_business_core_la_SOURCES = \
   swig-business-core.c \
diff --git a/src/business/business-core/file/Makefile.am b/src/business/business-core/file/Makefile.am
index c1f088fad6..2641ff07fa 100644
--- a/src/business/business-core/file/Makefile.am
+++ b/src/business/business-core/file/Makefile.am
@@ -2,15 +2,15 @@ SUBDIRS = .
 
 pkglib_LTLIBRARIES = libgncmod-business-backend-xml.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/backend \
   -I${top_srcdir}/src/backend/file \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/business/business-core \
-  ${LIBXML2_CFLAGS} \
   ${QOF_CFLAGS} \
+  ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS}
 
 libgncmod_business_backend_xml_la_SOURCES = \
diff --git a/src/business/business-core/test/Makefile.am b/src/business/business-core/test/Makefile.am
index 100ea3a69c..98b7cf0804 100644
--- a/src/business/business-core/test/Makefile.am
+++ b/src/business/business-core/test/Makefile.am
@@ -1,13 +1,13 @@
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/business/business-core \
-  ${GUILE_INCS} \
   ${QOF_CFLAGS} \
-  ${GLIB_CFLAGS} 
+  ${GUILE_INCS} \
+  ${GLIB_CFLAGS}
 
 LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 744a8f6a5b..74654f239a 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . glade schemas ui
 
 pkglib_LTLIBRARIES = libgncmod-business-gnome.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/core-utils \
@@ -16,16 +16,16 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/business/business-core \
   -I${top_srcdir}/src/business/business-ledger \
   -I${top_srcdir}/src/business/dialog-tax-table \
+  -I${top_srcdir}/src/register/register-core \
+  -I${top_srcdir}/src/register/register-gnome \
+  -I${top_srcdir}/src/register/ledger-core \
+  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS} \
-  ${QOF_CFLAGS} \
-  -I${top_srcdir}/src/register/register-core \
-  -I${top_srcdir}/src/register/register-gnome \
-  -I${top_srcdir}/src/register/ledger-core
+  ${GUILE_INCS}
 
 libgncmod_business_gnome_la_SOURCES = \
   business-options-gnome.c \
diff --git a/src/business/business-ledger/Makefile.am b/src/business/business-ledger/Makefile.am
index 12e537cb0d..ea32a60473 100644
--- a/src/business/business-ledger/Makefile.am
+++ b/src/business/business-ledger/Makefile.am
@@ -32,7 +32,7 @@ libgnc_business_ledger_la_LIBADD = \
   ${QOF_LIBS} \
   ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src/business/business-core \
   -I${top_srcdir}/src/business/business-utils \
   -I${top_srcdir}/src/business/dialog-tax-table \
@@ -43,9 +43,9 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/register/register-core \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GLIB_CFLAGS}
 
diff --git a/src/business/business-utils/Makefile.am b/src/business/business-utils/Makefile.am
index 1c1fb386b9..ceb150b60a 100644
--- a/src/business/business-utils/Makefile.am
+++ b/src/business/business-utils/Makefile.am
@@ -1,15 +1,15 @@
 pkglib_LTLIBRARIES = libgncmod-business-utils.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/business/business-core \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS}
 
 libgncmod_business_utils_la_SOURCES = \
diff --git a/src/business/dialog-tax-table/Makefile.am b/src/business/dialog-tax-table/Makefile.am
index 9b2e82ce6f..7f1ddfec37 100644
--- a/src/business/dialog-tax-table/Makefile.am
+++ b/src/business/dialog-tax-table/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -8,12 +8,12 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/business/business-core \
+  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GUILE_INCS}
 
 libgncmod_dialog_tax_table_la_SOURCES = \
diff --git a/src/calculation/Makefile.am b/src/calculation/Makefile.am
index 5d27d580a6..16465142b0 100644
--- a/src/calculation/Makefile.am
+++ b/src/calculation/Makefile.am
@@ -28,10 +28,10 @@ EXTRA_DIST = \
   numeric_ops.c \
   numeric_ops.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} \
   ${QOF_CFLAGS} \
+  ${GUILE_INCS} \
   ${GLIB_CFLAGS}
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index 7c15805921..bd439d70a5 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -31,7 +31,7 @@ swig-core-utils.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	-I${top_srcdir}/src -o $@ $<
 endif
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS} \
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index a53bc2fe03..ca01c6f7be 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . test-core test
 
 pkglib_LTLIBRARIES = libgncmod-engine.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
 	-I${top_srcdir}/lib/libc \
 	-I${top_srcdir}/src/core-utils \
 	-I${top_srcdir}/src \
diff --git a/src/engine/test-core/Makefile.am b/src/engine/test-core/Makefile.am
index 3865458974..a836f73fa4 100644
--- a/src/engine/test-core/Makefile.am
+++ b/src/engine/test-core/Makefile.am
@@ -16,11 +16,11 @@ libgncmod_test_engine_la_LIBADD = \
 
 noinst_HEADERS=test-engine-stuff.h test-engine-strings.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
-  ${GLIB_CFLAGS} \
   ${QOF_CFLAGS} \
+  ${GLIB_CFLAGS} \
   ${GUILE_INCS}
diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index 29c8565a60..78a6c415c5 100644
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@@ -1,13 +1,13 @@
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir} \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/engine/test-core \
-  ${GUILE_INCS} \
   ${QOF_CFLAGS} \
+  ${GUILE_INCS} \
   ${GLIB_CFLAGS}
 
 LDADD = \
diff --git a/src/experimental/cgi-bin/Makefile.am b/src/experimental/cgi-bin/Makefile.am
index 5e128e694e..cb34c973e9 100644
--- a/src/experimental/cgi-bin/Makefile.am
+++ b/src/experimental/cgi-bin/Makefile.am
@@ -3,7 +3,7 @@
 
 bin_PROGRAMS = hello hello2 fastcgi-hello hello3 gnc-server
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
 	-I../../engine -I${srcdir}/../../engine \
 	-I../../backend/xml -I${srcdir}/../../backend/xml \
 	${GLIB_CFLAGS}
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 852d863b6f..7452d668f2 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -1,10 +1,11 @@
 SUBDIRS = . test
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
    -I${top_srcdir}/lib/libc \
    -I${top_srcdir}/src \
    -I${top_srcdir}/src/core-utils \
-   ${GLIB_CFLAGS} ${GUILE_INCS}
+   ${GLIB_CFLAGS} \
+   ${GUILE_INCS}
 
 lib_LTLIBRARIES = libgnc-module.la
 
diff --git a/src/gnc-module/test/Makefile.am b/src/gnc-module/test/Makefile.am
index 85846ad97a..2c798459f3 100644
--- a/src/gnc-module/test/Makefile.am
+++ b/src/gnc-module/test/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = mod-foo mod-bar mod-baz misc-mods
 
 LDADD = ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GUILE_INCS} \
diff --git a/src/gnc-module/test/misc-mods/Makefile.am b/src/gnc-module/test/misc-mods/Makefile.am
index 0aad6bcdb0..a7b3f5f055 100644
--- a/src/gnc-module/test/misc-mods/Makefile.am
+++ b/src/gnc-module/test/misc-mods/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GLIB_CFLAGS} \
diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am
index 3fb57db752..327614c5c1 100644
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GUILE_INCS} \
diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am
index 74f87a9155..6d63974455 100644
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/gnc-module/test/mod-foo \
diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am
index 839d5d95b5..f417f88531 100644
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS=\
+AM_CPPFLAGS=\
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GUILE_INCS} \
diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am
index 7866c49488..7062bce76a 100644
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = libgncmod-gnome-search.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -8,13 +8,13 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/business/business-core \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS}
+  ${GLIB_CFLAGS}
 
 libgncmod_gnome_search_la_SOURCES = \
   gncmod-gnome-search.c \
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index ef6754a5bb..47f740b0c3 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libgncmod-gnome-utils.la
 
 # Note that src/gnome-utils CANNOT depend on src/gnome!
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/engine \
@@ -219,7 +219,7 @@ EXTRA_DIST = \
   ${gncscm_DATA}
 
 if !GTKHTML_USES_GTKPRINT
-  AM_CFLAGS += ${GNOME_PRINT_CFLAGS}
+  AM_CPPFLAGS += ${GNOME_PRINT_CFLAGS}
   libgncmod_gnome_utils_la_LIBADD += ${GNOME_PRINT_LIBS}
 endif
 
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index 92e48d5177..3a220fa164 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -100,7 +100,7 @@ EXTRA_DIST = \
   gnucash.desktop.in \
   gnome.i
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/core-utils \
@@ -116,13 +116,13 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/report/report-system \
   -I${top_srcdir}/src/report/report-gnome \
   -I${top_srcdir}/lib/libc \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GNOME_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
-  $(GLIB_CFLAGS) \
-  ${QOF_CFLAGS}
+  $(GLIB_CFLAGS)
 
 # We build this in an earlier directory.
 
diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am
index db11d52f1e..cfdd04bbc9 100644
--- a/src/import-export/Makefile.am
+++ b/src/import-export/Makefile.am
@@ -58,7 +58,7 @@ glade_DATA = \
   generic-import.glade \
   import-provider-format.glade
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -66,13 +66,13 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
+  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
-  ${QOF_CFLAGS} \
-  ${GLIB_CFLAGS} 
+  ${GLIB_CFLAGS}
 
 EXTRA_DIST = \
   $(glade_DATA) \
diff --git a/src/import-export/binary-import/Makefile.am b/src/import-export/binary-import/Makefile.am
index a054c22a86..584783b704 100644
--- a/src/import-export/binary-import/Makefile.am
+++ b/src/import-export/binary-import/Makefile.am
@@ -2,17 +2,17 @@ SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-binary-import.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnome \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS}
 
 #FIXME remove the following deps
diff --git a/src/import-export/binary-import/test/Makefile.am b/src/import-export/binary-import/test/Makefile.am
index 1dfb5947af..5d55edb0f4 100644
--- a/src/import-export/binary-import/test/Makefile.am
+++ b/src/import-export/binary-import/test/Makefile.am
@@ -7,4 +7,4 @@ test_link_module_LDADD=../libgncmod-binary-import.la
 noinst_PROGRAMS = \
   test-link-module
 
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
diff --git a/src/import-export/csv/Makefile.am b/src/import-export/csv/Makefile.am
index 78354d30aa..fe11fd751a 100644
--- a/src/import-export/csv/Makefile.am
+++ b/src/import-export/csv/Makefile.am
@@ -26,11 +26,11 @@ libgncmod_csv_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/lib/stf/libgnc-stf.la \
   ${top_builddir}/lib/libc/libc-missing.la \
-  ${GOFFICE_LIBS} \
   ${QOF_LIBS} \
+  ${GOFFICE_LIBS} \
   ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -41,11 +41,11 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/import-export \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/lib \
+  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
   $(GOFFICE_CFLAGS)
 
diff --git a/src/import-export/hbci/Makefile.am b/src/import-export/hbci/Makefile.am
index d999610a7e..c2555ba836 100644
--- a/src/import-export/hbci/Makefile.am
+++ b/src/import-export/hbci/Makefile.am
@@ -58,7 +58,7 @@ libgncmod_hbci_la_LIBADD = \
   ${GLIB_LIBS} \
   ${AQBANKING_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -71,11 +71,11 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/register/register-gnome \
   -I${top_srcdir}/src/register/ledger-core \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${AQBANKING_CFLAGS}
 
diff --git a/src/import-export/log-replay/Makefile.am b/src/import-export/log-replay/Makefile.am
index f85481ef4c..07f8034ad2 100644
--- a/src/import-export/log-replay/Makefile.am
+++ b/src/import-export/log-replay/Makefile.am
@@ -22,7 +22,7 @@ libgncmod_log_replay_la_LIBADD = \
   ${GTK_LIBS} \
   ${GLIB_LIBS} ${QOF_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -31,11 +31,11 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
+  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
 uidir = $(GNC_UI_DIR)
diff --git a/src/import-export/ofx/Makefile.am b/src/import-export/ofx/Makefile.am
index 455d556c3b..ee6bc796bf 100644
--- a/src/import-export/ofx/Makefile.am
+++ b/src/import-export/ofx/Makefile.am
@@ -24,7 +24,7 @@ libgncmod_ofx_la_LIBADD = \
   ${GLIB_LIBS} \
   ${LIBOFX_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -33,11 +33,11 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
+  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${LIBOFX_CFLAGS} 
 
diff --git a/src/import-export/ofx/test/Makefile.am b/src/import-export/ofx/test/Makefile.am
index 99b2739140..a06429d295 100644
--- a/src/import-export/ofx/test/Makefile.am
+++ b/src/import-export/ofx/test/Makefile.am
@@ -1,6 +1,6 @@
 TESTS=test-link
 
-AM_CFLAGS=${LIBOFX_CFLAGS}
+AM_CPPFLAGS=${LIBOFX_CFLAGS}
 check_PROGRAMS=test-link
 
 test_link_SOURCES=test-link.c
diff --git a/src/import-export/qif-import/Makefile.am b/src/import-export/qif-import/Makefile.am
index 0f95894a14..3b506acbcc 100644
--- a/src/import-export/qif-import/Makefile.am
+++ b/src/import-export/qif-import/Makefile.am
@@ -51,7 +51,7 @@ gncscm_DATA = \
 gladedir = ${GNC_GLADE_DIR}
 glade_DATA = qif.glade
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/core-utils \
@@ -61,12 +61,12 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GTKHTML_CFLAGS}
 
 uidir = $(GNC_UI_DIR)
diff --git a/src/import-export/qif-io-core/Makefile.am b/src/import-export/qif-io-core/Makefile.am
index 151c7b1309..dee605045f 100644
--- a/src/import-export/qif-io-core/Makefile.am
+++ b/src/import-export/qif-io-core/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-qifiocore.la
 
-AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 
 libgncmod_qifiocore_la_SOURCES = gncmod-qifiocore.c
 
diff --git a/src/import-export/qif-io-core/test/Makefile.am b/src/import-export/qif-io-core/test/Makefile.am
index 41c40541c1..90207630ff 100644
--- a/src/import-export/qif-io-core/test/Makefile.am
+++ b/src/import-export/qif-io-core/test/Makefile.am
@@ -1,6 +1,6 @@
 LDADD=${top_builddir}/src/gnc-module/libgnc-module.la ${GLIB_LIBS}
 
-AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS} 
+AM_CPPFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 
 TESTS=test-load-module test-parser test-reader test-file-formats \
 test-import-phase-1
diff --git a/src/import-export/qif/Makefile.am b/src/import-export/qif/Makefile.am
index 9ef988da84..0e75658ac3 100644
--- a/src/import-export/qif/Makefile.am
+++ b/src/import-export/qif/Makefile.am
@@ -26,15 +26,15 @@ libgncmod_qif_la_LIBADD = \
   ${REGEX_LIBS} \
   ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/import-export \
+  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS} \
-  ${QOF_CFLAGS}
+  ${GUILE_INCS}
 
 
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif\"
diff --git a/src/import-export/qif/test/Makefile.am b/src/import-export/qif/test/Makefile.am
index 9ebdf5524d..d8393ea0bd 100644
--- a/src/import-export/qif/test/Makefile.am
+++ b/src/import-export/qif/test/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
@@ -6,9 +6,9 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/import-export \
   -I${top_srcdir}/src/import-export/qif \
-  ${GUILE_INCS} \
   ${QOF_CFLAGS} \
-  ${GLIB_CFLAGS} 
+  ${GUILE_INCS} \
+  ${GLIB_CFLAGS}
 
 LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am
index 48086e14bc..70c5780a34 100644
--- a/src/import-export/test/Makefile.am
+++ b/src/import-export/test/Makefile.am
@@ -1,12 +1,12 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/import-export \
-  ${GUILE_INCS} \
   ${QOF_CFLAGS} \
+  ${GUILE_INCS} \
   ${GLIB_CFLAGS}
 
 LDADD = \
diff --git a/src/register/ledger-core/Makefile.am b/src/register/ledger-core/Makefile.am
index d9e798a277..8808af8765 100644
--- a/src/register/ledger-core/Makefile.am
+++ b/src/register/ledger-core/Makefile.am
@@ -40,7 +40,7 @@ libgncmod_ledger_core_la_LIBADD = \
   ${QOF_LIBS} \
   ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
@@ -49,10 +49,10 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/register/register-gnome \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
 
diff --git a/src/register/ledger-core/test/Makefile.am b/src/register/ledger-core/test/Makefile.am
index 3fc7845463..1dd1ae982b 100644
--- a/src/register/ledger-core/test/Makefile.am
+++ b/src/register/ledger-core/test/Makefile.am
@@ -5,4 +5,4 @@ check_PROGRAMS = test-link-module
 test_link_module_SOURCES=test-link-module.c
 test_link_module_LDADD=../libgncmod-ledger-core.la
 
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
diff --git a/src/register/register-core/Makefile.am b/src/register/register-core/Makefile.am
index 8b76ba3ab6..a4e9323ddb 100644
--- a/src/register/register-core/Makefile.am
+++ b/src/register/register-core/Makefile.am
@@ -51,16 +51,16 @@ gncinclude_HEADERS = \
   table-layout.h \
   table-model.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/gnome-utils \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/register/register-core/test/Makefile.am b/src/register/register-core/test/Makefile.am
index 34b071250e..978a636f5e 100644
--- a/src/register/register-core/test/Makefile.am
+++ b/src/register/register-core/test/Makefile.am
@@ -19,4 +19,4 @@ test_link_module_LDADD= \
 
 #EXTRA_DIST = test-load-module
 
-AM_CFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
+AM_CPPFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
diff --git a/src/register/register-gnome/Makefile.am b/src/register/register-gnome/Makefile.am
index 2d57b12587..bf67132e41 100644
--- a/src/register/register-gnome/Makefile.am
+++ b/src/register/register-gnome/Makefile.am
@@ -50,7 +50,7 @@ noinst_HEADERS = \
   quickfillcell-gnome.h \
   table-gnome.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -59,11 +59,11 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/register/ledger-core \
   -I${top_srcdir}/src/register/register-core \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_XIM_FLAGS} \
-  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS}
 
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.gnome\"
diff --git a/src/register/register-gnome/test/Makefile.am b/src/register/register-gnome/test/Makefile.am
index 4ac23d4a45..ab18642e2a 100644
--- a/src/register/register-gnome/test/Makefile.am
+++ b/src/register/register-gnome/test/Makefile.am
@@ -19,4 +19,4 @@ test_link_module_LDADD = \
 
 #EXTRA_DIST = test-load-module
 
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am
index ef2e0ca894..ae078465f7 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@@ -13,7 +13,7 @@ libgncmod_locale_reports_us_la_LIBADD = \
   ${GLIB_LIBS} 
 
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GUILE_INCS} ${GLIB_CFLAGS}
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 4fa2975463..33acdfe5de 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-report-gnome.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/core-utils \
@@ -12,11 +12,11 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/report/report-system \
+  ${QOF_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GUILE_INCS} \
   ${GTKHTML_CFLAGS} \
   ${GNOME_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
 libgncmod_report_gnome_la_SOURCES = \
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index afbd9cc431..a0f04c8390 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -25,7 +25,7 @@ swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
 	-I${top_srcdir}/src -o $@ $<
 endif
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/app-utils \
diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am
index 223b38248b..028348a5b3 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@@ -12,7 +12,7 @@ libgncmod_standard_reports_la_LIBADD = \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GUILE_INCS} ${GLIB_CFLAGS}
diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am
index 0d825a569b..0a162be5e8 100644
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@@ -20,16 +20,16 @@ libgncmod_stylesheets_la_LIBADD = \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/report/report-gnome \
+  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS}
 
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am
index 532e0359ee..750049ea6b 100644
--- a/src/report/utility-reports/Makefile.am
+++ b/src/report/utility-reports/Makefile.am
@@ -11,7 +11,7 @@ libgncmod_utility_reports_la_LIBADD = \
 
 libgncmod_utility_reports_la_LDFLAGS = -module -avoid-version
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GUILE_INCS} ${GLIB_CFLAGS}
diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am
index 2020163983..536925e1c1 100644
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@@ -11,7 +11,7 @@ libgncmod_tax_us_la_LIBADD = \
  ${GUILE_LIBS} \
  ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GLIB_CFLAGS} ${GUILE_INCS}
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index 11e0a5865d..702210572d 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -8,7 +8,7 @@ libgncmod_test_la_LIBADD = \
 
 noinst_HEADERS=test-stuff.h
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GLIB_CFLAGS} \