Fix namespaces and inclusion directories.

* README-hacking: Update.
* configure.ac (MU_COMMON_INCLUDES): Remove.
(MU_LIB_COMMON_INCLUDES,MU_APP_COMMON_INCLUDES): New variables.
Link lib/gettext.h and lib.intprops.h to include.
* gnulib.modules: Remove fnmatch.
* comsat/Makefile.am, config/Makefile.am,
dotlock/Makefile.am, frm/Makefile.am,
guimb/Makefile.am, imap4d/Makefile.am,
maidag/Makefile.am, mail/Makefile.am,
movemail/Makefile.am, pop3d/Makefile.am,
python/libmu_py/Makefile.am, readmsg/Makefile.am
sieve/Makefile.am (INCLUDES): Use MU_APP_COMMON_INCLUDES
* lib/Makefile.am, examples/Makefile.am,
libmu_argp/Makefile.am, libmu_auth/Makefile.am,
libmu_cpp/Makefile.am, libmu_sieve/Makefile.am,
libproto/imap/Makefile.am, libproto/mailer/Makefile.am,
libproto/mh/Makefile.am, libproto/nntp/Makefile.am,
libproto/pop/Makefile.am, mailbox/Makefile.am,
mapi/Makefile.am, messages/Makefile.am,
mh/Makefile.am, sql/Makefile.am (INCLUDES): Use MU_LIB_COMMON_INCLUDES

@@ -32,13 +32,6 @@ which are extracted from other source packages:
 
    ./bootstrap 
 
