diff -Nurd -x'*~' passepartout-0.7.0.orig/src/fonts/Makefile.am passepartout-0.7.0/src/fonts/Makefile.am
--- passepartout-0.7.0.orig/src/fonts/Makefile.am	2007-06-13 07:05:06.000000000 -0400
+++ passepartout-0.7.0/src/fonts/Makefile.am	2007-08-07 19:11:04.000000000 -0400
@@ -5,9 +5,9 @@
 
 libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
 
-libfonts_a_CXXFLAGS = -I$(top_srcdir)/src
+libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
 
 # for Glib::ustring
-libfonts_a_CXXFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
 
 #libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
\ No newline at end of file
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/Makefile.am passepartout-0.7.0/src/pptout/Makefile.am
--- passepartout-0.7.0.orig/src/pptout/Makefile.am	2007-07-26 07:31:05.000000000 -0400
+++ passepartout-0.7.0/src/pptout/Makefile.am	2007-08-07 19:14:51.000000000 -0400
@@ -32,10 +32,10 @@
 		$(BUILT_SOURCES) \
 		$(NULL)
 
-passepartout_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
-	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
+passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
 
-passepartout_CXXFLAGS += -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
+passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
+	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
 
 passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
 		$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/document/Makefile.am passepartout-0.7.0/src/pptout/document/Makefile.am
--- passepartout-0.7.0.orig/src/pptout/document/Makefile.am	2007-06-13 07:05:06.000000000 -0400
+++ passepartout-0.7.0/src/pptout/document/Makefile.am	2007-08-07 19:15:12.000000000 -0400
@@ -10,6 +10,6 @@
 	textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc	\
 	loader.cc typesetterthread.cc
 
-libdocument_a_CXXFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
+libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
 
-libdocument_a_CXXFLAGS += -I$(top_srcdir)/src
+libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/widget/Makefile.am passepartout-0.7.0/src/pptout/widget/Makefile.am
--- passepartout-0.7.0.orig/src/pptout/widget/Makefile.am	2007-06-14 06:17:20.000000000 -0400
+++ passepartout-0.7.0/src/pptout/widget/Makefile.am	2007-08-07 19:29:32.000000000 -0400
@@ -8,6 +8,6 @@
 		dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc	\
 		usererror.cc programs.cc zoomer.cc
 
-libwidget_a_CXXFLAGS = $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
+libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
 
-libwidget_a_CXXFLAGS += -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
+libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/ps/Makefile.am passepartout-0.7.0/src/ps/Makefile.am
--- passepartout-0.7.0.orig/src/ps/Makefile.am	2007-06-13 07:48:09.000000000 -0400
+++ passepartout-0.7.0/src/ps/Makefile.am	2007-08-07 19:26:30.000000000 -0400
@@ -9,12 +9,12 @@
 
 examinepdf_SOURCES = examinepdf.cc
 
-# for Glib::ustring
-libps_a_CXXFLAGS = $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+libps_a_CPPFLAGS = -I$(top_srcdir)/src
 
-libps_a_CXXFLAGS += -I$(top_srcdir)/src
+# for Glib::ustring
+libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
 
-examinepdf_CXXFLAGS = $(libps_a_CXXFLAGS)
+examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
 examinepdf_LDADD = $(GTKMM_LIBS) \
 	-L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
 examinepdf_DEPENDENCIES = libps.a
@@ -24,8 +24,8 @@
 TESTS = runtest
 check_PROGRAMS = runtest
 runtest_SOURCES = test_glyphlist.cc
-runtest_CXXFLAGS = -I$(top_srcdir)/src
-runtest_CXXFLAGS += $(GTKMM_CFLAGS)
+runtest_CPPFLAGS = -I$(top_srcdir)/src
+runtest_CPPFLAGS += $(GTKMM_CFLAGS)
 runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
 runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
 		$(GTKMM_LIBS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/testbed/Makefile.am passepartout-0.7.0/src/testbed/Makefile.am
--- passepartout-0.7.0.orig/src/testbed/Makefile.am	2007-06-13 07:05:07.000000000 -0400
+++ passepartout-0.7.0/src/testbed/Makefile.am	2007-08-07 19:17:57.000000000 -0400
@@ -4,8 +4,8 @@
 
 libppttest_a_SOURCES = testbed.cc
 
-libppttest_a_CXXFLAGS = -I$(top_srcdir)/src
+libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
 
 # Just because Glib::Exception is stupid and doesn't inherit the standard
 # exception the testbed has to know about glib!
-libppttest_a_CXXFLAGS += $(GTKMM_CFLAGS)
+libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/util/Makefile.am passepartout-0.7.0/src/util/Makefile.am
--- passepartout-0.7.0.orig/src/util/Makefile.am	2007-06-14 06:12:42.000000000 -0400
+++ passepartout-0.7.0/src/util/Makefile.am	2007-08-07 19:18:50.000000000 -0400
@@ -12,12 +12,12 @@
 	cmdline.cc xmlwrap.cc
 
 # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
-CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
+AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
 
 TESTS =	runtest
 check_PROGRAMS = runtest
 runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
 	test_boundary.cc test_procio.cc test_cmdline.cc
-runtest_CXXFLAGS = -I$(top_srcdir)/src
+runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
 runtest_DEPENDENCIES = $(noinst_LIBRARIES)
 runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/xml2ps/Makefile.am passepartout-0.7.0/src/xml2ps/Makefile.am
--- passepartout-0.7.0.orig/src/xml2ps/Makefile.am	2007-06-22 12:07:26.000000000 -0400
+++ passepartout-0.7.0/src/xml2ps/Makefile.am	2007-08-07 19:36:26.000000000 -0400
@@ -13,12 +13,12 @@
 
 xml2ps_SOURCES = main.cc
 
-libxml2ps_a_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
-		$(GNOMECANVAS_CFLAGS)
+libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
 
-libxml2ps_a_CXXFLAGS += -I$(top_srcdir)/src
+libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
+		$(GNOMECANVAS_CFLAGS)
 
-xml2ps_CXXFLAGS = $(libxml2ps_a_CXXFLAGS)
+xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
 
 xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
 	libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a