diff --git a/configure.ac b/configure.ac
index d02800290fd6db6ecb741da9c37655584e04ceed_Y29uZmlndXJlLmFj..67d58e68270e638c5ca7cfc429432a8059a50071_Y29uZmlndXJlLmFj 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,6 +337,6 @@
 if test "${GCC}" != "yes" ; then
     case "${host}" in
           *-*-hpux* )
-	       CFLAGS="${CFLAGS} -Wp,-H30000"
+	       AM_CFLAGS="${AM_CFLAGS} -Wp,-H30000"
 	       ;;
           *-dec-osf* )
@@ -341,6 +341,6 @@
 	       ;;
           *-dec-osf* )
-               CFLAGS="${CFLAGS} -ieee"
+               AM_CFLAGS="${AM_CFLAGS} -ieee"
                ;;
     esac
 else
@@ -344,6 +344,6 @@
                ;;
     esac
 else
-    CFLAGS="${CFLAGS} -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
+    AM_CFLAGS="${AM_CFLAGS} -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
     case "${host}" in
           alpha*-*-linux* )
@@ -348,5 +348,5 @@
     case "${host}" in
           alpha*-*-linux* )
-	       CFLAGS="${CFLAGS} -mieee"
+	       AM_CFLAGS="${AM_CFLAGS} -mieee"
 	       ;;
 	  alpha*-*-osf* )
@@ -351,6 +351,6 @@
 	       ;;
 	  alpha*-*-osf* )
-	       CFLAGS="${CFLAGS} -mieee"
+	       AM_CFLAGS="${AM_CFLAGS} -mieee"
 	       ;;
     esac
 fi
@@ -443,6 +443,8 @@
 	AC_MSG_ERROR([Could not find libxml2 anywhere.])
 fi
 
+AM_CFLAGS="$AM_CFLAGS $LIBXML_CFLAGS"
+
 
 AC_ARG_WITH(plugins,
 [  --with-plugins          Add plugin extension support (on)])
@@ -508,9 +510,9 @@
 case ${host} in
     *-*-mingw* | *-*-cygwin* | *-*-msvc* )
         # If the host is Windows, and shared libraries are disabled, we
-        # need to add -DLIBXML_STATIC to EXTRA_CFLAGS in order for linking to
+        # need to add -DLIBXML_STATIC to AM_CFLAGS in order for linking to
         # work properly (without it, xmlexports.h would force the use of
         # DLL imports, which obviously aren't present in a static
         # library).
         if test "x$enable_shared" = "xno"; then
            LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -DLIBXSLT_STATIC -DLIBEXSLT_STATIC"
@@ -512,10 +514,11 @@
         # work properly (without it, xmlexports.h would force the use of
         # DLL imports, which obviously aren't present in a static
         # library).
         if test "x$enable_shared" = "xno"; then
            LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -DLIBXSLT_STATIC -DLIBEXSLT_STATIC"
+           AM_CFLAGS="$AM_CFLAGS -DLIBXSLT_STATIC -DLIBEXSLT_STATIC"
         fi
         ;;
 esac
 AC_SUBST(LIBXSLT_CFLAGS)
 
@@ -517,8 +520,10 @@
         fi
         ;;
 esac
 AC_SUBST(LIBXSLT_CFLAGS)
 
+AC_SUBST(AM_CFLAGS)
+
 EXSLT_LIBDIR='-L${libdir}'
 EXSLT_INCLUDEDIR='-I${includedir}'
 EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS"
diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am
index d02800290fd6db6ecb741da9c37655584e04ceed_bGliZXhzbHQvTWFrZWZpbGUuYW0=..67d58e68270e638c5ca7cfc429432a8059a50071_bGliZXhzbHQvTWFrZWZpbGUuYW0= 100644
--- a/libexslt/Makefile.am
+++ b/libexslt/Makefile.am
@@ -2,8 +2,6 @@
 	      -I$(top_builddir) -I$(top_builddir)/libxslt \
 	      -I$(top_builddir)/libexslt
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
-
 lib_LTLIBRARIES = libexslt.la
 
 exsltincdir = $(includedir)/libexslt