-Notice that at the one of its final stages, bootstrap may spit out
-several warnings like:
-
-pop3d_OBJECTS:.$(OBJEXT: non-POSIX variable name
-
-Ignore them, these are due to the bug in automake.
-   
 Once done, proceed as described in the file README (section
 INSTALLATION).
 
@@ -59,7 +52,7 @@ For more information about `bootstrap', run `bootstrap --help'.
 
 * Copyright information
 
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
  Permission is granted to anyone to make or distribute verbatim copies
  of this document as received, in any medium, provided that the

 ## Process this file with GNU Automake to create Makefile.in
 
-##   Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc.
+##   Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
 ##   modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 sbin_PROGRAMS = comsatd
 
@@ -35,10 +35,3 @@ comsatd_LDADD = \
  ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
-CFLOW_FLAGS=-i^s --brief -v
-comsatd_CFLOW_INPUT=$(comsatd_OBJECTS:.$(OBJEXT)=.c)
-comsatd.cflow: $(comsatd_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(comsatd_CFLOW_INPUT)

@@ -17,7 +17,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 bin_PROGRAMS = mailutils-config
 

@@ -60,7 +60,18 @@ AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
 AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.la')
 
-AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
+# There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used
+# by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications.
+# The principal difference between them is that the latter contains gnulib
+# directory.
+#
+# Libraries are isolated from gnulib and are not allowed to include its
+# header files. There are two exceptions, though. See NOTE before the
+# AC_CONFIG_LINKS statements, below.
+
+AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include  -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libproto/include')
+
+AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
 
 dnl Check for programs
 AC_PROG_CC
@@ -99,6 +110,17 @@ AC_CHECK_TYPE(iconv_t,:,
 #endif
 ])
 
+# NOTE: Generally speaking, Mailutils libraries are not allowed to include
+# gnulib headers.  The only exceptions are: gettext.h, which is needed for
+# proper i18n, and intprops.h, which is used in mailbox/cfg_parser.y.
+# This latter will probably be rewritten to remove the need for intprops.h.
+#
+# To make these two headers accessible for the libraries, they are linked
+# to include/.
+#
+AC_CONFIG_LINKS(include/gettext.h:lib/gettext.h)
+AC_CONFIG_LINKS(include/intprops.h:lib/intprops.h)
+
 AH_BOTTOM([
 #define DEFAULT_TEXT_DOMAIN PACKAGE
 ])

 ## Process this file with GNU Automake to create Makefile.in
 
-##   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+##   Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
 ##   modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 bin_PROGRAMS = dotlock
 

@@ -52,7 +52,7 @@ noinst_PROGRAMS = \
 moddir=@MU_SIEVE_MODDIR@
 mod_LTLIBRARIES = numaddr.la
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 
 LDADD = \
  ../lib/libmuaux.la\

@@ -33,7 +33,7 @@ MU_CXX_EXAMPLES_LIST = \
 EXTRA_PROGRAMS=$(MU_CXX_EXAMPLES_LIST)
 noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 
 AM_LDFLAGS = \
  ../../lib/libmuaux.la\

@@ -18,7 +18,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 SUBDIRS = testsuite
 
@@ -42,10 +42,3 @@ common_ldadd = \
  ${MU_LIB_MAILUTILS}\
  @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
 
-CFLOW_FLAGS=-i^s --brief -v
-frm_CFLOW_INPUT=$(frm_OBJECTS:.$(OBJEXT)=.c)
-frm.cflow: $(frm_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(frm_CFLOW_INPUT)

 # List of gnulib modules needed for GNU mailutils.
 # A module name per line. Empty lines and comments are ignored.
 
-# FIXME: regex and glob are used by libmailutils...
+# FIXME: fnmatch, regex and glob are used by libmailutils...
 
 alloca
 autobuild
 argp
 crypto/des
-fnmatch
 getline
 getpass-gnu
 gettext

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ 
 
 SUBDIRS=scm
 

@@ -18,7 +18,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@ 
 SUBDIRS = testsuite
 
 sbin_PROGRAMS =	imap4d
@@ -86,11 +86,3 @@ imap4d_DEPENDENCIES = \
  ${MU_LIB_MAILUTILS}
 
 EXTRA_DIST=auth_gss.c auth_gsasl.c
-
-CFLOW_FLAGS=-i^s --brief 
-imap4d_CFLOW_INPUT=$(imap4d_OBJECTS:.$(OBJEXT)=.c)
-imap4d.cflow: $(imap4d_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(imap4d_CFLOW_INPUT)

@@ -20,7 +20,7 @@
 
 include gnulib.mk
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 
 libmuaux_la_SOURCES += \
  daemon.c\

@@ -16,7 +16,9 @@
 # Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+# This library uses gnulib calls and is always linked with gnulib, therefore
+# we use application includes here.
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 AM_CPPFLAGS = \
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
             -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 

@@ -16,7 +16,7 @@
 # Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
             -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 
 MU_CXX_LTLIBRARIES_LIST = libmu_cpp.la
 lib_LTLIBRARIES = @MU_CXX_LTLIBRARIES_BUILD@

@@ -18,7 +18,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = -I. @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ 
+INCLUDES = -I. @MU_LIB_COMMON_INCLUDES@ @GUILE_INCLUDES@ 
 
 MU_SCM_LTLIBRARIES_LIST = libmu_scm.la
 lib_LTLIBRARIES=@MU_SCM_LTLIBRARIES_BUILD@
@@ -133,10 +133,3 @@ install-data-hook:
 	 fi; \
 	 cd $$here
 
-CFLOW_FLAGS=-i^s --brief -v
-libmu_scm_CFLOW_INPUT=$(libmu_scm_la_OBJECTS:.lo=.c)
-libmu_scm.cflow: $(libmu_scm_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(libmu_scm_CFLOW_INPUT)

@@ -18,7 +18,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 
 YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
 AM_YFLAGS = -dtv
@@ -67,10 +67,3 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
                   -- -yy mu_sieve_yy
 
 
-CFLOW_FLAGS=-i^s --brief -v
-libmu_sieve_CFLOW_INPUT=$(libmu_sieve_la_OBJECTS:.lo=.c)
-libmu_sieve.cflow: $(libmu_sieve_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(libmu_sieve_CFLOW_INPUT)

@@ -27,7 +27,7 @@ mod_LTLIBRARIES = \
  timestamp.la\
  vacation.la
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 AM_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)' 
 

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_imap.la
 libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_maildir.la
 libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_mailer.la
 libmu_mailer_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_mbox.la
 libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_mh.la
 libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_nntp.la
 libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
 
 lib_LTLIBRARIES = libmu_pop.la
 libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@

@@ -15,7 +15,7 @@
 # Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-INCLUDES = -I${top_srcdir} @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
+INCLUDES = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
  @PYTHON_INCLUDES@
 
 sbin_PROGRAMS=maidag

@@ -18,7 +18,7 @@
 ##   02110-1301 USA
 
 AM_YFLAGS=-vt
-INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ 
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail
@@ -98,10 +98,3 @@ mail_SOURCES = \
 
 SUBDIRS = testsuite
 
-CFLOW_FLAGS=-i^s --brief -v
-mail_CFLOW_INPUT=$(mail_OBJECTS:.$(OBJEXT)=.c)
-mail.cflow: $(mail_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(mail_CFLOW_INPUT)

@@ -18,7 +18,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include 
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
 
 YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
 AM_YFLAGS=-vt

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
 
 SUBDIRS = include
 

@@ -17,7 +17,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 SUBDIRS = testsuite
 
@@ -36,10 +36,3 @@ messages_LDADD =\
  ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
-CFLOW_FLAGS=-i^s --brief -v
-messages_CFLOW_INPUT=$(messages_OBJECTS:.$(OBJEXT)=.c)
-messages.cflow: $(messages_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(messages_CFLOW_INPUT)

@@ -123,7 +123,7 @@ mailutils-mh.el: mailutils-mh.eli
 .eli.el:
 	sed "s,BINDIR,$(bindir),g;s,MHLIBDIR,$(mhlibdir),g" $< > $@
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
 mh_LIBS = \
  ./libmh.a\

@@ -17,7 +17,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 AM_CFLAGS = -DDEFAULT_CUPS_CONFDIR=\"@DEFAULT_CUPS_CONFDIR@\"
 

@@ -18,7 +18,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
 bin_PROGRAMS = movemail
 
 movemail_LDADD = \
@@ -34,10 +34,3 @@ movemail_LDADD = \
  ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
-CFLOW_FLAGS=-i^s --brief -v
-movemail_CFLOW_INPUT=$(movemail_OBJECTS:.$(OBJEXT)=.c)
-movemail.cflow: $(movemail_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(movemail_CFLOW_INPUT)

@@ -18,7 +18,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 sbin_PROGRAMS = pop3d
 bin_PROGRAMS = @POPAUTH@
@@ -69,10 +69,3 @@ pop3d_DEPENDENCIES = \
  ${MU_LIB_MAILDIR}\
  ${MU_LIB_MAILUTILS}
 
-CFLOW_FLAGS=-i^s --brief -v
-pop3d_CFLOW_INPUT=$(pop3d_OBJECTS:.$(OBJEXT)=.c)
-pop3d.cflow: $(pop3d_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(pop3d_CFLOW_INPUT)

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
 
 EXTRA_LTLIBRARIES = libmu_py.la c_api.la
 

@@ -17,7 +17,7 @@
 ##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 
 SUBDIRS = testsuite
 

@@ -17,7 +17,7 @@
 ##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
 ##   02110-1301 USA
 
-INCLUDES = @MU_COMMON_INCLUDES@ 
+INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 SUBDIRS  = testsuite
 
 bin_PROGRAMS = sieve
@@ -39,10 +39,3 @@ sieve_LDADD =\
 
 sieve_LDFLAGS = -export-dynamic
 
-CFLOW_FLAGS=-i^s --brief -v
-sieve_CFLOW_INPUT=$(sieve_OBJECTS:.$(OBJEXT)=.c)
-sieve.cflow: $(sieve_CFLOW_INPUT) Makefile
-	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
-		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-		$(CPPFLAGS) \
-	$(sieve_CFLOW_INPUT)

@@ -25,7 +25,7 @@ EXTRA_DIST=\
  postgres.c
 DISTCLEANFILES = modlist.h
 
-INCLUDES= @MU_COMMON_INCLUDES@ 
+INCLUDES= @MU_LIB_COMMON_INCLUDES@ 
 libsql_la_SOURCES=sql.c
 libsql_la_LIBADD=@SQL_LTLIBOBJS@