@@ -27,6 +25,7 @@
 	libexslt.h			\
 	dynamic.c
 
+libexslt_la_CFLAGS = $(AM_CFLAGS) $(LIBGCRYPT_CFLAGS)
 libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(LIBM)
 libexslt_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \
 		      -version-info $(LIBEXSLT_VERSION_INFO)
diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am
index d02800290fd6db6ecb741da9c37655584e04ceed_bGlieHNsdC9NYWtlZmlsZS5hbQ==..67d58e68270e638c5ca7cfc429432a8059a50071_bGlieHNsdC9NYWtlZmlsZS5hbQ== 100644
--- a/libxslt/Makefile.am
+++ b/libxslt/Makefile.am
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxslt
 
-AM_CFLAGS = $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
-
 lib_LTLIBRARIES = libxslt.la
 
 xsltincdir = $(includedir)/libxslt
diff --git a/python/Makefile.am b/python/Makefile.am
index d02800290fd6db6ecb741da9c37655584e04ceed_cHl0aG9uL01ha2VmaWxlLmFt..67d58e68270e638c5ca7cfc429432a8059a50071_cHl0aG9uL01ha2VmaWxlLmFt 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -18,8 +18,8 @@
 libxsltmod_la_CPPFLAGS = \
 	-I$(top_srcdir)/libxslt \
 	-I$(top_srcdir) \
-	-I../libexslt \
-	$(PYTHON_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+	-I../libexslt
+libxsltmod_la_CFLAGS = $(AM_CFLAGS) $(PYTHON_CFLAGS)
 libxsltmod_la_SOURCES = libxslt.c types.c
 nodist_libxsltmod_la_SOURCES = libxslt-py.c
 libxsltmod_la_LIBADD = \
diff --git a/tests/fuzz/Makefile.am b/tests/fuzz/Makefile.am
index d02800290fd6db6ecb741da9c37655584e04ceed_dGVzdHMvZnV6ei9NYWtlZmlsZS5hbQ==..67d58e68270e638c5ca7cfc429432a8059a50071_dGVzdHMvZnV6ei9NYWtlZmlsZS5hbQ== 100644
--- a/tests/fuzz/Makefile.am
+++ b/tests/fuzz/Makefile.am
@@ -6,7 +6,6 @@
 EXTRA_DIST = xpath.dict xpath.xml xslt.dict xslt.xml seed
 CLEANFILES = $(EXTRA_PROGRAMS)
 AM_CPPFLAGS = -I$(top_srcdir)
-AM_CFLAGS = $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 DEPENDENCIES = $(LIBXSLT_LIBS)
 LDADD = $(LIBXSLT_LIBS) \
         $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBM)
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index d02800290fd6db6ecb741da9c37655584e04ceed_dGVzdHMvcGx1Z2lucy9NYWtlZmlsZS5hbQ==..67d58e68270e638c5ca7cfc429432a8059a50071_dGVzdHMvcGx1Z2lucy9NYWtlZmlsZS5hbQ== 100644
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -18,7 +18,7 @@
 
 plugindir = $(abs_builddir)/.libs
 
-xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+xmlsoft_org_xslt_testplugin_la_CFLAGS = $(AM_CFLAGS) -DMODULE_COMPILE
 xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
 xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
 xmlsoft_org_xslt_testplugin_la_LDFLAGS = \
diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am
index d02800290fd6db6ecb741da9c37655584e04ceed_eHNsdHByb2MvTWFrZWZpbGUuYW0=..67d58e68270e638c5ca7cfc429432a8059a50071_eHNsdHByb2MvTWFrZWZpbGUuYW0= 100644
--- a/xsltproc/Makefile.am
+++ b/xsltproc/Makefile.am
@@ -7,8 +7,6 @@
 
 noinst_PROGRAMS=testThreads
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
-
 xsltproc_SOURCES = xsltproc.c
 xsltproc_LDFLAGS = 
 xsltproc_DEPENDENCIES = $(DEPS)