From: Wietse Venema <wietse@porcupine.org>
Date: Fri, 22 Sep 2000 05:00:00 +0000 (-0500)
Subject: snapshot-20000922
X-Git-Tag: v20010228~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abeeb98c84a1f3ee6f493cb4303b3e1dc970d721;p=thirdparty%2Fpostfix.git

snapshot-20000922
---

diff --git a/postfix/0README b/postfix/0README
index 90ea3fb1b..1fd916279 100644
--- a/postfix/0README
+++ b/postfix/0README
@@ -113,43 +113,44 @@ Example files:
 
 Library routines:
 
-    dns/		DNS client library
-    global/		Postfix-specific support routines
-    util/		General-purpose support routines
+    src/dns/		DNS client library
+    src/global/		Postfix-specific support routines
+    src/util/		General-purpose support routines
 
 Command-line utilities:
 
-    postalias/		Alias database management
-    postcat/		List Postfix queue file
-    postconf/		Configuration utility
-    postfix/		Postfix administrative interface
-    postkick/		Postfix IPC for shell scripts
-    postlock/		Postfix locking for shell scripts
-    postlog/		Postfix logging for shell scripts
-    postmap/		Postfix lookup table management
-    postsuper/		Postfix house keeping program
-    sendmail/		Sendmail compatibility interface
+    src/postalias/	Alias database management
+    src/postcat/	List Postfix queue file
+    src/postconf/	Configuration utility
+    src/postfix/	Postfix administrative interface
+    src/postkick/	Postfix IPC for shell scripts
+    src/postlock/	Postfix locking for shell scripts
+    src/postlog/	Postfix logging for shell scripts
+    src/postmap/	Postfix lookup table management
+    src/postsuper/	Postfix house keeping program
+    src/sendmail/	Sendmail compatibility interface
 
 Postfix daemons:
 
-    bounce/		Bounce or defer mail
-    cleanup/		Canonicalize and enqueue mail
-    error/		Trivial error mailer
-    local/		Local delivery
-    master/		Postfix resident superserver
-    pickup/		Local pickup
-    pipe/		Pipe delivery
-    qmgr/		Queue manager
-    showq/		List Postfix queue status
-    lmtp/		LMTP client
-    smtp/		SMTP client
-    smtpd/		SMTP server
-    trivial-rewrite/	Address rewriting and resolving
+    src/bounce/		Bounce or defer mail
+    src/cleanup/	Canonicalize and enqueue mail
+    src/error/		Trivial error mailer
+    src/local/		Local delivery
+    src/master/		Postfix resident superserver
+    src/pickup/		Local pickup
+    src/pipe/		Pipe delivery
+    src/qmgr/		Queue manager
+    src/showq/		List Postfix queue status
+    src/spawn/		Run any command from a network socket
+    src/lmtp/		LMTP client
+    src/smtp/		SMTP client
+    src/smtpd/		SMTP server
+    src/trivial-rewrite/ Address rewriting and resolving
 
 Test programs:
 
-    fsstone/		Measure file system overhead
-    smtpstone/		SMTP server torture test
+    src/fsstone/	Measure file system overhead
+    src/smtpstone/	SMTP server torture test
 
 Miscellaneous:
 
diff --git a/postfix/BEWARE b/postfix/BEWARE
index 10adbd496..fb62e11ce 100644
--- a/postfix/BEWARE
+++ b/postfix/BEWARE
@@ -3,7 +3,9 @@ LINUX SYSLOGD PERFORMANCE
 
 LINUX syslogd uses synchronous writes by default, which is very
 expensive. For services such a mail it is recommended that you
-disable synchronous logfile writes by prepending a - to the logfile
-name:
+disable synchronous logfile writes by editing /etc/syslog.conf and
+by prepending a - to the logfile name:
 
     mail.*                          -/var/log/mail.log
+
+Send a "kill -HUP" to the syslogd to make the change effective.
diff --git a/postfix/HISTORY b/postfix/HISTORY
index e770377ae..a5443e487 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -4058,7 +4058,7 @@ Apologies for any names omitted.
 20000621
 
 	AIX 4.x had POSIX regular expression support all the time
-	I was working on Postfix. Beter find out late than never.
+	I was working on Postfix. Better find out late than never.
 
 20000623
 
@@ -4243,3 +4243,18 @@ Apologies for any names omitted.
 
 	FAQ: added notes about how to delete, copy or restore queue
 	files in a safe manner.
+
+20000921
+
+	File reorganization. No code change except Makefiles. All
+	sources are pushed down by one directory level to keep file
+	listings usable. Released as 20000922, so that I have a
+	reference to run "diff -cr against.
+
+	Bugfix: the spawn service was installed without man pages.
+
+	Portability: MacOSX hints and tips by Joe Block, University
+	of Central Florida School of Optics/CREOL
+
+	The MacOSX gcc compiler does not understand the new
+	printf_like/scanf_like attributes. File: util/sys_defs.h.
diff --git a/postfix/MACOSX_README b/postfix/MACOSX_README
new file mode 100644
index 000000000..24f37094d
--- /dev/null
+++ b/postfix/MACOSX_README
@@ -0,0 +1,2 @@
+See the files in auxiliary/MacOSX for hints and tips to set up
+Postfix.
diff --git a/postfix/Makefile.in b/postfix/Makefile.in
index a23a48682..a24a91b3a 100644
--- a/postfix/Makefile.in
+++ b/postfix/Makefile.in
@@ -1,10 +1,12 @@
 SHELL	= /bin/sh
 WARN    = -Wmissing-prototypes -Wformat
 OPTS	= "CC=$(CC)"
-DIRS	= util global dns master postfix smtpstone sendmail error \
-	pickup cleanup smtpd local lmtp trivial-rewrite qmgr smtp bounce pipe \
-	showq postalias postcat postconf postdrop postkick postlock postlog \
-	postmap postsuper nqmgr spawn # base64 proto man html
+DIRS	= src/util src/global src/dns src/master src/postfix src/smtpstone \
+	src/sendmail src/error src/pickup src/cleanup src/smtpd src/local \
+	src/lmtp src/trivial-rewrite src/qmgr src/smtp src/bounce src/pipe \
+	src/showq src/postalias src/postcat src/postconf src/postdrop \
+	src/postkick src/postlock src/postlog src/postmap src/postsuper \
+	src/nqmgr src/spawn # src/base64 proto man html
 
 default: update
 
@@ -45,11 +47,21 @@ cleanmakefiles:
 	rm -f Makefile; (set -e; sh makedefs; cat Makefile.in) >Makefile
 
 tidy:	clean
-	rm -f Makefile */Makefile
+	rm -f Makefile */Makefile src/*/Makefile
 	cp Makefile.init Makefile
-	-rm -f junk *core */*core .nfs* .pure bin/* lib/* include/* libexec/* \
-	*/.nfs* */.pure *.out */*.out */*.db */*.a *~ */*~ *- */*- *.orig \
-	*/*.orig *.bak */*.bak make.err conf/main.cf.default
+	rm -f bin/* lib/* include/* libexec/* \
+	    junk */junk */*/junk \
+	    *core */*core */*/*core \
+	    .nfs* */.nfs* */*/.nfs* \
+	    .pure */.pure */*/.pure \
+	    *.out */*.out */*/*.out \
+	    *.a */*.a */*/*.a \
+	    *~ */*~ */*/*~ \
+	    *- */*- */*/*- \
+	    *.orig */*.orig */*/*.orig \
+	    *.bak */*.bak */*/*.bak \
+	    *.make.err */*.make.err */*/*.make.err \
+	    conf/main.cf.default
 	find . -type s -print | xargs rm -f
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
diff --git a/postfix/auxiliary/MacOSX/README.OSXPublicBeta b/postfix/auxiliary/MacOSX/README.OSXPublicBeta
new file mode 100644
index 000000000..6b5fb694b
--- /dev/null
+++ b/postfix/auxiliary/MacOSX/README.OSXPublicBeta
@@ -0,0 +1,31 @@
+Before you do the build, make sure you run niscript (as root) to properly
+create a postfix user, and postfix & maildrop groups.
+
+DO NOT USE THE MULTIPLE USERS APPLICATION TO CREATE THE POSTFIX USER!
+
+1)	su
+
+2)	./niscript
+
+	 this creates the necessary users & groups for proper operation
+	 of postfix
+
+3)	./stash-sendmail
+
+	move your existing sendmail binaries somewhere safe
+
+4)	make install
+
+	When the script asks you for setgid (the default will be no) tell it
+	maildrop
+
+5)	edit /etc/postfix/main.cf to suit your requirements
+
+6)	postfix start
+
+7)	Test.  Read INSTALL for a series of suggested tests.
+
+8)	cp -R darwin-Postfix /System/Library/StartupItems/Postfix
+
+9)	edit /System/Library/StartupItems/Sendmail.  add "exit 0" as the
+	first line
diff --git a/postfix/auxiliary/MacOSX/darwin-Postfix/Postfix b/postfix/auxiliary/MacOSX/darwin-Postfix/Postfix
new file mode 100755
index 000000000..1ca2a9209
--- /dev/null
+++ b/postfix/auxiliary/MacOSX/darwin-Postfix/Postfix
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /etc/rc.common
+
+##
+# Start mail server
+##
+
+if [ "${MAILSERVER:=-NO-}" = "-YES-" ]; then
+
+    ConsoleMessage "Starting Postfix mail services"
+    /usr/sbin/postfix start
+fi
diff --git a/postfix/auxiliary/MacOSX/darwin-Postfix/StartupParameters.plist b/postfix/auxiliary/MacOSX/darwin-Postfix/StartupParameters.plist
new file mode 100644
index 000000000..9dcfebcf7
--- /dev/null
+++ b/postfix/auxiliary/MacOSX/darwin-Postfix/StartupParameters.plist
@@ -0,0 +1,12 @@
+{
+  Description   = "Postfix mail server";
+  Provides      = ("SMTP");
+  Requires      = ("Resolver");
+  Uses          = ("Network Time", "NFS");
+  Preference    = "None";
+  Messages =
+  {
+    start = "Starting Postfix";
+    stop  = "Stopping Postfix";
+  };
+}
diff --git a/postfix/auxiliary/MacOSX/niscript b/postfix/auxiliary/MacOSX/niscript
new file mode 100755
index 000000000..4b3b4df8b
--- /dev/null
+++ b/postfix/auxiliary/MacOSX/niscript
@@ -0,0 +1,118 @@
+#! /bin/sh
+#
+# Written 9/20/00 by Joe Block <jpb@creol.ucf.edu>
+#
+# It shouldn't matter, but this script is GPL.
+
+cat <<EOF
+This script massages your netinfo database.  This can severely break
+your system.  If your netinfo database breaks, you get to keep the parts.
+
+If you've already created a postfix user using Multiple Users, you'll need
+to edit this script.  do:
+
+		niutil -read / /users/postfix
+
+to find out what uid was assigned to postfix.  Comment out the stanza in
+this script that creates the postfix user
+
+Also note that this script assumes that you are
+	A) running MacOS X Public Beta
+	B) have not added any groups to the base system
+
+If you've added groups or are not running Public Beta, you should
+make sure the gids in this script have not already been used.
+
+You'll need to edit the script to remove the exit statement before the first
+call to niutil to show you read the directions and understand the risks.
+
+EOF
+
+PFSHELL=/usr/bin/false
+PFUID=88
+PFGID=88
+PFHOME=/Users/postfix
+MDGID=99
+
+echo -n "shell for user postfix? [$PFSHELL]"
+read pfshell
+if ["$pfshell" = ""]
+then
+	pfshell=$PFSHELL
+fi
+echo
+
+echo -n "uid for user postfix? [$PFUID]"
+read pfuid
+if ["$pfuid" = ""]
+then
+	pfuid=$PFUID
+fi
+echo
+
+echo -n "gid for user postfix? [$PFGID]"
+read pfgid
+if ["$pfgid" = ""]
+then
+	pfgid=$PFGID
+fi
+echo
+
+echo -n "Home directory for user postfix (we won't actually create it as postfix doesn't use it)? [$PFHOME]"
+read pfhome
+if ["$pfhome" = ""]
+then
+	pfhome=$PFHOME
+fi
+echo
+
+echo -n "gid for maildrop group? [$MDGID]"
+read mdgid
+if ["$mdgid" = ""]
+then
+	mdgid=$MDGID
+fi
+echo
+
+echo "postfix user: shell=$pfshell, uid=$pfuid, gid=$pfgid,home=$pfhome"
+echo "maildrop group: $mdgid"
+echo
+echo -n "You're sure you want to massage your netinfo database? [yes/NO]"
+read arewesure
+
+case $arewesure in
+	yes|YES)
+		echo "remember, you were warned"
+		;;
+	*)
+		echo "OK, exiting"
+		exit 0
+		;;
+esac
+exit 0
+
+echo "Tweaking netinfo now"
+echo "Creating postfix user"
+niutil -create / /users/postfix
+niutil -createprop / /users/postfix realname "Postfix user"
+niutil -createprop / /users/postfix shell $pfshell
+niutil -createprop / /users/postfix uid $pfuid
+niutil -createprop / /users/postfix gid $pfgid
+niutil -createprop / /users/postfix home $pfhome
+niutil -createprop / /users/postfix _shadow_passwd
+passwd postfix
+
+echo "Creating postfix group"
+niutil -create / /groups/postfix
+niutil -createprop / /groups/postfix name postfix
+niutil -createprop / /groups/postfix gid $pfgid
+niutil -createprop / /groups/postfix passwd '*'
+echo "Adding postfix user to postfix group"
+niutil -appendprop / /groups/postfix users postfix
+
+echo "Creating maildrop group.  Remember not to add any users to this group,"
+echo "or you might as well have made your maildrop directory world writable."
+niutil -create / /groups/maildrop
+niutil -createprop / /groups/maildrop name maildrop
+niutil -createprop / /groups/maildrop gid $mdgid
+niutil -createprop / /groups/maildrop passwd '*'
diff --git a/postfix/auxiliary/MacOSX/stash-sendmail b/postfix/auxiliary/MacOSX/stash-sendmail
new file mode 100755
index 000000000..3a3ca1aae
--- /dev/null
+++ b/postfix/auxiliary/MacOSX/stash-sendmail
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+mv /usr/sbin/sendmail /usr/sbin/sendmail.OFF
+mv /usr/bin/newaliases /usr/bin/newaliases.OFF
+mv /usr/bin/mailq /usr/bin/mailq.OFF
+chmod 755 /usr/sbin/sendmail.OFF /usr/bin/newaliases.OFF /usr/bin/mailq.OFF
diff --git a/postfix/html/Makefile.in b/postfix/html/Makefile.in
index c701b0250..081e5c24e 100644
--- a/postfix/html/Makefile.in
+++ b/postfix/html/Makefile.in
@@ -5,7 +5,7 @@ SHELL	= /bin/sh
 DAEMONS	=  bounce.8.html cleanup.8.html defer.8.html error.8.html local.8.html \
 	lmtp.8.html master.8.html pickup.8.html pipe.8.html qmgr.8.html \
 	showq.8.html smtp.8.html smtpd.8.html trivial-rewrite.8.html \
-	nqmgr.8.html
+	nqmgr.8.html spawn.8.html
 COMMANDS= mailq.1.html newaliases.1.html postalias.1.html postcat.1.html \
 	postconf.1.html postfix.1.html postkick.1.html postlock.1.html \
 	postlog.1.html postdrop.1.html postmap.1.html sendmail.1.html \
@@ -16,7 +16,7 @@ CONFIG	= access.5.html aliases.5.html canonical.5.html relocated.5.html \
 update:	$(DAEMONS) $(COMMANDS) $(CONFIG)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../src/makedefs; cat $?) >$@
 
 clean:
 	echo clean
@@ -26,84 +26,87 @@ tidy:	clean
 clobber:
 	rm -f $(DAEMONS) $(COMMANDS) $(CONFIG)
 
-bounce.8.html: ../bounce/bounce.c
+bounce.8.html: ../src/bounce/bounce.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
 defer.8.html: bounce.8.html
 	rm -f $@
 	ln -s $? $@
 
-error.8.html: ../error/error.c
+error.8.html: ../src/error/error.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-cleanup.8.html: ../cleanup/cleanup.c
+cleanup.8.html: ../src/cleanup/cleanup.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-lmtp.8.html: ../lmtp/lmtp.c
+lmtp.8.html: ../src/lmtp/lmtp.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-local.8.html: ../local/local.c
+local.8.html: ../src/local/local.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-master.8.html: ../master/master.c
+master.8.html: ../src/master/master.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-nqmgr.8.html: ../nqmgr/qmgr.c
+nqmgr.8.html: ../src/nqmgr/qmgr.c
 	srctoman $? | sed -e 's/qmgr[^_]/n&/' -e 's/QMGR[^_]/N&/' | \
 	    nroff -man | man2html | postlink >$@
 
-pickup.8.html: ../pickup/pickup.c
+pickup.8.html: ../src/pickup/pickup.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-pipe.8.html: ../pipe/pipe.c
+pipe.8.html: ../src/pipe/pipe.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-qmgr.8.html: ../qmgr/qmgr.c
+qmgr.8.html: ../src/qmgr/qmgr.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-showq.8.html: ../showq/showq.c
+showq.8.html: ../src/showq/showq.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-smtp.8.html: ../smtp/smtp.c
+spawn.8.html: ../src/spawn/spawn.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-smtpd.8.html: ../smtpd/smtpd.c
+smtp.8.html: ../src/smtp/smtp.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-trivial-rewrite.8.html: ../trivial-rewrite/trivial-rewrite.c
+smtpd.8.html: ../src/smtpd/smtpd.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postalias.1.html: ../postalias/postalias.c
+trivial-rewrite.8.html: ../src/trivial-rewrite/trivial-rewrite.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postcat.1.html: ../postcat/postcat.c
+postalias.1.html: ../src/postalias/postalias.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postconf.1.html: ../postconf/postconf.c
+postcat.1.html: ../src/postcat/postcat.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postdrop.1.html: ../postdrop/postdrop.c
+postconf.1.html: ../src/postconf/postconf.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postfix.1.html: ../postfix/postfix.c
+postdrop.1.html: ../src/postdrop/postdrop.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postkick.1.html: ../postkick/postkick.c
+postfix.1.html: ../src/postfix/postfix.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postlock.1.html: ../postlock/postlock.c
+postkick.1.html: ../src/postkick/postkick.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postlog.1.html: ../postlog/postlog.c
+postlock.1.html: ../src/postlock/postlock.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postmap.1.html: ../postmap/postmap.c
+postlog.1.html: ../src/postlog/postlog.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-postsuper.1.html: ../postsuper/postsuper.c
+postmap.1.html: ../src/postmap/postmap.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
-sendmail.1.html: ../sendmail/sendmail.c
+postsuper.1.html: ../src/postsuper/postsuper.c
+	srctoman $? | nroff -man | man2html | postlink >$@
+
+sendmail.1.html: ../src/sendmail/sendmail.c
 	srctoman $? | nroff -man | man2html | postlink >$@
 
 mailq.1.html: sendmail.1.html
diff --git a/postfix/html/spawn.8.html b/postfix/html/spawn.8.html
new file mode 100644
index 000000000..af8466922
--- /dev/null
+++ b/postfix/html/spawn.8.html
@@ -0,0 +1,134 @@
+<html> <head> </head> <body> <pre>
+
+
+
+SPAWN(8)                                                 SPAWN(8)
+
+
+<b>NAME</b>
+       spawn - Postfix external command spawner
+
+<b>SYNOPSIS</b>
+       <b>spawn</b> [generic Postfix daemon options] command_attributes...
+
+<b>DESCRIPTION</b>
+       The <b>spawn</b> daemon provides the Postfix equivalent of <b>inetd</b>.
+       It listens on a port as specified in the Postfix <b>master.cf</b>
+       file  and spawns an external command whenever a connection
+       is established.  The connection can be made over local IPC
+       (such  as UNIX-domain sockets) or over non-local IPC (such
+       as TCP sockets).  The command's standard input, output and
+       error  streams are connected directly to the communication
+       endpoint.
+
+       This daemon expects to be run from the  <a href="master.8.html"><b>master</b>(8)</a>  process
+       manager.
+
+<b>COMMAND</b> <b>ATTRIBUTE</b> <b>SYNTAX</b>
+       The external command attributes are given in the <b>master.cf</b>
+       file at the end of a service definition.  The syntax is as
+       follows:
+
+       <b>user</b>=<i>username</i> (required)
+
+       <b>user</b>=<i>username</i>:<i>groupname</i>
+              The external command is executed with the rights of
+              the specified <i>username</i>.  The  software  refuses  to
+              execute  commands with root privileges, or with the
+              privileges of the mail system owner.  If  <i>groupname</i>
+              is  specified,  the  corresponding group ID is used
+              instead of the group ID of of <i>username</i>.
+
+       <b>argv</b>=<i>command</i>... (required)
+              The command to be executed. This must be  specified
+              as the last command attribute.  The command is exe-
+              cuted  directly,  i.e.  without  interpretation  of
+              shell  meta  characters  by  a shell command inter-
+              preter.
+
+<b>BUGS</b>
+       In order to enforce standard Postfix process resource con-
+       trols,  the <b>spawn</b> daemon runs only one external command at
+       a time.  As such, it presents  a  noticeable  overhead  by
+       wasting  precious  process  resources. The <b>spawn</b> daemon is
+       expected to be replaced by a more structural solution.
+
+<b>DIAGNOSTICS</b>
+       The <b>spawn</b> daemon reports abnormal child  exits.   Problems
+       are logged to <b>syslogd</b>(8).
+
+<b>SECURITY</b>
+       This  program  needs  root  privilege  in order to execute
+
+
+
+                                                                1
+
+
+
+
+
+SPAWN(8)                                                 SPAWN(8)
+
+
+       external commands as the specified user. It  is  therefore
+       security  sensitive.   However  the  <b>spawn</b> daemon does not
+       talk to the external command and thus is not vulnerable to
+       data-driven attacks.
+
+<b>CONFIGURATION</b> <b>PARAMETERS</b>
+       The  following  <b>main.cf</b> parameters are especially relevant
+       to this program. See the Postfix <b>main.cf</b> file  for  syntax
+       details  and  for  default  values. Use the <b>postfix</b> <b>reload</b>
+       command after a configuration change.
+
+<b>Miscellaneous</b>
+       <b>mail</b><i>_</i><b>owner</b>
+              The process privileges used while  not  running  an
+              external command.
+
+<b>Resource</b> <b>control</b>
+       <i>service_</i><b>command</b><i>_</i><b>time</b><i>_</i><b>limit</b>
+              The  amount  of  time the command is allowed to run
+              before it is killed with force. The <i>service</i> name is
+              the  name  of  the entry in the <b>master.cf</b> file. The
+              default time limit is  given  by  the  global  <b>com-</b>
+              <b>mand</b><i>_</i><b>time</b><i>_</i><b>limit</b> configuration parameter.
+
+<b>SEE</b> <b>ALSO</b>
+       <a href="master.8.html">master(8)</a> process manager
+       syslogd(8) system logging
+
+<b>LICENSE</b>
+       The  Secure  Mailer  license must be distributed with this
+       software.
+
+<b>AUTHOR(S)</b>
+       Wietse Venema
+       IBM T.J. Watson Research
+       P.O. Box 704
+       Yorktown Heights, NY 10598, USA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                2
+
+
+</pre> </body> </html>
diff --git a/postfix/makedefs b/postfix/makedefs
index fe25dde9b..3cdbecfe1 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -215,7 +215,8 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
 		RANLIB=echo
 		SYSLIBS="-lresolv -lsocket -lnsl"
 		;;
- Rhapsody.5*)	SYSTYPE=RHAPSODY5
+Rhapsody.5*|Darwin.1.2*)
+		SYSTYPE=RHAPSODY5
 		# Use the native compiler by default
 		: ${CC=cc}
 		AWK=gawk
diff --git a/postfix/man/Makefile.in b/postfix/man/Makefile.in
index 44368bbd1..20d23b556 100644
--- a/postfix/man/Makefile.in
+++ b/postfix/man/Makefile.in
@@ -5,7 +5,7 @@ SHELL	= /bin/sh
 DAEMONS	= man8/bounce.8 man8/defer.8 man8/cleanup.8 man8/error.8 man8/local.8 \
 	man8/lmtp.8 man8/master.8 man8/pickup.8 man8/pipe.8 man8/qmgr.8 \
 	man8/showq.8 man8/smtp.8 man8/smtpd.8 man8/trivial-rewrite.8 \
-	man8/nqmgr.8
+	man8/nqmgr.8 man8/spawn.8
 COMMANDS= man1/postalias.1 man1/postcat.1 man1/postconf.1 man1/postfix.1 \
 	man1/postkick.1 man1/postlock.1 man1/postlog.1 man1/postdrop.1 \
 	man1/postmap.1 man1/sendmail.1 man1/mailq.1 man1/newaliases.1 \
@@ -16,7 +16,7 @@ CONFIG	= man5/access.5 man5/aliases.5 man5/canonical.5 man5/relocated.5 \
 update:	$(DAEMONS) $(COMMANDS) $(CONFIG)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../src/makedefs; cat $?) >$@
 
 clean:
 	rm -f cat?/*
@@ -26,83 +26,86 @@ tidy:	clean
 clobber:
 	rm -f $(DAEMONS) $(COMMANDS) $(CONFIG)
 
-man8/bounce.8: ../bounce/bounce.c
+man8/bounce.8: ../src/bounce/bounce.c
 	../mantools/srctoman $? >$@
 
 man8/defer.8:
 	echo .so man8/bounce.8 >$@
 
-man8/cleanup.8: ../cleanup/cleanup.c
+man8/cleanup.8: ../src/cleanup/cleanup.c
 	../mantools/srctoman $? >$@
 
-man8/error.8: ../error/error.c
+man8/error.8: ../src/error/error.c
 	../mantools/srctoman $? >$@
 
-man8/local.8: ../local/local.c
+man8/local.8: ../src/local/local.c
 	../mantools/srctoman $? >$@
 
-man8/lmtp.8: ../lmtp/lmtp.c
+man8/lmtp.8: ../src/lmtp/lmtp.c
 	../mantools/srctoman $? >$@
 
-man8/master.8: ../master/master.c
+man8/master.8: ../src/master/master.c
 	../mantools/srctoman $? >$@
 
-man8/nqmgr.8: ../nqmgr/qmgr.c
+man8/nqmgr.8: ../src/nqmgr/qmgr.c
 	../mantools/srctoman $? | \
 		sed -e 's/qmgr[^_]/n&/' -e 's/QMGR[^_]/N&/' >$@
 
-man8/pickup.8: ../pickup/pickup.c
+man8/pickup.8: ../src/pickup/pickup.c
 	../mantools/srctoman $? >$@
 
-man8/pipe.8: ../pipe/pipe.c
+man8/pipe.8: ../src/pipe/pipe.c
 	../mantools/srctoman $? >$@
 
-man8/qmgr.8: ../qmgr/qmgr.c
+man8/qmgr.8: ../src/qmgr/qmgr.c
 	../mantools/srctoman $? >$@
 
-man8/showq.8: ../showq/showq.c
+man8/showq.8: ../src/showq/showq.c
 	../mantools/srctoman $? >$@
 
-man8/smtp.8: ../smtp/smtp.c
+man8/spawn.8: ../src/spawn/spawn.c
 	../mantools/srctoman $? >$@
 
-man8/smtpd.8: ../smtpd/smtpd.c
+man8/smtp.8: ../src/smtp/smtp.c
 	../mantools/srctoman $? >$@
 
-man8/trivial-rewrite.8: ../trivial-rewrite/trivial-rewrite.c
+man8/smtpd.8: ../src/smtpd/smtpd.c
 	../mantools/srctoman $? >$@
 
-man1/postalias.1: ../postalias/postalias.c
+man8/trivial-rewrite.8: ../src/trivial-rewrite/trivial-rewrite.c
 	../mantools/srctoman $? >$@
 
-man1/postcat.1: ../postcat/postcat.c
+man1/postalias.1: ../src/postalias/postalias.c
 	../mantools/srctoman $? >$@
 
-man1/postconf.1: ../postconf/postconf.c
+man1/postcat.1: ../src/postcat/postcat.c
 	../mantools/srctoman $? >$@
 
-man1/postdrop.1: ../postdrop/postdrop.c
+man1/postconf.1: ../src/postconf/postconf.c
 	../mantools/srctoman $? >$@
 
-man1/postfix.1: ../postfix/postfix.c
+man1/postdrop.1: ../src/postdrop/postdrop.c
 	../mantools/srctoman $? >$@
 
-man1/postkick.1: ../postkick/postkick.c
+man1/postfix.1: ../src/postfix/postfix.c
 	../mantools/srctoman $? >$@
 
-man1/postlock.1: ../postlock/postlock.c
+man1/postkick.1: ../src/postkick/postkick.c
 	../mantools/srctoman $? >$@
 
-man1/postlog.1: ../postlog/postlog.c
+man1/postlock.1: ../src/postlock/postlock.c
 	../mantools/srctoman $? >$@
 
-man1/postmap.1: ../postmap/postmap.c
+man1/postlog.1: ../src/postlog/postlog.c
 	../mantools/srctoman $? >$@
 
-man1/postsuper.1: ../postsuper/postsuper.c
+man1/postmap.1: ../src/postmap/postmap.c
 	../mantools/srctoman $? >$@
 
-man1/sendmail.1: ../sendmail/sendmail.c
+man1/postsuper.1: ../src/postsuper/postsuper.c
+	../mantools/srctoman $? >$@
+
+man1/sendmail.1: ../src/sendmail/sendmail.c
 	../mantools/srctoman $? >$@
 
 man1/mailq.1:
diff --git a/postfix/man/man8/spawn.8 b/postfix/man/man8/spawn.8
new file mode 100644
index 000000000..7ea3463cd
--- /dev/null
+++ b/postfix/man/man8/spawn.8
@@ -0,0 +1,106 @@
+.TH SPAWN 8 
+.ad
+.fi
+.SH NAME
+spawn
+\-
+Postfix external command spawner
+.SH SYNOPSIS
+.na
+.nf
+\fBspawn\fR [generic Postfix daemon options] command_attributes...
+.SH DESCRIPTION
+.ad
+.fi
+The \fBspawn\fR daemon provides the Postfix equivalent of \fBinetd\fR.
+It listens on a port as specified in the Postfix \fBmaster.cf\fR file
+and spawns an external command whenever a connection is established.
+The connection can be made over local IPC (such as UNIX-domain
+sockets) or over non-local IPC (such as TCP sockets).
+The command\'s standard input, output and error streams are connected
+directly to the communication endpoint.
+
+This daemon expects to be run from the \fBmaster\fR(8) process
+manager.
+.SH COMMAND ATTRIBUTE SYNTAX
+.na
+.nf
+.ad
+.fi
+The external command attributes are given in the \fBmaster.cf\fR
+file at the end of a service definition.  The syntax is as follows:
+.IP "\fBuser\fR=\fIusername\fR (required)"
+.IP "\fBuser\fR=\fIusername\fR:\fIgroupname\fR"
+The external command is executed with the rights of the
+specified \fIusername\fR.  The software refuses to execute
+commands with root privileges, or with the privileges of the
+mail system owner. If \fIgroupname\fR is specified, the
+corresponding group ID is used instead of the group ID of
+of \fIusername\fR.
+.IP "\fBargv\fR=\fIcommand\fR... (required)"
+The command to be executed. This must be specified as the
+last command attribute.
+The command is executed directly, i.e. without interpretation of
+shell meta characters by a shell command interpreter.
+.SH BUGS
+.ad
+.fi
+In order to enforce standard Postfix process resource controls,
+the \fBspawn\fR daemon runs only one external command at a time.
+As such, it presents a noticeable overhead by wasting precious
+process resources. The \fBspawn\fR daemon is expected to be
+replaced by a more structural solution.
+.SH DIAGNOSTICS
+.ad
+.fi
+The \fBspawn\fR daemon reports abnormal child exits.
+Problems are logged to \fBsyslogd\fR(8).
+.SH SECURITY
+.na
+.nf
+.fi
+.ad
+This program needs root privilege in order to execute external
+commands as the specified user. It is therefore security sensitive.
+However the \fBspawn\fR daemon does not talk to the external command
+and thus is not vulnerable to data-driven attacks.
+.SH CONFIGURATION PARAMETERS
+.na
+.nf
+.ad
+.fi
+The following \fBmain.cf\fR parameters are especially relevant to
+this program. See the Postfix \fBmain.cf\fR file for syntax details
+and for default values. Use the \fBpostfix reload\fR command after
+a configuration change.
+.SH Miscellaneous
+.ad
+.fi
+.IP \fBmail_owner\fR
+The process privileges used while not running an external command.
+.SH Resource control
+.ad
+.fi
+.IP \fIservice\fB_command_time_limit\fR
+The amount of time the command is allowed to run before it is
+killed with force. The \fIservice\fR name is the name of the entry
+in the \fBmaster.cf\fR file. The default time limit is given by the
+global \fBcommand_time_limit\fR configuration parameter.
+.SH SEE ALSO
+.na
+.nf
+master(8) process manager
+syslogd(8) system logging
+.SH LICENSE
+.na
+.nf
+.ad
+.fi
+The Secure Mailer license must be distributed with this software.
+.SH AUTHOR(S)
+.na
+.nf
+Wietse Venema
+IBM T.J. Watson Research
+P.O. Box 704
+Yorktown Heights, NY 10598, USA
diff --git a/postfix/src/base64/Makefile.in b/postfix/src/base64/Makefile.in
index a372313b2..459c0a4d5 100644
--- a/postfix/src/base64/Makefile.in
+++ b/postfix/src/base64/Makefile.in
@@ -9,16 +9,16 @@ WARN	= -W -Wformat -Wimplicit -Wmissing-prototypes \
 DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
-INC_DIR	= ../include
+INC_DIR	= ../../include
 PROG	= base64encode base64decode
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 all:	$(PROG)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 base64decode: base64decode.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ base64decode.o $(LIBS) $(SYSLIBS)
@@ -28,12 +28,12 @@ base64encode: base64encode.o $(LIBS)
 
 test:	$(TESTPROG)
 
-update: ../bin/base64encode ../bin/base64decode
+update: ../../bin/base64encode ../../bin/base64decode
 
-../bin/base64encode: base64encode
+../../bin/base64encode: base64encode
 	cp $? $@
 
-../bin/base64decode: base64decode
+../../bin/base64decode: base64decode
 	cp $? $@
 
 printfck: $(OBJS) $(PROG)
@@ -41,7 +41,7 @@ printfck: $(OBJS) $(PROG)
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -62,18 +62,18 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 base64decode.o: base64decode.c
-base64decode.o: ../include/sys_defs.h
-base64decode.o: ../include/vstring.h
-base64decode.o: ../include/vbuf.h
-base64decode.o: ../include/vstream.h
-base64decode.o: ../include/vstring_vstream.h
-base64decode.o: ../include/msg.h
-base64decode.o: ../include/msg_vstream.h
+base64decode.o: ../../include/sys_defs.h
+base64decode.o: ../../include/vstring.h
+base64decode.o: ../../include/vbuf.h
+base64decode.o: ../../include/vstream.h
+base64decode.o: ../../include/vstring_vstream.h
+base64decode.o: ../../include/msg.h
+base64decode.o: ../../include/msg_vstream.h
 base64encode.o: base64encode.c
-base64encode.o: ../include/sys_defs.h
-base64encode.o: ../include/vstring.h
-base64encode.o: ../include/vbuf.h
-base64encode.o: ../include/vstream.h
-base64encode.o: ../include/vstring_vstream.h
-base64encode.o: ../include/msg.h
-base64encode.o: ../include/msg_vstream.h
+base64encode.o: ../../include/sys_defs.h
+base64encode.o: ../../include/vstring.h
+base64encode.o: ../../include/vbuf.h
+base64encode.o: ../../include/vstream.h
+base64encode.o: ../../include/vstring_vstream.h
+base64encode.o: ../../include/msg.h
+base64encode.o: ../../include/msg_vstream.h
diff --git a/postfix/src/bounce/Makefile.in b/postfix/src/bounce/Makefile.in
index 1298eee45..1b0943545 100644
--- a/postfix/src/bounce/Makefile.in
+++ b/postfix/src/bounce/Makefile.in
@@ -12,8 +12,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG=
 PROG	= bounce
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;  $(CC) $(CFLAGS) -c $*.c
 
@@ -21,14 +21,14 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
@@ -36,7 +36,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile > printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -57,93 +57,93 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 bounce.o: bounce.c
-bounce.o: ../include/sys_defs.h
-bounce.o: ../include/msg.h
-bounce.o: ../include/vstring.h
-bounce.o: ../include/vbuf.h
-bounce.o: ../include/vstream.h
-bounce.o: ../include/stringops.h
-bounce.o: ../include/mail_proto.h
-bounce.o: ../include/iostuff.h
-bounce.o: ../include/mail_queue.h
-bounce.o: ../include/mail_params.h
-bounce.o: ../include/mail_conf.h
-bounce.o: ../include/bounce.h
-bounce.o: ../include/mail_server.h
+bounce.o: ../../include/sys_defs.h
+bounce.o: ../../include/msg.h
+bounce.o: ../../include/vstring.h
+bounce.o: ../../include/vbuf.h
+bounce.o: ../../include/vstream.h
+bounce.o: ../../include/stringops.h
+bounce.o: ../../include/mail_proto.h
+bounce.o: ../../include/iostuff.h
+bounce.o: ../../include/mail_queue.h
+bounce.o: ../../include/mail_params.h
+bounce.o: ../../include/mail_conf.h
+bounce.o: ../../include/bounce.h
+bounce.o: ../../include/mail_server.h
 bounce.o: bounce_service.h
 bounce_append_service.o: bounce_append_service.c
-bounce_append_service.o: ../include/sys_defs.h
-bounce_append_service.o: ../include/msg.h
-bounce_append_service.o: ../include/vstring.h
-bounce_append_service.o: ../include/vbuf.h
-bounce_append_service.o: ../include/vstream.h
-bounce_append_service.o: ../include/stringops.h
-bounce_append_service.o: ../include/mail_queue.h
-bounce_append_service.o: ../include/quote_822_local.h
-bounce_append_service.o: ../include/deliver_flock.h
+bounce_append_service.o: ../../include/sys_defs.h
+bounce_append_service.o: ../../include/msg.h
+bounce_append_service.o: ../../include/vstring.h
+bounce_append_service.o: ../../include/vbuf.h
+bounce_append_service.o: ../../include/vstream.h
+bounce_append_service.o: ../../include/stringops.h
+bounce_append_service.o: ../../include/mail_queue.h
+bounce_append_service.o: ../../include/quote_822_local.h
+bounce_append_service.o: ../../include/deliver_flock.h
 bounce_append_service.o: bounce_service.h
 bounce_cleanup.o: bounce_cleanup.c
-bounce_cleanup.o: ../include/sys_defs.h
-bounce_cleanup.o: ../include/msg.h
-bounce_cleanup.o: ../include/mymalloc.h
-bounce_cleanup.o: ../include/vstring.h
-bounce_cleanup.o: ../include/vbuf.h
-bounce_cleanup.o: ../include/mail_queue.h
-bounce_cleanup.o: ../include/vstream.h
+bounce_cleanup.o: ../../include/sys_defs.h
+bounce_cleanup.o: ../../include/msg.h
+bounce_cleanup.o: ../../include/mymalloc.h
+bounce_cleanup.o: ../../include/vstring.h
+bounce_cleanup.o: ../../include/vbuf.h
+bounce_cleanup.o: ../../include/mail_queue.h
+bounce_cleanup.o: ../../include/vstream.h
 bounce_cleanup.o: bounce_service.h
 bounce_notify_service.o: bounce_notify_service.c
-bounce_notify_service.o: ../include/sys_defs.h
-bounce_notify_service.o: ../include/msg.h
-bounce_notify_service.o: ../include/vstring.h
-bounce_notify_service.o: ../include/vbuf.h
-bounce_notify_service.o: ../include/vstream.h
-bounce_notify_service.o: ../include/vstring_vstream.h
-bounce_notify_service.o: ../include/mymalloc.h
-bounce_notify_service.o: ../include/stringops.h
-bounce_notify_service.o: ../include/events.h
-bounce_notify_service.o: ../include/line_wrap.h
-bounce_notify_service.o: ../include/name_mask.h
-bounce_notify_service.o: ../include/mail_queue.h
-bounce_notify_service.o: ../include/mail_proto.h
-bounce_notify_service.o: ../include/iostuff.h
-bounce_notify_service.o: ../include/quote_822_local.h
-bounce_notify_service.o: ../include/mail_params.h
-bounce_notify_service.o: ../include/canon_addr.h
-bounce_notify_service.o: ../include/is_header.h
-bounce_notify_service.o: ../include/record.h
-bounce_notify_service.o: ../include/rec_type.h
-bounce_notify_service.o: ../include/mail_conf.h
-bounce_notify_service.o: ../include/post_mail.h
-bounce_notify_service.o: ../include/cleanup_user.h
-bounce_notify_service.o: ../include/mail_addr.h
-bounce_notify_service.o: ../include/mark_corrupt.h
-bounce_notify_service.o: ../include/mail_error.h
+bounce_notify_service.o: ../../include/sys_defs.h
+bounce_notify_service.o: ../../include/msg.h
+bounce_notify_service.o: ../../include/vstring.h
+bounce_notify_service.o: ../../include/vbuf.h
+bounce_notify_service.o: ../../include/vstream.h
+bounce_notify_service.o: ../../include/vstring_vstream.h
+bounce_notify_service.o: ../../include/mymalloc.h
+bounce_notify_service.o: ../../include/stringops.h
+bounce_notify_service.o: ../../include/events.h
+bounce_notify_service.o: ../../include/line_wrap.h
+bounce_notify_service.o: ../../include/name_mask.h
+bounce_notify_service.o: ../../include/mail_queue.h
+bounce_notify_service.o: ../../include/mail_proto.h
+bounce_notify_service.o: ../../include/iostuff.h
+bounce_notify_service.o: ../../include/quote_822_local.h
+bounce_notify_service.o: ../../include/mail_params.h
+bounce_notify_service.o: ../../include/canon_addr.h
+bounce_notify_service.o: ../../include/is_header.h
+bounce_notify_service.o: ../../include/record.h
+bounce_notify_service.o: ../../include/rec_type.h
+bounce_notify_service.o: ../../include/mail_conf.h
+bounce_notify_service.o: ../../include/post_mail.h
+bounce_notify_service.o: ../../include/cleanup_user.h
+bounce_notify_service.o: ../../include/mail_addr.h
+bounce_notify_service.o: ../../include/mark_corrupt.h
+bounce_notify_service.o: ../../include/mail_error.h
 bounce_notify_service.o: bounce_service.h
 bounce_recip_service.o: bounce_recip_service.c
-bounce_recip_service.o: ../include/sys_defs.h
-bounce_recip_service.o: ../include/msg.h
-bounce_recip_service.o: ../include/vstring.h
-bounce_recip_service.o: ../include/vbuf.h
-bounce_recip_service.o: ../include/vstream.h
-bounce_recip_service.o: ../include/vstring_vstream.h
-bounce_recip_service.o: ../include/mymalloc.h
-bounce_recip_service.o: ../include/stringops.h
-bounce_recip_service.o: ../include/events.h
-bounce_recip_service.o: ../include/line_wrap.h
-bounce_recip_service.o: ../include/name_mask.h
-bounce_recip_service.o: ../include/mail_queue.h
-bounce_recip_service.o: ../include/mail_proto.h
-bounce_recip_service.o: ../include/iostuff.h
-bounce_recip_service.o: ../include/quote_822_local.h
-bounce_recip_service.o: ../include/mail_params.h
-bounce_recip_service.o: ../include/canon_addr.h
-bounce_recip_service.o: ../include/is_header.h
-bounce_recip_service.o: ../include/record.h
-bounce_recip_service.o: ../include/rec_type.h
-bounce_recip_service.o: ../include/mail_conf.h
-bounce_recip_service.o: ../include/post_mail.h
-bounce_recip_service.o: ../include/cleanup_user.h
-bounce_recip_service.o: ../include/mail_addr.h
-bounce_recip_service.o: ../include/mark_corrupt.h
-bounce_recip_service.o: ../include/mail_error.h
+bounce_recip_service.o: ../../include/sys_defs.h
+bounce_recip_service.o: ../../include/msg.h
+bounce_recip_service.o: ../../include/vstring.h
+bounce_recip_service.o: ../../include/vbuf.h
+bounce_recip_service.o: ../../include/vstream.h
+bounce_recip_service.o: ../../include/vstring_vstream.h
+bounce_recip_service.o: ../../include/mymalloc.h
+bounce_recip_service.o: ../../include/stringops.h
+bounce_recip_service.o: ../../include/events.h
+bounce_recip_service.o: ../../include/line_wrap.h
+bounce_recip_service.o: ../../include/name_mask.h
+bounce_recip_service.o: ../../include/mail_queue.h
+bounce_recip_service.o: ../../include/mail_proto.h
+bounce_recip_service.o: ../../include/iostuff.h
+bounce_recip_service.o: ../../include/quote_822_local.h
+bounce_recip_service.o: ../../include/mail_params.h
+bounce_recip_service.o: ../../include/canon_addr.h
+bounce_recip_service.o: ../../include/is_header.h
+bounce_recip_service.o: ../../include/record.h
+bounce_recip_service.o: ../../include/rec_type.h
+bounce_recip_service.o: ../../include/mail_conf.h
+bounce_recip_service.o: ../../include/post_mail.h
+bounce_recip_service.o: ../../include/cleanup_user.h
+bounce_recip_service.o: ../../include/mail_addr.h
+bounce_recip_service.o: ../../include/mark_corrupt.h
+bounce_recip_service.o: ../../include/mail_error.h
 bounce_recip_service.o: bounce_service.h
diff --git a/postfix/src/cleanup/Makefile.in b/postfix/src/cleanup/Makefile.in
index 6688e4e2c..b77060a80 100644
--- a/postfix/src/cleanup/Makefile.in
+++ b/postfix/src/cleanup/Makefile.in
@@ -16,8 +16,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG=
 PROG	= cleanup
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -25,14 +25,14 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
@@ -40,7 +40,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile > printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -61,262 +61,262 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 cleanup.o: cleanup.c
-cleanup.o: ../include/sys_defs.h
-cleanup.o: ../include/msg.h
-cleanup.o: ../include/vstring.h
-cleanup.o: ../include/vbuf.h
-cleanup.o: ../include/dict.h
-cleanup.o: ../include/vstream.h
-cleanup.o: ../include/argv.h
-cleanup.o: ../include/mail_conf.h
-cleanup.o: ../include/cleanup_user.h
-cleanup.o: ../include/mail_proto.h
-cleanup.o: ../include/iostuff.h
-cleanup.o: ../include/mail_params.h
-cleanup.o: ../include/record.h
-cleanup.o: ../include/rec_type.h
-cleanup.o: ../include/mail_server.h
+cleanup.o: ../../include/sys_defs.h
+cleanup.o: ../../include/msg.h
+cleanup.o: ../../include/vstring.h
+cleanup.o: ../../include/vbuf.h
+cleanup.o: ../../include/dict.h
+cleanup.o: ../../include/vstream.h
+cleanup.o: ../../include/argv.h
+cleanup.o: ../../include/mail_conf.h
+cleanup.o: ../../include/cleanup_user.h
+cleanup.o: ../../include/mail_proto.h
+cleanup.o: ../../include/iostuff.h
+cleanup.o: ../../include/mail_params.h
+cleanup.o: ../../include/record.h
+cleanup.o: ../../include/rec_type.h
+cleanup.o: ../../include/mail_server.h
 cleanup.o: cleanup.h
-cleanup.o: ../include/maps.h
-cleanup.o: ../include/tok822.h
-cleanup.o: ../include/resolve_clnt.h
-cleanup.o: ../include/been_here.h
-cleanup.o: ../include/mail_stream.h
+cleanup.o: ../../include/maps.h
+cleanup.o: ../../include/tok822.h
+cleanup.o: ../../include/resolve_clnt.h
+cleanup.o: ../../include/been_here.h
+cleanup.o: ../../include/mail_stream.h
 cleanup_api.o: cleanup_api.c
-cleanup_api.o: ../include/sys_defs.h
-cleanup_api.o: ../include/msg.h
-cleanup_api.o: ../include/vstring.h
-cleanup_api.o: ../include/vbuf.h
-cleanup_api.o: ../include/mymalloc.h
-cleanup_api.o: ../include/cleanup_user.h
-cleanup_api.o: ../include/mail_queue.h
-cleanup_api.o: ../include/vstream.h
-cleanup_api.o: ../include/mail_proto.h
-cleanup_api.o: ../include/iostuff.h
-cleanup_api.o: ../include/bounce.h
-cleanup_api.o: ../include/mail_params.h
-cleanup_api.o: ../include/mail_stream.h
+cleanup_api.o: ../../include/sys_defs.h
+cleanup_api.o: ../../include/msg.h
+cleanup_api.o: ../../include/vstring.h
+cleanup_api.o: ../../include/vbuf.h
+cleanup_api.o: ../../include/mymalloc.h
+cleanup_api.o: ../../include/cleanup_user.h
+cleanup_api.o: ../../include/mail_queue.h
+cleanup_api.o: ../../include/vstream.h
+cleanup_api.o: ../../include/mail_proto.h
+cleanup_api.o: ../../include/iostuff.h
+cleanup_api.o: ../../include/bounce.h
+cleanup_api.o: ../../include/mail_params.h
+cleanup_api.o: ../../include/mail_stream.h
 cleanup_api.o: cleanup.h
-cleanup_api.o: ../include/argv.h
-cleanup_api.o: ../include/maps.h
-cleanup_api.o: ../include/dict.h
-cleanup_api.o: ../include/tok822.h
-cleanup_api.o: ../include/resolve_clnt.h
-cleanup_api.o: ../include/been_here.h
-cleanup_api.o: ../include/mail_conf.h
+cleanup_api.o: ../../include/argv.h
+cleanup_api.o: ../../include/maps.h
+cleanup_api.o: ../../include/dict.h
+cleanup_api.o: ../../include/tok822.h
+cleanup_api.o: ../../include/resolve_clnt.h
+cleanup_api.o: ../../include/been_here.h
+cleanup_api.o: ../../include/mail_conf.h
 cleanup_envelope.o: cleanup_envelope.c
-cleanup_envelope.o: ../include/sys_defs.h
-cleanup_envelope.o: ../include/msg.h
-cleanup_envelope.o: ../include/vstring.h
-cleanup_envelope.o: ../include/vbuf.h
-cleanup_envelope.o: ../include/vstream.h
-cleanup_envelope.o: ../include/mymalloc.h
-cleanup_envelope.o: ../include/record.h
-cleanup_envelope.o: ../include/rec_type.h
-cleanup_envelope.o: ../include/cleanup_user.h
-cleanup_envelope.o: ../include/tok822.h
-cleanup_envelope.o: ../include/resolve_clnt.h
-cleanup_envelope.o: ../include/mail_params.h
-cleanup_envelope.o: ../include/ext_prop.h
-cleanup_envelope.o: ../include/mail_addr.h
-cleanup_envelope.o: ../include/canon_addr.h
+cleanup_envelope.o: ../../include/sys_defs.h
+cleanup_envelope.o: ../../include/msg.h
+cleanup_envelope.o: ../../include/vstring.h
+cleanup_envelope.o: ../../include/vbuf.h
+cleanup_envelope.o: ../../include/vstream.h
+cleanup_envelope.o: ../../include/mymalloc.h
+cleanup_envelope.o: ../../include/record.h
+cleanup_envelope.o: ../../include/rec_type.h
+cleanup_envelope.o: ../../include/cleanup_user.h
+cleanup_envelope.o: ../../include/tok822.h
+cleanup_envelope.o: ../../include/resolve_clnt.h
+cleanup_envelope.o: ../../include/mail_params.h
+cleanup_envelope.o: ../../include/ext_prop.h
+cleanup_envelope.o: ../../include/mail_addr.h
+cleanup_envelope.o: ../../include/canon_addr.h
 cleanup_envelope.o: cleanup.h
-cleanup_envelope.o: ../include/argv.h
-cleanup_envelope.o: ../include/maps.h
-cleanup_envelope.o: ../include/dict.h
-cleanup_envelope.o: ../include/been_here.h
-cleanup_envelope.o: ../include/mail_stream.h
-cleanup_envelope.o: ../include/mail_conf.h
+cleanup_envelope.o: ../../include/argv.h
+cleanup_envelope.o: ../../include/maps.h
+cleanup_envelope.o: ../../include/dict.h
+cleanup_envelope.o: ../../include/been_here.h
+cleanup_envelope.o: ../../include/mail_stream.h
+cleanup_envelope.o: ../../include/mail_conf.h
 cleanup_extracted.o: cleanup_extracted.c
-cleanup_extracted.o: ../include/sys_defs.h
-cleanup_extracted.o: ../include/msg.h
-cleanup_extracted.o: ../include/vstring.h
-cleanup_extracted.o: ../include/vbuf.h
-cleanup_extracted.o: ../include/vstream.h
-cleanup_extracted.o: ../include/argv.h
-cleanup_extracted.o: ../include/mymalloc.h
-cleanup_extracted.o: ../include/cleanup_user.h
-cleanup_extracted.o: ../include/record.h
-cleanup_extracted.o: ../include/rec_type.h
-cleanup_extracted.o: ../include/mail_params.h
-cleanup_extracted.o: ../include/ext_prop.h
+cleanup_extracted.o: ../../include/sys_defs.h
+cleanup_extracted.o: ../../include/msg.h
+cleanup_extracted.o: ../../include/vstring.h
+cleanup_extracted.o: ../../include/vbuf.h
+cleanup_extracted.o: ../../include/vstream.h
+cleanup_extracted.o: ../../include/argv.h
+cleanup_extracted.o: ../../include/mymalloc.h
+cleanup_extracted.o: ../../include/cleanup_user.h
+cleanup_extracted.o: ../../include/record.h
+cleanup_extracted.o: ../../include/rec_type.h
+cleanup_extracted.o: ../../include/mail_params.h
+cleanup_extracted.o: ../../include/ext_prop.h
 cleanup_extracted.o: cleanup.h
-cleanup_extracted.o: ../include/maps.h
-cleanup_extracted.o: ../include/dict.h
-cleanup_extracted.o: ../include/tok822.h
-cleanup_extracted.o: ../include/resolve_clnt.h
-cleanup_extracted.o: ../include/been_here.h
-cleanup_extracted.o: ../include/mail_stream.h
-cleanup_extracted.o: ../include/mail_conf.h
+cleanup_extracted.o: ../../include/maps.h
+cleanup_extracted.o: ../../include/dict.h
+cleanup_extracted.o: ../../include/tok822.h
+cleanup_extracted.o: ../../include/resolve_clnt.h
+cleanup_extracted.o: ../../include/been_here.h
+cleanup_extracted.o: ../../include/mail_stream.h
+cleanup_extracted.o: ../../include/mail_conf.h
 cleanup_init.o: cleanup_init.c
-cleanup_init.o: ../include/sys_defs.h
-cleanup_init.o: ../include/msg.h
-cleanup_init.o: ../include/iostuff.h
-cleanup_init.o: ../include/mail_addr.h
-cleanup_init.o: ../include/mail_params.h
-cleanup_init.o: ../include/ext_prop.h
+cleanup_init.o: ../../include/sys_defs.h
+cleanup_init.o: ../../include/msg.h
+cleanup_init.o: ../../include/iostuff.h
+cleanup_init.o: ../../include/mail_addr.h
+cleanup_init.o: ../../include/mail_params.h
+cleanup_init.o: ../../include/ext_prop.h
 cleanup_init.o: cleanup.h
-cleanup_init.o: ../include/vstring.h
-cleanup_init.o: ../include/vbuf.h
-cleanup_init.o: ../include/vstream.h
-cleanup_init.o: ../include/argv.h
-cleanup_init.o: ../include/maps.h
-cleanup_init.o: ../include/dict.h
-cleanup_init.o: ../include/tok822.h
-cleanup_init.o: ../include/resolve_clnt.h
-cleanup_init.o: ../include/been_here.h
-cleanup_init.o: ../include/mail_stream.h
-cleanup_init.o: ../include/mail_conf.h
+cleanup_init.o: ../../include/vstring.h
+cleanup_init.o: ../../include/vbuf.h
+cleanup_init.o: ../../include/vstream.h
+cleanup_init.o: ../../include/argv.h
+cleanup_init.o: ../../include/maps.h
+cleanup_init.o: ../../include/dict.h
+cleanup_init.o: ../../include/tok822.h
+cleanup_init.o: ../../include/resolve_clnt.h
+cleanup_init.o: ../../include/been_here.h
+cleanup_init.o: ../../include/mail_stream.h
+cleanup_init.o: ../../include/mail_conf.h
 cleanup_map11.o: cleanup_map11.c
-cleanup_map11.o: ../include/sys_defs.h
-cleanup_map11.o: ../include/msg.h
-cleanup_map11.o: ../include/vstring.h
-cleanup_map11.o: ../include/vbuf.h
-cleanup_map11.o: ../include/dict.h
-cleanup_map11.o: ../include/vstream.h
-cleanup_map11.o: ../include/argv.h
-cleanup_map11.o: ../include/mymalloc.h
-cleanup_map11.o: ../include/cleanup_user.h
-cleanup_map11.o: ../include/mail_addr_map.h
-cleanup_map11.o: ../include/maps.h
-cleanup_map11.o: ../include/quote_822_local.h
+cleanup_map11.o: ../../include/sys_defs.h
+cleanup_map11.o: ../../include/msg.h
+cleanup_map11.o: ../../include/vstring.h
+cleanup_map11.o: ../../include/vbuf.h
+cleanup_map11.o: ../../include/dict.h
+cleanup_map11.o: ../../include/vstream.h
+cleanup_map11.o: ../../include/argv.h
+cleanup_map11.o: ../../include/mymalloc.h
+cleanup_map11.o: ../../include/cleanup_user.h
+cleanup_map11.o: ../../include/mail_addr_map.h
+cleanup_map11.o: ../../include/maps.h
+cleanup_map11.o: ../../include/quote_822_local.h
 cleanup_map11.o: cleanup.h
-cleanup_map11.o: ../include/tok822.h
-cleanup_map11.o: ../include/resolve_clnt.h
-cleanup_map11.o: ../include/been_here.h
-cleanup_map11.o: ../include/mail_stream.h
-cleanup_map11.o: ../include/mail_conf.h
+cleanup_map11.o: ../../include/tok822.h
+cleanup_map11.o: ../../include/resolve_clnt.h
+cleanup_map11.o: ../../include/been_here.h
+cleanup_map11.o: ../../include/mail_stream.h
+cleanup_map11.o: ../../include/mail_conf.h
 cleanup_map1n.o: cleanup_map1n.c
-cleanup_map1n.o: ../include/sys_defs.h
-cleanup_map1n.o: ../include/mymalloc.h
-cleanup_map1n.o: ../include/msg.h
-cleanup_map1n.o: ../include/argv.h
-cleanup_map1n.o: ../include/vstring.h
-cleanup_map1n.o: ../include/vbuf.h
-cleanup_map1n.o: ../include/dict.h
-cleanup_map1n.o: ../include/vstream.h
-cleanup_map1n.o: ../include/mail_addr_map.h
-cleanup_map1n.o: ../include/maps.h
-cleanup_map1n.o: ../include/cleanup_user.h
-cleanup_map1n.o: ../include/quote_822_local.h
+cleanup_map1n.o: ../../include/sys_defs.h
+cleanup_map1n.o: ../../include/mymalloc.h
+cleanup_map1n.o: ../../include/msg.h
+cleanup_map1n.o: ../../include/argv.h
+cleanup_map1n.o: ../../include/vstring.h
+cleanup_map1n.o: ../../include/vbuf.h
+cleanup_map1n.o: ../../include/dict.h
+cleanup_map1n.o: ../../include/vstream.h
+cleanup_map1n.o: ../../include/mail_addr_map.h
+cleanup_map1n.o: ../../include/maps.h
+cleanup_map1n.o: ../../include/cleanup_user.h
+cleanup_map1n.o: ../../include/quote_822_local.h
 cleanup_map1n.o: cleanup.h
-cleanup_map1n.o: ../include/tok822.h
-cleanup_map1n.o: ../include/resolve_clnt.h
-cleanup_map1n.o: ../include/been_here.h
-cleanup_map1n.o: ../include/mail_stream.h
-cleanup_map1n.o: ../include/mail_conf.h
+cleanup_map1n.o: ../../include/tok822.h
+cleanup_map1n.o: ../../include/resolve_clnt.h
+cleanup_map1n.o: ../../include/been_here.h
+cleanup_map1n.o: ../../include/mail_stream.h
+cleanup_map1n.o: ../../include/mail_conf.h
 cleanup_masquerade.o: cleanup_masquerade.c
-cleanup_masquerade.o: ../include/sys_defs.h
-cleanup_masquerade.o: ../include/msg.h
-cleanup_masquerade.o: ../include/vstring.h
-cleanup_masquerade.o: ../include/vbuf.h
-cleanup_masquerade.o: ../include/argv.h
-cleanup_masquerade.o: ../include/htable.h
-cleanup_masquerade.o: ../include/mymalloc.h
-cleanup_masquerade.o: ../include/stringops.h
-cleanup_masquerade.o: ../include/mail_params.h
-cleanup_masquerade.o: ../include/tok822.h
-cleanup_masquerade.o: ../include/resolve_clnt.h
-cleanup_masquerade.o: ../include/quote_822_local.h
+cleanup_masquerade.o: ../../include/sys_defs.h
+cleanup_masquerade.o: ../../include/msg.h
+cleanup_masquerade.o: ../../include/vstring.h
+cleanup_masquerade.o: ../../include/vbuf.h
+cleanup_masquerade.o: ../../include/argv.h
+cleanup_masquerade.o: ../../include/htable.h
+cleanup_masquerade.o: ../../include/mymalloc.h
+cleanup_masquerade.o: ../../include/stringops.h
+cleanup_masquerade.o: ../../include/mail_params.h
+cleanup_masquerade.o: ../../include/tok822.h
+cleanup_masquerade.o: ../../include/resolve_clnt.h
+cleanup_masquerade.o: ../../include/quote_822_local.h
 cleanup_masquerade.o: cleanup.h
-cleanup_masquerade.o: ../include/vstream.h
-cleanup_masquerade.o: ../include/maps.h
-cleanup_masquerade.o: ../include/dict.h
-cleanup_masquerade.o: ../include/been_here.h
-cleanup_masquerade.o: ../include/mail_stream.h
-cleanup_masquerade.o: ../include/mail_conf.h
+cleanup_masquerade.o: ../../include/vstream.h
+cleanup_masquerade.o: ../../include/maps.h
+cleanup_masquerade.o: ../../include/dict.h
+cleanup_masquerade.o: ../../include/been_here.h
+cleanup_masquerade.o: ../../include/mail_stream.h
+cleanup_masquerade.o: ../../include/mail_conf.h
 cleanup_message.o: cleanup_message.c
-cleanup_message.o: ../include/sys_defs.h
-cleanup_message.o: ../include/msg.h
-cleanup_message.o: ../include/vstring.h
-cleanup_message.o: ../include/vbuf.h
-cleanup_message.o: ../include/vstream.h
-cleanup_message.o: ../include/argv.h
-cleanup_message.o: ../include/split_at.h
-cleanup_message.o: ../include/mymalloc.h
-cleanup_message.o: ../include/record.h
-cleanup_message.o: ../include/rec_type.h
-cleanup_message.o: ../include/cleanup_user.h
-cleanup_message.o: ../include/tok822.h
-cleanup_message.o: ../include/resolve_clnt.h
-cleanup_message.o: ../include/header_opts.h
-cleanup_message.o: ../include/quote_822_local.h
-cleanup_message.o: ../include/mail_params.h
-cleanup_message.o: ../include/mail_date.h
-cleanup_message.o: ../include/mail_addr.h
-cleanup_message.o: ../include/is_header.h
-cleanup_message.o: ../include/ext_prop.h
+cleanup_message.o: ../../include/sys_defs.h
+cleanup_message.o: ../../include/msg.h
+cleanup_message.o: ../../include/vstring.h
+cleanup_message.o: ../../include/vbuf.h
+cleanup_message.o: ../../include/vstream.h
+cleanup_message.o: ../../include/argv.h
+cleanup_message.o: ../../include/split_at.h
+cleanup_message.o: ../../include/mymalloc.h
+cleanup_message.o: ../../include/record.h
+cleanup_message.o: ../../include/rec_type.h
+cleanup_message.o: ../../include/cleanup_user.h
+cleanup_message.o: ../../include/tok822.h
+cleanup_message.o: ../../include/resolve_clnt.h
+cleanup_message.o: ../../include/header_opts.h
+cleanup_message.o: ../../include/quote_822_local.h
+cleanup_message.o: ../../include/mail_params.h
+cleanup_message.o: ../../include/mail_date.h
+cleanup_message.o: ../../include/mail_addr.h
+cleanup_message.o: ../../include/is_header.h
+cleanup_message.o: ../../include/ext_prop.h
 cleanup_message.o: cleanup.h
-cleanup_message.o: ../include/maps.h
-cleanup_message.o: ../include/dict.h
-cleanup_message.o: ../include/been_here.h
-cleanup_message.o: ../include/mail_stream.h
-cleanup_message.o: ../include/mail_conf.h
+cleanup_message.o: ../../include/maps.h
+cleanup_message.o: ../../include/dict.h
+cleanup_message.o: ../../include/been_here.h
+cleanup_message.o: ../../include/mail_stream.h
+cleanup_message.o: ../../include/mail_conf.h
 cleanup_out.o: cleanup_out.c
-cleanup_out.o: ../include/sys_defs.h
-cleanup_out.o: ../include/msg.h
-cleanup_out.o: ../include/vstring.h
-cleanup_out.o: ../include/vbuf.h
-cleanup_out.o: ../include/vstream.h
-cleanup_out.o: ../include/record.h
-cleanup_out.o: ../include/rec_type.h
-cleanup_out.o: ../include/cleanup_user.h
+cleanup_out.o: ../../include/sys_defs.h
+cleanup_out.o: ../../include/msg.h
+cleanup_out.o: ../../include/vstring.h
+cleanup_out.o: ../../include/vbuf.h
+cleanup_out.o: ../../include/vstream.h
+cleanup_out.o: ../../include/record.h
+cleanup_out.o: ../../include/rec_type.h
+cleanup_out.o: ../../include/cleanup_user.h
 cleanup_out.o: cleanup.h
-cleanup_out.o: ../include/argv.h
-cleanup_out.o: ../include/maps.h
-cleanup_out.o: ../include/dict.h
-cleanup_out.o: ../include/tok822.h
-cleanup_out.o: ../include/resolve_clnt.h
-cleanup_out.o: ../include/been_here.h
-cleanup_out.o: ../include/mail_stream.h
-cleanup_out.o: ../include/mail_conf.h
+cleanup_out.o: ../../include/argv.h
+cleanup_out.o: ../../include/maps.h
+cleanup_out.o: ../../include/dict.h
+cleanup_out.o: ../../include/tok822.h
+cleanup_out.o: ../../include/resolve_clnt.h
+cleanup_out.o: ../../include/been_here.h
+cleanup_out.o: ../../include/mail_stream.h
+cleanup_out.o: ../../include/mail_conf.h
 cleanup_out_recipient.o: cleanup_out_recipient.c
-cleanup_out_recipient.o: ../include/sys_defs.h
-cleanup_out_recipient.o: ../include/argv.h
-cleanup_out_recipient.o: ../include/been_here.h
-cleanup_out_recipient.o: ../include/mail_params.h
-cleanup_out_recipient.o: ../include/rec_type.h
-cleanup_out_recipient.o: ../include/ext_prop.h
+cleanup_out_recipient.o: ../../include/sys_defs.h
+cleanup_out_recipient.o: ../../include/argv.h
+cleanup_out_recipient.o: ../../include/been_here.h
+cleanup_out_recipient.o: ../../include/mail_params.h
+cleanup_out_recipient.o: ../../include/rec_type.h
+cleanup_out_recipient.o: ../../include/ext_prop.h
 cleanup_out_recipient.o: cleanup.h
-cleanup_out_recipient.o: ../include/vstring.h
-cleanup_out_recipient.o: ../include/vbuf.h
-cleanup_out_recipient.o: ../include/vstream.h
-cleanup_out_recipient.o: ../include/maps.h
-cleanup_out_recipient.o: ../include/dict.h
-cleanup_out_recipient.o: ../include/tok822.h
-cleanup_out_recipient.o: ../include/resolve_clnt.h
-cleanup_out_recipient.o: ../include/mail_stream.h
-cleanup_out_recipient.o: ../include/mail_conf.h
+cleanup_out_recipient.o: ../../include/vstring.h
+cleanup_out_recipient.o: ../../include/vbuf.h
+cleanup_out_recipient.o: ../../include/vstream.h
+cleanup_out_recipient.o: ../../include/maps.h
+cleanup_out_recipient.o: ../../include/dict.h
+cleanup_out_recipient.o: ../../include/tok822.h
+cleanup_out_recipient.o: ../../include/resolve_clnt.h
+cleanup_out_recipient.o: ../../include/mail_stream.h
+cleanup_out_recipient.o: ../../include/mail_conf.h
 cleanup_rewrite.o: cleanup_rewrite.c
-cleanup_rewrite.o: ../include/sys_defs.h
-cleanup_rewrite.o: ../include/msg.h
-cleanup_rewrite.o: ../include/vstring.h
-cleanup_rewrite.o: ../include/vbuf.h
-cleanup_rewrite.o: ../include/tok822.h
-cleanup_rewrite.o: ../include/resolve_clnt.h
-cleanup_rewrite.o: ../include/rewrite_clnt.h
-cleanup_rewrite.o: ../include/quote_822_local.h
+cleanup_rewrite.o: ../../include/sys_defs.h
+cleanup_rewrite.o: ../../include/msg.h
+cleanup_rewrite.o: ../../include/vstring.h
+cleanup_rewrite.o: ../../include/vbuf.h
+cleanup_rewrite.o: ../../include/tok822.h
+cleanup_rewrite.o: ../../include/resolve_clnt.h
+cleanup_rewrite.o: ../../include/rewrite_clnt.h
+cleanup_rewrite.o: ../../include/quote_822_local.h
 cleanup_rewrite.o: cleanup.h
-cleanup_rewrite.o: ../include/vstream.h
-cleanup_rewrite.o: ../include/argv.h
-cleanup_rewrite.o: ../include/maps.h
-cleanup_rewrite.o: ../include/dict.h
-cleanup_rewrite.o: ../include/been_here.h
-cleanup_rewrite.o: ../include/mail_stream.h
-cleanup_rewrite.o: ../include/mail_conf.h
+cleanup_rewrite.o: ../../include/vstream.h
+cleanup_rewrite.o: ../../include/argv.h
+cleanup_rewrite.o: ../../include/maps.h
+cleanup_rewrite.o: ../../include/dict.h
+cleanup_rewrite.o: ../../include/been_here.h
+cleanup_rewrite.o: ../../include/mail_stream.h
+cleanup_rewrite.o: ../../include/mail_conf.h
 cleanup_state.o: cleanup_state.c
-cleanup_state.o: ../include/sys_defs.h
-cleanup_state.o: ../include/mymalloc.h
-cleanup_state.o: ../include/vstring.h
-cleanup_state.o: ../include/vbuf.h
-cleanup_state.o: ../include/argv.h
-cleanup_state.o: ../include/been_here.h
-cleanup_state.o: ../include/mail_params.h
+cleanup_state.o: ../../include/sys_defs.h
+cleanup_state.o: ../../include/mymalloc.h
+cleanup_state.o: ../../include/vstring.h
+cleanup_state.o: ../../include/vbuf.h
+cleanup_state.o: ../../include/argv.h
+cleanup_state.o: ../../include/been_here.h
+cleanup_state.o: ../../include/mail_params.h
 cleanup_state.o: cleanup.h
-cleanup_state.o: ../include/vstream.h
-cleanup_state.o: ../include/maps.h
-cleanup_state.o: ../include/dict.h
-cleanup_state.o: ../include/tok822.h
-cleanup_state.o: ../include/resolve_clnt.h
-cleanup_state.o: ../include/mail_stream.h
-cleanup_state.o: ../include/mail_conf.h
+cleanup_state.o: ../../include/vstream.h
+cleanup_state.o: ../../include/maps.h
+cleanup_state.o: ../../include/dict.h
+cleanup_state.o: ../../include/tok822.h
+cleanup_state.o: ../../include/resolve_clnt.h
+cleanup_state.o: ../../include/mail_stream.h
+cleanup_state.o: ../../include/mail_conf.h
diff --git a/postfix/src/dns/Makefile.in b/postfix/src/dns/Makefile.in
index 245fc77ee..3e544500e 100644
--- a/postfix/src/dns/Makefile.in
+++ b/postfix/src/dns/Makefile.in
@@ -11,16 +11,16 @@ CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 INCL	=
 LIB	= libdns.a
 TESTPROG= test_dns_lookup
-LIBS	= ../lib/libutil.a
-LIB_DIR	= ../lib
-INC_DIR	= ../include
+LIBS	= ../../lib/libutil.a
+LIB_DIR	= ../../lib
+INC_DIR	= ../../include
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 all: $(LIB)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
@@ -48,7 +48,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -69,36 +69,36 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 dns_lookup.o: dns_lookup.c
-dns_lookup.o: ../include/sys_defs.h
-dns_lookup.o: ../include/mymalloc.h
-dns_lookup.o: ../include/vstring.h
-dns_lookup.o: ../include/vbuf.h
-dns_lookup.o: ../include/msg.h
-dns_lookup.o: ../include/valid_hostname.h
-dns_lookup.o: ../include/stringops.h
+dns_lookup.o: ../../include/sys_defs.h
+dns_lookup.o: ../../include/mymalloc.h
+dns_lookup.o: ../../include/vstring.h
+dns_lookup.o: ../../include/vbuf.h
+dns_lookup.o: ../../include/msg.h
+dns_lookup.o: ../../include/valid_hostname.h
+dns_lookup.o: ../../include/stringops.h
 dns_lookup.o: dns.h
 dns_rr.o: dns_rr.c
-dns_rr.o: ../include/sys_defs.h
-dns_rr.o: ../include/msg.h
-dns_rr.o: ../include/mymalloc.h
+dns_rr.o: ../../include/sys_defs.h
+dns_rr.o: ../../include/msg.h
+dns_rr.o: ../../include/mymalloc.h
 dns_rr.o: dns.h
-dns_rr.o: ../include/vstring.h
-dns_rr.o: ../include/vbuf.h
+dns_rr.o: ../../include/vstring.h
+dns_rr.o: ../../include/vbuf.h
 dns_strerror.o: dns_strerror.c
-dns_strerror.o: ../include/sys_defs.h
-dns_strerror.o: ../include/vstring.h
-dns_strerror.o: ../include/vbuf.h
+dns_strerror.o: ../../include/sys_defs.h
+dns_strerror.o: ../../include/vstring.h
+dns_strerror.o: ../../include/vbuf.h
 dns_strerror.o: dns.h
 dns_strtype.o: dns_strtype.c
-dns_strtype.o: ../include/sys_defs.h
-dns_strtype.o: ../include/vstring.h
-dns_strtype.o: ../include/vbuf.h
+dns_strtype.o: ../../include/sys_defs.h
+dns_strtype.o: ../../include/vstring.h
+dns_strtype.o: ../../include/vbuf.h
 dns_strtype.o: dns.h
 test_dns_lookup.o: test_dns_lookup.c
-test_dns_lookup.o: ../include/sys_defs.h
-test_dns_lookup.o: ../include/vstring.h
-test_dns_lookup.o: ../include/vbuf.h
-test_dns_lookup.o: ../include/msg.h
-test_dns_lookup.o: ../include/msg_vstream.h
-test_dns_lookup.o: ../include/vstream.h
+test_dns_lookup.o: ../../include/sys_defs.h
+test_dns_lookup.o: ../../include/vstring.h
+test_dns_lookup.o: ../../include/vbuf.h
+test_dns_lookup.o: ../../include/msg.h
+test_dns_lookup.o: ../../include/msg_vstream.h
+test_dns_lookup.o: ../../include/vstream.h
 test_dns_lookup.o: dns.h
diff --git a/postfix/src/error/Makefile.in b/postfix/src/error/Makefile.in
index 7d43663d0..82a3493b1 100644
--- a/postfix/src/error/Makefile.in
+++ b/postfix/src/error/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= quote_821_local error_unalias
 PROG	= error
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,14 +54,14 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 error.o: error.c
-error.o: ../include/sys_defs.h
-error.o: ../include/msg.h
-error.o: ../include/vstream.h
-error.o: ../include/vbuf.h
-error.o: ../include/deliver_request.h
-error.o: ../include/vstring.h
-error.o: ../include/recipient_list.h
-error.o: ../include/mail_queue.h
-error.o: ../include/bounce.h
-error.o: ../include/deliver_completed.h
-error.o: ../include/mail_server.h
+error.o: ../../include/sys_defs.h
+error.o: ../../include/msg.h
+error.o: ../../include/vstream.h
+error.o: ../../include/vbuf.h
+error.o: ../../include/deliver_request.h
+error.o: ../../include/vstring.h
+error.o: ../../include/recipient_list.h
+error.o: ../../include/mail_queue.h
+error.o: ../../include/bounce.h
+error.o: ../../include/deliver_completed.h
+error.o: ../../include/mail_server.h
diff --git a/postfix/src/fsstone/Makefile.in b/postfix/src/fsstone/Makefile.in
index a463020f8..95713f1e9 100644
--- a/postfix/src/fsstone/Makefile.in
+++ b/postfix/src/fsstone/Makefile.in
@@ -10,24 +10,24 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= fsstone
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 all:	$(PROG)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 fsstone: fsstone.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS)
 
 test:	$(TESTPROG)
 
-update: ../libexec/fsstone
+update: ../../libexec/fsstone
 
-../libexec/fsstone: fsstone
+../../libexec/fsstone: fsstone
 	cp $? $@
 
 printfck: $(OBJS) $(PROG)
@@ -35,7 +35,7 @@ printfck: $(OBJS) $(PROG)
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
 
@@ -55,8 +55,8 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 fsstone.o: fsstone.c
-fsstone.o: ../include/sys_defs.h
-fsstone.o: ../include/msg.h
-fsstone.o: ../include/msg_vstream.h
-fsstone.o: ../include/vstream.h
-fsstone.o: ../include/vbuf.h
+fsstone.o: ../../include/sys_defs.h
+fsstone.o: ../../include/msg.h
+fsstone.o: ../../include/msg_vstream.h
+fsstone.o: ../../include/vstream.h
+fsstone.o: ../../include/vbuf.h
diff --git a/postfix/src/global/Makefile.in b/postfix/src/global/Makefile.in
index 544b29919..9282db9a2 100644
--- a/postfix/src/global/Makefile.in
+++ b/postfix/src/global/Makefile.in
@@ -66,9 +66,9 @@ TESTPROG= domain_list dot_lockfile mail_addr_crunch mail_addr_find \
 	resolve_local rewrite_clnt stream2rec string_list tok822_parse \
 	quote_821_local
 
-LIBS	= ../lib/libutil.a
-LIB_DIR	= ../lib
-INC_DIR	= ../include
+LIBS	= ../../lib/libutil.a
+LIB_DIR	= ../../lib
+INC_DIR	= ../../include
 MAKES	=
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
@@ -76,7 +76,7 @@ MAKES	=
 all: $(LIB)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
@@ -215,7 +215,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -236,279 +236,279 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 been_here.o: been_here.c
-been_here.o: ../include/sys_defs.h
-been_here.o: ../include/msg.h
-been_here.o: ../include/mymalloc.h
-been_here.o: ../include/htable.h
-been_here.o: ../include/vstring.h
-been_here.o: ../include/vbuf.h
-been_here.o: ../include/stringops.h
+been_here.o: ../../include/sys_defs.h
+been_here.o: ../../include/msg.h
+been_here.o: ../../include/mymalloc.h
+been_here.o: ../../include/htable.h
+been_here.o: ../../include/vstring.h
+been_here.o: ../../include/vbuf.h
+been_here.o: ../../include/stringops.h
 been_here.o: been_here.h
 bounce.o: bounce.c
-bounce.o: ../include/sys_defs.h
-bounce.o: ../include/msg.h
-bounce.o: ../include/vstring.h
-bounce.o: ../include/vbuf.h
+bounce.o: ../../include/sys_defs.h
+bounce.o: ../../include/msg.h
+bounce.o: ../../include/vstring.h
+bounce.o: ../../include/vbuf.h
 bounce.o: mail_params.h
 bounce.o: mail_proto.h
-bounce.o: ../include/vstream.h
-bounce.o: ../include/iostuff.h
+bounce.o: ../../include/vstream.h
+bounce.o: ../../include/iostuff.h
 bounce.o: defer.h
 bounce.o: bounce.h
 canon_addr.o: canon_addr.c
-canon_addr.o: ../include/sys_defs.h
-canon_addr.o: ../include/vstring.h
-canon_addr.o: ../include/vbuf.h
-canon_addr.o: ../include/mymalloc.h
+canon_addr.o: ../../include/sys_defs.h
+canon_addr.o: ../../include/vstring.h
+canon_addr.o: ../../include/vbuf.h
+canon_addr.o: ../../include/mymalloc.h
 canon_addr.o: rewrite_clnt.h
 canon_addr.o: canon_addr.h
 cleanup_strerror.o: cleanup_strerror.c
-cleanup_strerror.o: ../include/sys_defs.h
-cleanup_strerror.o: ../include/vstring.h
-cleanup_strerror.o: ../include/vbuf.h
+cleanup_strerror.o: ../../include/sys_defs.h
+cleanup_strerror.o: ../../include/vstring.h
+cleanup_strerror.o: ../../include/vbuf.h
 cleanup_strerror.o: cleanup_user.h
 clnt_stream.o: clnt_stream.c
-clnt_stream.o: ../include/sys_defs.h
-clnt_stream.o: ../include/msg.h
-clnt_stream.o: ../include/mymalloc.h
-clnt_stream.o: ../include/vstream.h
-clnt_stream.o: ../include/vbuf.h
-clnt_stream.o: ../include/events.h
-clnt_stream.o: ../include/iostuff.h
+clnt_stream.o: ../../include/sys_defs.h
+clnt_stream.o: ../../include/msg.h
+clnt_stream.o: ../../include/mymalloc.h
+clnt_stream.o: ../../include/vstream.h
+clnt_stream.o: ../../include/vbuf.h
+clnt_stream.o: ../../include/events.h
+clnt_stream.o: ../../include/iostuff.h
 clnt_stream.o: mail_proto.h
 clnt_stream.o: mail_params.h
 clnt_stream.o: clnt_stream.h
 debug_peer.o: debug_peer.c
-debug_peer.o: ../include/sys_defs.h
-debug_peer.o: ../include/msg.h
+debug_peer.o: ../../include/sys_defs.h
+debug_peer.o: ../../include/msg.h
 debug_peer.o: mail_params.h
 debug_peer.o: namadr_list.h
 debug_peer.o: debug_peer.h
 debug_process.o: debug_process.c
-debug_process.o: ../include/sys_defs.h
-debug_process.o: ../include/msg.h
+debug_process.o: ../../include/sys_defs.h
+debug_process.o: ../../include/msg.h
 debug_process.o: mail_params.h
 debug_process.o: mail_conf.h
 debug_process.o: debug_process.h
 defer.o: defer.c
-defer.o: ../include/sys_defs.h
-defer.o: ../include/msg.h
-defer.o: ../include/vstring.h
-defer.o: ../include/vbuf.h
+defer.o: ../../include/sys_defs.h
+defer.o: ../../include/msg.h
+defer.o: ../../include/vstring.h
+defer.o: ../../include/vbuf.h
 defer.o: mail_queue.h
-defer.o: ../include/vstream.h
+defer.o: ../../include/vstream.h
 defer.o: mail_proto.h
-defer.o: ../include/iostuff.h
+defer.o: ../../include/iostuff.h
 defer.o: bounce.h
 defer.o: defer.h
 deliver_completed.o: deliver_completed.c
-deliver_completed.o: ../include/sys_defs.h
-deliver_completed.o: ../include/msg.h
-deliver_completed.o: ../include/vstream.h
-deliver_completed.o: ../include/vbuf.h
+deliver_completed.o: ../../include/sys_defs.h
+deliver_completed.o: ../../include/msg.h
+deliver_completed.o: ../../include/vstream.h
+deliver_completed.o: ../../include/vbuf.h
 deliver_completed.o: record.h
-deliver_completed.o: ../include/vstring.h
+deliver_completed.o: ../../include/vstring.h
 deliver_completed.o: rec_type.h
 deliver_completed.o: deliver_completed.h
 deliver_flock.o: deliver_flock.c
-deliver_flock.o: ../include/sys_defs.h
-deliver_flock.o: ../include/vstring.h
-deliver_flock.o: ../include/vbuf.h
-deliver_flock.o: ../include/myflock.h
+deliver_flock.o: ../../include/sys_defs.h
+deliver_flock.o: ../../include/vstring.h
+deliver_flock.o: ../../include/vbuf.h
+deliver_flock.o: ../../include/myflock.h
 deliver_flock.o: mail_params.h
 deliver_flock.o: deliver_flock.h
 deliver_pass.o: deliver_pass.c
-deliver_pass.o: ../include/sys_defs.h
-deliver_pass.o: ../include/msg.h
-deliver_pass.o: ../include/vstring.h
-deliver_pass.o: ../include/vbuf.h
-deliver_pass.o: ../include/vstream.h
+deliver_pass.o: ../../include/sys_defs.h
+deliver_pass.o: ../../include/msg.h
+deliver_pass.o: ../../include/vstring.h
+deliver_pass.o: ../../include/vbuf.h
+deliver_pass.o: ../../include/vstream.h
 deliver_pass.o: deliver_pass.h
 deliver_pass.o: deliver_request.h
 deliver_pass.o: recipient_list.h
 deliver_pass.o: mail_proto.h
-deliver_pass.o: ../include/iostuff.h
+deliver_pass.o: ../../include/iostuff.h
 deliver_request.o: deliver_request.c
-deliver_request.o: ../include/sys_defs.h
-deliver_request.o: ../include/msg.h
-deliver_request.o: ../include/vstream.h
-deliver_request.o: ../include/vbuf.h
-deliver_request.o: ../include/vstring.h
-deliver_request.o: ../include/mymalloc.h
-deliver_request.o: ../include/iostuff.h
-deliver_request.o: ../include/myflock.h
+deliver_request.o: ../../include/sys_defs.h
+deliver_request.o: ../../include/msg.h
+deliver_request.o: ../../include/vstream.h
+deliver_request.o: ../../include/vbuf.h
+deliver_request.o: ../../include/vstring.h
+deliver_request.o: ../../include/mymalloc.h
+deliver_request.o: ../../include/iostuff.h
+deliver_request.o: ../../include/myflock.h
 deliver_request.o: mail_queue.h
 deliver_request.o: mail_proto.h
 deliver_request.o: mail_open_ok.h
 deliver_request.o: recipient_list.h
 deliver_request.o: deliver_request.h
 domain_list.o: domain_list.c
-domain_list.o: ../include/sys_defs.h
-domain_list.o: ../include/match_list.h
-domain_list.o: ../include/match_ops.h
+domain_list.o: ../../include/sys_defs.h
+domain_list.o: ../../include/match_list.h
+domain_list.o: ../../include/match_ops.h
 domain_list.o: domain_list.h
 dot_lockfile.o: dot_lockfile.c
-dot_lockfile.o: ../include/sys_defs.h
-dot_lockfile.o: ../include/vstring.h
-dot_lockfile.o: ../include/vbuf.h
-dot_lockfile.o: ../include/stringops.h
-dot_lockfile.o: ../include/mymalloc.h
+dot_lockfile.o: ../../include/sys_defs.h
+dot_lockfile.o: ../../include/vstring.h
+dot_lockfile.o: ../../include/vbuf.h
+dot_lockfile.o: ../../include/stringops.h
+dot_lockfile.o: ../../include/mymalloc.h
 dot_lockfile.o: mail_params.h
 dot_lockfile.o: dot_lockfile.h
 dot_lockfile_as.o: dot_lockfile_as.c
-dot_lockfile_as.o: ../include/sys_defs.h
-dot_lockfile_as.o: ../include/msg.h
-dot_lockfile_as.o: ../include/set_eugid.h
+dot_lockfile_as.o: ../../include/sys_defs.h
+dot_lockfile_as.o: ../../include/msg.h
+dot_lockfile_as.o: ../../include/set_eugid.h
 dot_lockfile_as.o: dot_lockfile.h
-dot_lockfile_as.o: ../include/vstring.h
-dot_lockfile_as.o: ../include/vbuf.h
+dot_lockfile_as.o: ../../include/vstring.h
+dot_lockfile_as.o: ../../include/vbuf.h
 dot_lockfile_as.o: dot_lockfile_as.h
 ext_prop.o: ext_prop.c
-ext_prop.o: ../include/sys_defs.h
-ext_prop.o: ../include/name_mask.h
+ext_prop.o: ../../include/sys_defs.h
+ext_prop.o: ../../include/name_mask.h
 ext_prop.o: ext_prop.h
 file_id.o: file_id.c
-file_id.o: ../include/sys_defs.h
-file_id.o: ../include/msg.h
-file_id.o: ../include/vstring.h
-file_id.o: ../include/vbuf.h
+file_id.o: ../../include/sys_defs.h
+file_id.o: ../../include/msg.h
+file_id.o: ../../include/vstring.h
+file_id.o: ../../include/vbuf.h
 file_id.o: file_id.h
 header_opts.o: header_opts.c
-header_opts.o: ../include/sys_defs.h
-header_opts.o: ../include/msg.h
-header_opts.o: ../include/htable.h
-header_opts.o: ../include/vstring.h
-header_opts.o: ../include/vbuf.h
+header_opts.o: ../../include/sys_defs.h
+header_opts.o: ../../include/msg.h
+header_opts.o: ../../include/htable.h
+header_opts.o: ../../include/vstring.h
+header_opts.o: ../../include/vbuf.h
 header_opts.o: header_opts.h
 is_header.o: is_header.c
-is_header.o: ../include/sys_defs.h
+is_header.o: ../../include/sys_defs.h
 is_header.o: is_header.h
 local_transport.o: local_transport.c
-local_transport.o: ../include/sys_defs.h
-local_transport.o: ../include/msg.h
-local_transport.o: ../include/mymalloc.h
+local_transport.o: ../../include/sys_defs.h
+local_transport.o: ../../include/msg.h
+local_transport.o: ../../include/mymalloc.h
 local_transport.o: string_list.h
 local_transport.o: mail_params.h
 local_transport.o: local_transport.h
 mail_addr.o: mail_addr.c
-mail_addr.o: ../include/sys_defs.h
-mail_addr.o: ../include/stringops.h
-mail_addr.o: ../include/vstring.h
-mail_addr.o: ../include/vbuf.h
+mail_addr.o: ../../include/sys_defs.h
+mail_addr.o: ../../include/stringops.h
+mail_addr.o: ../../include/vstring.h
+mail_addr.o: ../../include/vbuf.h
 mail_addr.o: mail_params.h
 mail_addr.o: mail_addr.h
 mail_addr_crunch.o: mail_addr_crunch.c
-mail_addr_crunch.o: ../include/sys_defs.h
-mail_addr_crunch.o: ../include/mymalloc.h
-mail_addr_crunch.o: ../include/argv.h
-mail_addr_crunch.o: ../include/vstring.h
-mail_addr_crunch.o: ../include/vbuf.h
+mail_addr_crunch.o: ../../include/sys_defs.h
+mail_addr_crunch.o: ../../include/mymalloc.h
+mail_addr_crunch.o: ../../include/argv.h
+mail_addr_crunch.o: ../../include/vstring.h
+mail_addr_crunch.o: ../../include/vbuf.h
 mail_addr_crunch.o: tok822.h
 mail_addr_crunch.o: resolve_clnt.h
 mail_addr_crunch.o: canon_addr.h
 mail_addr_crunch.o: mail_addr_crunch.h
 mail_addr_find.o: mail_addr_find.c
-mail_addr_find.o: ../include/sys_defs.h
-mail_addr_find.o: ../include/msg.h
-mail_addr_find.o: ../include/dict.h
-mail_addr_find.o: ../include/vstream.h
-mail_addr_find.o: ../include/vbuf.h
-mail_addr_find.o: ../include/argv.h
-mail_addr_find.o: ../include/stringops.h
-mail_addr_find.o: ../include/vstring.h
-mail_addr_find.o: ../include/mymalloc.h
+mail_addr_find.o: ../../include/sys_defs.h
+mail_addr_find.o: ../../include/msg.h
+mail_addr_find.o: ../../include/dict.h
+mail_addr_find.o: ../../include/vstream.h
+mail_addr_find.o: ../../include/vbuf.h
+mail_addr_find.o: ../../include/argv.h
+mail_addr_find.o: ../../include/stringops.h
+mail_addr_find.o: ../../include/vstring.h
+mail_addr_find.o: ../../include/mymalloc.h
 mail_addr_find.o: mail_params.h
 mail_addr_find.o: split_addr.h
 mail_addr_find.o: mail_addr_find.h
 mail_addr_find.o: maps.h
 mail_addr_find.o: resolve_local.h
 mail_addr_map.o: mail_addr_map.c
-mail_addr_map.o: ../include/sys_defs.h
-mail_addr_map.o: ../include/msg.h
-mail_addr_map.o: ../include/vstring.h
-mail_addr_map.o: ../include/vbuf.h
-mail_addr_map.o: ../include/dict.h
-mail_addr_map.o: ../include/vstream.h
-mail_addr_map.o: ../include/argv.h
-mail_addr_map.o: ../include/mymalloc.h
+mail_addr_map.o: ../../include/sys_defs.h
+mail_addr_map.o: ../../include/msg.h
+mail_addr_map.o: ../../include/vstring.h
+mail_addr_map.o: ../../include/vbuf.h
+mail_addr_map.o: ../../include/dict.h
+mail_addr_map.o: ../../include/vstream.h
+mail_addr_map.o: ../../include/argv.h
+mail_addr_map.o: ../../include/mymalloc.h
 mail_addr_map.o: mail_addr_find.h
 mail_addr_map.o: maps.h
 mail_addr_map.o: mail_addr_crunch.h
 mail_addr_map.o: mail_addr_map.h
 mail_command_read.o: mail_command_read.c
-mail_command_read.o: ../include/sys_defs.h
-mail_command_read.o: ../include/vstring.h
-mail_command_read.o: ../include/vbuf.h
-mail_command_read.o: ../include/vstream.h
+mail_command_read.o: ../../include/sys_defs.h
+mail_command_read.o: ../../include/vstring.h
+mail_command_read.o: ../../include/vbuf.h
+mail_command_read.o: ../../include/vstream.h
 mail_command_read.o: mail_proto.h
-mail_command_read.o: ../include/iostuff.h
+mail_command_read.o: ../../include/iostuff.h
 mail_command_write.o: mail_command_write.c
-mail_command_write.o: ../include/sys_defs.h
-mail_command_write.o: ../include/vstream.h
-mail_command_write.o: ../include/vbuf.h
+mail_command_write.o: ../../include/sys_defs.h
+mail_command_write.o: ../../include/vstream.h
+mail_command_write.o: ../../include/vbuf.h
 mail_command_write.o: mail_proto.h
-mail_command_write.o: ../include/iostuff.h
+mail_command_write.o: ../../include/iostuff.h
 mail_conf.o: mail_conf.c
-mail_conf.o: ../include/sys_defs.h
-mail_conf.o: ../include/msg.h
-mail_conf.o: ../include/mymalloc.h
-mail_conf.o: ../include/vstream.h
-mail_conf.o: ../include/vbuf.h
-mail_conf.o: ../include/vstring.h
-mail_conf.o: ../include/dict.h
-mail_conf.o: ../include/argv.h
-mail_conf.o: ../include/safe.h
-mail_conf.o: ../include/stringops.h
+mail_conf.o: ../../include/sys_defs.h
+mail_conf.o: ../../include/msg.h
+mail_conf.o: ../../include/mymalloc.h
+mail_conf.o: ../../include/vstream.h
+mail_conf.o: ../../include/vbuf.h
+mail_conf.o: ../../include/vstring.h
+mail_conf.o: ../../include/dict.h
+mail_conf.o: ../../include/argv.h
+mail_conf.o: ../../include/safe.h
+mail_conf.o: ../../include/stringops.h
 mail_conf.o: mail_params.h
 mail_conf.o: mail_conf.h
 mail_conf_bool.o: mail_conf_bool.c
-mail_conf_bool.o: ../include/sys_defs.h
-mail_conf_bool.o: ../include/msg.h
-mail_conf_bool.o: ../include/dict.h
-mail_conf_bool.o: ../include/vstream.h
-mail_conf_bool.o: ../include/vbuf.h
-mail_conf_bool.o: ../include/argv.h
+mail_conf_bool.o: ../../include/sys_defs.h
+mail_conf_bool.o: ../../include/msg.h
+mail_conf_bool.o: ../../include/dict.h
+mail_conf_bool.o: ../../include/vstream.h
+mail_conf_bool.o: ../../include/vbuf.h
+mail_conf_bool.o: ../../include/argv.h
 mail_conf_bool.o: mail_conf.h
 mail_conf_int.o: mail_conf_int.c
-mail_conf_int.o: ../include/sys_defs.h
-mail_conf_int.o: ../include/msg.h
-mail_conf_int.o: ../include/mymalloc.h
-mail_conf_int.o: ../include/dict.h
-mail_conf_int.o: ../include/vstream.h
-mail_conf_int.o: ../include/vbuf.h
-mail_conf_int.o: ../include/argv.h
-mail_conf_int.o: ../include/stringops.h
-mail_conf_int.o: ../include/vstring.h
+mail_conf_int.o: ../../include/sys_defs.h
+mail_conf_int.o: ../../include/msg.h
+mail_conf_int.o: ../../include/mymalloc.h
+mail_conf_int.o: ../../include/dict.h
+mail_conf_int.o: ../../include/vstream.h
+mail_conf_int.o: ../../include/vbuf.h
+mail_conf_int.o: ../../include/argv.h
+mail_conf_int.o: ../../include/stringops.h
+mail_conf_int.o: ../../include/vstring.h
 mail_conf_int.o: mail_conf.h
 mail_conf_raw.o: mail_conf_raw.c
-mail_conf_raw.o: ../include/sys_defs.h
-mail_conf_raw.o: ../include/msg.h
-mail_conf_raw.o: ../include/mymalloc.h
+mail_conf_raw.o: ../../include/sys_defs.h
+mail_conf_raw.o: ../../include/msg.h
+mail_conf_raw.o: ../../include/mymalloc.h
 mail_conf_raw.o: mail_conf.h
 mail_conf_str.o: mail_conf_str.c
-mail_conf_str.o: ../include/sys_defs.h
-mail_conf_str.o: ../include/msg.h
-mail_conf_str.o: ../include/mymalloc.h
+mail_conf_str.o: ../../include/sys_defs.h
+mail_conf_str.o: ../../include/msg.h
+mail_conf_str.o: ../../include/mymalloc.h
 mail_conf_str.o: mail_conf.h
 mail_connect.o: mail_connect.c
-mail_connect.o: ../include/sys_defs.h
-mail_connect.o: ../include/msg.h
-mail_connect.o: ../include/vstream.h
-mail_connect.o: ../include/vbuf.h
-mail_connect.o: ../include/connect.h
-mail_connect.o: ../include/iostuff.h
-mail_connect.o: ../include/mymalloc.h
+mail_connect.o: ../../include/sys_defs.h
+mail_connect.o: ../../include/msg.h
+mail_connect.o: ../../include/vstream.h
+mail_connect.o: ../../include/vbuf.h
+mail_connect.o: ../../include/connect.h
+mail_connect.o: ../../include/iostuff.h
+mail_connect.o: ../../include/mymalloc.h
 mail_connect.o: timed_ipc.h
 mail_connect.o: mail_proto.h
 mail_copy.o: mail_copy.c
-mail_copy.o: ../include/sys_defs.h
-mail_copy.o: ../include/msg.h
-mail_copy.o: ../include/htable.h
-mail_copy.o: ../include/vstream.h
-mail_copy.o: ../include/vbuf.h
-mail_copy.o: ../include/vstring.h
-mail_copy.o: ../include/vstring_vstream.h
-mail_copy.o: ../include/stringops.h
+mail_copy.o: ../../include/sys_defs.h
+mail_copy.o: ../../include/msg.h
+mail_copy.o: ../../include/htable.h
+mail_copy.o: ../../include/vstream.h
+mail_copy.o: ../../include/vbuf.h
+mail_copy.o: ../../include/vstring.h
+mail_copy.o: ../../include/vstring_vstream.h
+mail_copy.o: ../../include/stringops.h
 mail_copy.o: quote_822_local.h
 mail_copy.o: record.h
 mail_copy.o: rec_type.h
@@ -517,435 +517,435 @@ mail_copy.o: mail_addr.h
 mail_copy.o: mail_copy.h
 mail_copy.o: mark_corrupt.h
 mail_date.o: mail_date.c
-mail_date.o: ../include/sys_defs.h
-mail_date.o: ../include/msg.h
-mail_date.o: ../include/vstring.h
-mail_date.o: ../include/vbuf.h
+mail_date.o: ../../include/sys_defs.h
+mail_date.o: ../../include/msg.h
+mail_date.o: ../../include/vstring.h
+mail_date.o: ../../include/vbuf.h
 mail_date.o: mail_date.h
 mail_error.o: mail_error.c
-mail_error.o: ../include/sys_defs.h
+mail_error.o: ../../include/sys_defs.h
 mail_error.o: mail_error.h
-mail_error.o: ../include/name_mask.h
+mail_error.o: ../../include/name_mask.h
 mail_flush.o: mail_flush.c
-mail_flush.o: ../include/sys_defs.h
+mail_flush.o: ../../include/sys_defs.h
 mail_flush.o: mail_proto.h
-mail_flush.o: ../include/vstream.h
-mail_flush.o: ../include/vbuf.h
-mail_flush.o: ../include/iostuff.h
+mail_flush.o: ../../include/vstream.h
+mail_flush.o: ../../include/vbuf.h
+mail_flush.o: ../../include/iostuff.h
 mail_flush.o: mail_flush.h
 mail_open_ok.o: mail_open_ok.c
-mail_open_ok.o: ../include/sys_defs.h
-mail_open_ok.o: ../include/msg.h
+mail_open_ok.o: ../../include/sys_defs.h
+mail_open_ok.o: ../../include/msg.h
 mail_open_ok.o: mail_queue.h
-mail_open_ok.o: ../include/vstring.h
-mail_open_ok.o: ../include/vbuf.h
-mail_open_ok.o: ../include/vstream.h
+mail_open_ok.o: ../../include/vstring.h
+mail_open_ok.o: ../../include/vbuf.h
+mail_open_ok.o: ../../include/vstream.h
 mail_open_ok.o: mail_open_ok.h
 mail_params.o: mail_params.c
-mail_params.o: ../include/sys_defs.h
-mail_params.o: ../include/msg.h
-mail_params.o: ../include/get_hostname.h
-mail_params.o: ../include/valid_hostname.h
-mail_params.o: ../include/stringops.h
-mail_params.o: ../include/vstring.h
-mail_params.o: ../include/vbuf.h
+mail_params.o: ../../include/sys_defs.h
+mail_params.o: ../../include/msg.h
+mail_params.o: ../../include/get_hostname.h
+mail_params.o: ../../include/valid_hostname.h
+mail_params.o: ../../include/stringops.h
+mail_params.o: ../../include/vstring.h
+mail_params.o: ../../include/vbuf.h
 mail_params.o: mynetworks.h
 mail_params.o: mail_conf.h
 mail_params.o: mail_version.h
 mail_params.o: mail_params.h
 mail_pathname.o: mail_pathname.c
-mail_pathname.o: ../include/sys_defs.h
-mail_pathname.o: ../include/stringops.h
-mail_pathname.o: ../include/vstring.h
-mail_pathname.o: ../include/vbuf.h
+mail_pathname.o: ../../include/sys_defs.h
+mail_pathname.o: ../../include/stringops.h
+mail_pathname.o: ../../include/vstring.h
+mail_pathname.o: ../../include/vbuf.h
 mail_pathname.o: mail_proto.h
-mail_pathname.o: ../include/vstream.h
-mail_pathname.o: ../include/iostuff.h
+mail_pathname.o: ../../include/vstream.h
+mail_pathname.o: ../../include/iostuff.h
 mail_print.o: mail_print.c
-mail_print.o: ../include/sys_defs.h
-mail_print.o: ../include/msg.h
-mail_print.o: ../include/mymalloc.h
-mail_print.o: ../include/vstream.h
-mail_print.o: ../include/vbuf.h
+mail_print.o: ../../include/sys_defs.h
+mail_print.o: ../../include/msg.h
+mail_print.o: ../../include/mymalloc.h
+mail_print.o: ../../include/vstream.h
+mail_print.o: ../../include/vbuf.h
 mail_print.o: mail_proto.h
-mail_print.o: ../include/iostuff.h
+mail_print.o: ../../include/iostuff.h
 mail_queue.o: mail_queue.c
-mail_queue.o: ../include/sys_defs.h
-mail_queue.o: ../include/msg.h
-mail_queue.o: ../include/vstring.h
-mail_queue.o: ../include/vbuf.h
-mail_queue.o: ../include/vstream.h
-mail_queue.o: ../include/mymalloc.h
-mail_queue.o: ../include/argv.h
-mail_queue.o: ../include/dir_forest.h
-mail_queue.o: ../include/make_dirs.h
-mail_queue.o: ../include/split_at.h
-mail_queue.o: ../include/sane_fsops.h
+mail_queue.o: ../../include/sys_defs.h
+mail_queue.o: ../../include/msg.h
+mail_queue.o: ../../include/vstring.h
+mail_queue.o: ../../include/vbuf.h
+mail_queue.o: ../../include/vstream.h
+mail_queue.o: ../../include/mymalloc.h
+mail_queue.o: ../../include/argv.h
+mail_queue.o: ../../include/dir_forest.h
+mail_queue.o: ../../include/make_dirs.h
+mail_queue.o: ../../include/split_at.h
+mail_queue.o: ../../include/sane_fsops.h
 mail_queue.o: file_id.h
 mail_queue.o: mail_params.h
 mail_queue.o: mail_queue.h
 mail_run.o: mail_run.c
-mail_run.o: ../include/sys_defs.h
-mail_run.o: ../include/msg.h
-mail_run.o: ../include/stringops.h
-mail_run.o: ../include/vstring.h
-mail_run.o: ../include/vbuf.h
-mail_run.o: ../include/mymalloc.h
+mail_run.o: ../../include/sys_defs.h
+mail_run.o: ../../include/msg.h
+mail_run.o: ../../include/stringops.h
+mail_run.o: ../../include/vstring.h
+mail_run.o: ../../include/vbuf.h
+mail_run.o: ../../include/mymalloc.h
 mail_run.o: mail_params.h
 mail_run.o: mail_run.h
 mail_scan.o: mail_scan.c
-mail_scan.o: ../include/sys_defs.h
-mail_scan.o: ../include/msg.h
-mail_scan.o: ../include/vstring.h
-mail_scan.o: ../include/vbuf.h
-mail_scan.o: ../include/vstream.h
-mail_scan.o: ../include/vstring_vstream.h
-mail_scan.o: ../include/mymalloc.h
+mail_scan.o: ../../include/sys_defs.h
+mail_scan.o: ../../include/msg.h
+mail_scan.o: ../../include/vstring.h
+mail_scan.o: ../../include/vbuf.h
+mail_scan.o: ../../include/vstream.h
+mail_scan.o: ../../include/vstring_vstream.h
+mail_scan.o: ../../include/mymalloc.h
 mail_scan.o: mail_proto.h
-mail_scan.o: ../include/iostuff.h
+mail_scan.o: ../../include/iostuff.h
 mail_scan_dir.o: mail_scan_dir.c
-mail_scan_dir.o: ../include/sys_defs.h
-mail_scan_dir.o: ../include/scan_dir.h
+mail_scan_dir.o: ../../include/sys_defs.h
+mail_scan_dir.o: ../../include/scan_dir.h
 mail_scan_dir.o: mail_scan_dir.h
 mail_stream.o: mail_stream.c
-mail_stream.o: ../include/sys_defs.h
-mail_stream.o: ../include/msg.h
-mail_stream.o: ../include/mymalloc.h
-mail_stream.o: ../include/vstring.h
-mail_stream.o: ../include/vbuf.h
-mail_stream.o: ../include/vstream.h
-mail_stream.o: ../include/stringops.h
+mail_stream.o: ../../include/sys_defs.h
+mail_stream.o: ../../include/msg.h
+mail_stream.o: ../../include/mymalloc.h
+mail_stream.o: ../../include/vstring.h
+mail_stream.o: ../../include/vbuf.h
+mail_stream.o: ../../include/vstream.h
+mail_stream.o: ../../include/stringops.h
 mail_stream.o: cleanup_user.h
 mail_stream.o: mail_proto.h
-mail_stream.o: ../include/iostuff.h
+mail_stream.o: ../../include/iostuff.h
 mail_stream.o: mail_queue.h
 mail_stream.o: opened.h
 mail_stream.o: mail_stream.h
 mail_task.o: mail_task.c
-mail_task.o: ../include/sys_defs.h
-mail_task.o: ../include/vstring.h
-mail_task.o: ../include/vbuf.h
+mail_task.o: ../../include/sys_defs.h
+mail_task.o: ../../include/vstring.h
+mail_task.o: ../../include/vbuf.h
 mail_task.o: mail_params.h
 mail_task.o: mail_task.h
 mail_trigger.o: mail_trigger.c
-mail_trigger.o: ../include/sys_defs.h
-mail_trigger.o: ../include/msg.h
-mail_trigger.o: ../include/mymalloc.h
-mail_trigger.o: ../include/iostuff.h
-mail_trigger.o: ../include/trigger.h
+mail_trigger.o: ../../include/sys_defs.h
+mail_trigger.o: ../../include/msg.h
+mail_trigger.o: ../../include/mymalloc.h
+mail_trigger.o: ../../include/iostuff.h
+mail_trigger.o: ../../include/trigger.h
 mail_trigger.o: mail_params.h
 mail_trigger.o: mail_proto.h
-mail_trigger.o: ../include/vstream.h
-mail_trigger.o: ../include/vbuf.h
+mail_trigger.o: ../../include/vstream.h
+mail_trigger.o: ../../include/vbuf.h
 mail_version.o: mail_version.c
 maps.o: maps.c
-maps.o: ../include/sys_defs.h
-maps.o: ../include/argv.h
-maps.o: ../include/mymalloc.h
-maps.o: ../include/msg.h
-maps.o: ../include/dict.h
-maps.o: ../include/vstream.h
-maps.o: ../include/vbuf.h
-maps.o: ../include/stringops.h
-maps.o: ../include/vstring.h
-maps.o: ../include/split_at.h
+maps.o: ../../include/sys_defs.h
+maps.o: ../../include/argv.h
+maps.o: ../../include/mymalloc.h
+maps.o: ../../include/msg.h
+maps.o: ../../include/dict.h
+maps.o: ../../include/vstream.h
+maps.o: ../../include/vbuf.h
+maps.o: ../../include/stringops.h
+maps.o: ../../include/vstring.h
+maps.o: ../../include/split_at.h
 maps.o: mail_conf.h
 maps.o: maps.h
 mark_corrupt.o: mark_corrupt.c
-mark_corrupt.o: ../include/sys_defs.h
-mark_corrupt.o: ../include/msg.h
-mark_corrupt.o: ../include/vstream.h
-mark_corrupt.o: ../include/vbuf.h
+mark_corrupt.o: ../../include/sys_defs.h
+mark_corrupt.o: ../../include/msg.h
+mark_corrupt.o: ../../include/vstream.h
+mark_corrupt.o: ../../include/vbuf.h
 mark_corrupt.o: mail_queue.h
-mark_corrupt.o: ../include/vstring.h
+mark_corrupt.o: ../../include/vstring.h
 mark_corrupt.o: mark_corrupt.h
 mkmap_db.o: mkmap_db.c
-mkmap_db.o: ../include/sys_defs.h
-mkmap_db.o: ../include/msg.h
-mkmap_db.o: ../include/mymalloc.h
-mkmap_db.o: ../include/stringops.h
-mkmap_db.o: ../include/vstring.h
-mkmap_db.o: ../include/vbuf.h
-mkmap_db.o: ../include/dict.h
-mkmap_db.o: ../include/vstream.h
-mkmap_db.o: ../include/argv.h
-mkmap_db.o: ../include/dict_db.h
+mkmap_db.o: ../../include/sys_defs.h
+mkmap_db.o: ../../include/msg.h
+mkmap_db.o: ../../include/mymalloc.h
+mkmap_db.o: ../../include/stringops.h
+mkmap_db.o: ../../include/vstring.h
+mkmap_db.o: ../../include/vbuf.h
+mkmap_db.o: ../../include/dict.h
+mkmap_db.o: ../../include/vstream.h
+mkmap_db.o: ../../include/argv.h
+mkmap_db.o: ../../include/dict_db.h
 mkmap_db.o: mkmap.h
 mkmap_dbm.o: mkmap_dbm.c
-mkmap_dbm.o: ../include/sys_defs.h
-mkmap_dbm.o: ../include/msg.h
-mkmap_dbm.o: ../include/mymalloc.h
-mkmap_dbm.o: ../include/stringops.h
-mkmap_dbm.o: ../include/vstring.h
-mkmap_dbm.o: ../include/vbuf.h
-mkmap_dbm.o: ../include/dict.h
-mkmap_dbm.o: ../include/vstream.h
-mkmap_dbm.o: ../include/argv.h
-mkmap_dbm.o: ../include/dict_dbm.h
+mkmap_dbm.o: ../../include/sys_defs.h
+mkmap_dbm.o: ../../include/msg.h
+mkmap_dbm.o: ../../include/mymalloc.h
+mkmap_dbm.o: ../../include/stringops.h
+mkmap_dbm.o: ../../include/vstring.h
+mkmap_dbm.o: ../../include/vbuf.h
+mkmap_dbm.o: ../../include/dict.h
+mkmap_dbm.o: ../../include/vstream.h
+mkmap_dbm.o: ../../include/argv.h
+mkmap_dbm.o: ../../include/dict_dbm.h
 mkmap_dbm.o: mkmap.h
 mkmap_open.o: mkmap_open.c
-mkmap_open.o: ../include/sys_defs.h
-mkmap_open.o: ../include/msg.h
-mkmap_open.o: ../include/dict.h
-mkmap_open.o: ../include/vstream.h
-mkmap_open.o: ../include/vbuf.h
-mkmap_open.o: ../include/argv.h
-mkmap_open.o: ../include/sigdelay.h
-mkmap_open.o: ../include/mymalloc.h
-mkmap_open.o: ../include/myflock.h
+mkmap_open.o: ../../include/sys_defs.h
+mkmap_open.o: ../../include/msg.h
+mkmap_open.o: ../../include/dict.h
+mkmap_open.o: ../../include/vstream.h
+mkmap_open.o: ../../include/vbuf.h
+mkmap_open.o: ../../include/argv.h
+mkmap_open.o: ../../include/sigdelay.h
+mkmap_open.o: ../../include/mymalloc.h
+mkmap_open.o: ../../include/myflock.h
 mkmap_open.o: mkmap.h
 mynetworks.o: mynetworks.c
-mynetworks.o: ../include/sys_defs.h
-mynetworks.o: ../include/msg.h
-mynetworks.o: ../include/vstring.h
-mynetworks.o: ../include/vbuf.h
-mynetworks.o: ../include/inet_addr_list.h
+mynetworks.o: ../../include/sys_defs.h
+mynetworks.o: ../../include/msg.h
+mynetworks.o: ../../include/vstring.h
+mynetworks.o: ../../include/vbuf.h
+mynetworks.o: ../../include/inet_addr_list.h
 mynetworks.o: own_inet_addr.h
 mynetworks.o: mynetworks.h
 mypwd.o: mypwd.c
-mypwd.o: ../include/sys_defs.h
-mypwd.o: ../include/mymalloc.h
-mypwd.o: ../include/htable.h
-mypwd.o: ../include/binhash.h
-mypwd.o: ../include/msg.h
+mypwd.o: ../../include/sys_defs.h
+mypwd.o: ../../include/mymalloc.h
+mypwd.o: ../../include/htable.h
+mypwd.o: ../../include/binhash.h
+mypwd.o: ../../include/msg.h
 mypwd.o: mypwd.h
 namadr_list.o: namadr_list.c
-namadr_list.o: ../include/sys_defs.h
-namadr_list.o: ../include/match_list.h
-namadr_list.o: ../include/match_ops.h
+namadr_list.o: ../../include/sys_defs.h
+namadr_list.o: ../../include/match_list.h
+namadr_list.o: ../../include/match_ops.h
 namadr_list.o: namadr_list.h
 off_cvt.o: off_cvt.c
-off_cvt.o: ../include/sys_defs.h
-off_cvt.o: ../include/msg.h
-off_cvt.o: ../include/vstring.h
-off_cvt.o: ../include/vbuf.h
+off_cvt.o: ../../include/sys_defs.h
+off_cvt.o: ../../include/msg.h
+off_cvt.o: ../../include/vstring.h
+off_cvt.o: ../../include/vbuf.h
 off_cvt.o: off_cvt.h
 opened.o: opened.c
-opened.o: ../include/sys_defs.h
-opened.o: ../include/msg.h
-opened.o: ../include/vstring.h
-opened.o: ../include/vbuf.h
+opened.o: ../../include/sys_defs.h
+opened.o: ../../include/msg.h
+opened.o: ../../include/vstring.h
+opened.o: ../../include/vbuf.h
 opened.o: opened.h
 own_inet_addr.o: own_inet_addr.c
-own_inet_addr.o: ../include/sys_defs.h
-own_inet_addr.o: ../include/msg.h
-own_inet_addr.o: ../include/mymalloc.h
-own_inet_addr.o: ../include/inet_addr_list.h
-own_inet_addr.o: ../include/inet_addr_local.h
-own_inet_addr.o: ../include/inet_addr_host.h
-own_inet_addr.o: ../include/stringops.h
-own_inet_addr.o: ../include/vstring.h
-own_inet_addr.o: ../include/vbuf.h
+own_inet_addr.o: ../../include/sys_defs.h
+own_inet_addr.o: ../../include/msg.h
+own_inet_addr.o: ../../include/mymalloc.h
+own_inet_addr.o: ../../include/inet_addr_list.h
+own_inet_addr.o: ../../include/inet_addr_local.h
+own_inet_addr.o: ../../include/inet_addr_host.h
+own_inet_addr.o: ../../include/stringops.h
+own_inet_addr.o: ../../include/vstring.h
+own_inet_addr.o: ../../include/vbuf.h
 own_inet_addr.o: mail_params.h
 own_inet_addr.o: own_inet_addr.h
 peer_name.o: peer_name.c
-peer_name.o: ../include/sys_defs.h
-peer_name.o: ../include/msg.h
-peer_name.o: ../include/valid_hostname.h
+peer_name.o: ../../include/sys_defs.h
+peer_name.o: ../../include/msg.h
+peer_name.o: ../../include/valid_hostname.h
 peer_name.o: peer_name.h
 pipe_command.o: pipe_command.c
-pipe_command.o: ../include/sys_defs.h
-pipe_command.o: ../include/msg.h
-pipe_command.o: ../include/vstream.h
-pipe_command.o: ../include/vbuf.h
-pipe_command.o: ../include/vstring.h
-pipe_command.o: ../include/stringops.h
-pipe_command.o: ../include/iostuff.h
-pipe_command.o: ../include/timed_wait.h
-pipe_command.o: ../include/set_ugid.h
-pipe_command.o: ../include/argv.h
+pipe_command.o: ../../include/sys_defs.h
+pipe_command.o: ../../include/msg.h
+pipe_command.o: ../../include/vstream.h
+pipe_command.o: ../../include/vbuf.h
+pipe_command.o: ../../include/vstring.h
+pipe_command.o: ../../include/stringops.h
+pipe_command.o: ../../include/iostuff.h
+pipe_command.o: ../../include/timed_wait.h
+pipe_command.o: ../../include/set_ugid.h
+pipe_command.o: ../../include/argv.h
 pipe_command.o: mail_params.h
 pipe_command.o: mail_copy.h
-pipe_command.o: ../include/clean_env.h
+pipe_command.o: ../../include/clean_env.h
 pipe_command.o: pipe_command.h
-pipe_command.o: ../include/exec_command.h
+pipe_command.o: ../../include/exec_command.h
 pipe_command.o: sys_exits.h
 post_mail.o: post_mail.c
-post_mail.o: ../include/sys_defs.h
-post_mail.o: ../include/msg.h
-post_mail.o: ../include/vstream.h
-post_mail.o: ../include/vbuf.h
-post_mail.o: ../include/vstring.h
+post_mail.o: ../../include/sys_defs.h
+post_mail.o: ../../include/msg.h
+post_mail.o: ../../include/vstream.h
+post_mail.o: ../../include/vbuf.h
+post_mail.o: ../../include/vstring.h
 post_mail.o: mail_params.h
 post_mail.o: record.h
 post_mail.o: rec_type.h
 post_mail.o: mail_proto.h
-post_mail.o: ../include/iostuff.h
+post_mail.o: ../../include/iostuff.h
 post_mail.o: cleanup_user.h
 post_mail.o: post_mail.h
 post_mail.o: mail_date.h
 quote_821_local.o: quote_821_local.c
-quote_821_local.o: ../include/sys_defs.h
-quote_821_local.o: ../include/vstring.h
-quote_821_local.o: ../include/vbuf.h
+quote_821_local.o: ../../include/sys_defs.h
+quote_821_local.o: ../../include/vstring.h
+quote_821_local.o: ../../include/vbuf.h
 quote_821_local.o: quote_821_local.h
 quote_822_local.o: quote_822_local.c
-quote_822_local.o: ../include/sys_defs.h
-quote_822_local.o: ../include/vstring.h
-quote_822_local.o: ../include/vbuf.h
+quote_822_local.o: ../../include/sys_defs.h
+quote_822_local.o: ../../include/vstring.h
+quote_822_local.o: ../../include/vbuf.h
 quote_822_local.o: quote_822_local.h
 rec2stream.o: rec2stream.c
-rec2stream.o: ../include/sys_defs.h
-rec2stream.o: ../include/vstring.h
-rec2stream.o: ../include/vbuf.h
-rec2stream.o: ../include/vstream.h
+rec2stream.o: ../../include/sys_defs.h
+rec2stream.o: ../../include/vstring.h
+rec2stream.o: ../../include/vbuf.h
+rec2stream.o: ../../include/vstream.h
 rec2stream.o: record.h
 rec2stream.o: rec_streamlf.h
 rec2stream.o: rec_type.h
 rec_streamlf.o: rec_streamlf.c
-rec_streamlf.o: ../include/sys_defs.h
-rec_streamlf.o: ../include/vstring.h
-rec_streamlf.o: ../include/vbuf.h
-rec_streamlf.o: ../include/vstream.h
+rec_streamlf.o: ../../include/sys_defs.h
+rec_streamlf.o: ../../include/vstring.h
+rec_streamlf.o: ../../include/vbuf.h
+rec_streamlf.o: ../../include/vstream.h
 rec_streamlf.o: record.h
 rec_streamlf.o: rec_type.h
 rec_streamlf.o: rec_streamlf.h
 rec_type.o: rec_type.c
 rec_type.o: rec_type.h
 recdump.o: recdump.c
-recdump.o: ../include/sys_defs.h
-recdump.o: ../include/msg_vstream.h
-recdump.o: ../include/vstream.h
-recdump.o: ../include/vbuf.h
+recdump.o: ../../include/sys_defs.h
+recdump.o: ../../include/msg_vstream.h
+recdump.o: ../../include/vstream.h
+recdump.o: ../../include/vbuf.h
 recdump.o: record.h
-recdump.o: ../include/vstring.h
+recdump.o: ../../include/vstring.h
 recdump.o: rec_streamlf.h
 recdump.o: rec_type.h
 recipient_list.o: recipient_list.c
-recipient_list.o: ../include/mymalloc.h
+recipient_list.o: ../../include/mymalloc.h
 recipient_list.o: recipient_list.h
 record.o: record.c
-record.o: ../include/sys_defs.h
-record.o: ../include/msg.h
-record.o: ../include/mymalloc.h
-record.o: ../include/vstream.h
-record.o: ../include/vbuf.h
-record.o: ../include/vstring.h
+record.o: ../../include/sys_defs.h
+record.o: ../../include/msg.h
+record.o: ../../include/mymalloc.h
+record.o: ../../include/vstream.h
+record.o: ../../include/vbuf.h
+record.o: ../../include/vstring.h
 record.o: record.h
 remove.o: remove.c
-remove.o: ../include/sys_defs.h
-remove.o: ../include/vstring.h
-remove.o: ../include/vbuf.h
+remove.o: ../../include/sys_defs.h
+remove.o: ../../include/vstring.h
+remove.o: ../../include/vbuf.h
 remove.o: mail_params.h
 resolve_clnt.o: resolve_clnt.c
-resolve_clnt.o: ../include/sys_defs.h
-resolve_clnt.o: ../include/msg.h
-resolve_clnt.o: ../include/vstream.h
-resolve_clnt.o: ../include/vbuf.h
-resolve_clnt.o: ../include/vstring.h
-resolve_clnt.o: ../include/vstring_vstream.h
-resolve_clnt.o: ../include/events.h
-resolve_clnt.o: ../include/iostuff.h
+resolve_clnt.o: ../../include/sys_defs.h
+resolve_clnt.o: ../../include/msg.h
+resolve_clnt.o: ../../include/vstream.h
+resolve_clnt.o: ../../include/vbuf.h
+resolve_clnt.o: ../../include/vstring.h
+resolve_clnt.o: ../../include/vstring_vstream.h
+resolve_clnt.o: ../../include/events.h
+resolve_clnt.o: ../../include/iostuff.h
 resolve_clnt.o: mail_proto.h
 resolve_clnt.o: mail_params.h
 resolve_clnt.o: clnt_stream.h
 resolve_clnt.o: resolve_clnt.h
 resolve_local.o: resolve_local.c
-resolve_local.o: ../include/sys_defs.h
-resolve_local.o: ../include/msg.h
-resolve_local.o: ../include/mymalloc.h
+resolve_local.o: ../../include/sys_defs.h
+resolve_local.o: ../../include/msg.h
+resolve_local.o: ../../include/mymalloc.h
 resolve_local.o: string_list.h
 resolve_local.o: mail_params.h
 resolve_local.o: own_inet_addr.h
 resolve_local.o: resolve_local.h
 rewrite_clnt.o: rewrite_clnt.c
-rewrite_clnt.o: ../include/sys_defs.h
-rewrite_clnt.o: ../include/msg.h
-rewrite_clnt.o: ../include/vstring.h
-rewrite_clnt.o: ../include/vbuf.h
-rewrite_clnt.o: ../include/vstream.h
-rewrite_clnt.o: ../include/vstring_vstream.h
-rewrite_clnt.o: ../include/events.h
-rewrite_clnt.o: ../include/iostuff.h
+rewrite_clnt.o: ../../include/sys_defs.h
+rewrite_clnt.o: ../../include/msg.h
+rewrite_clnt.o: ../../include/vstring.h
+rewrite_clnt.o: ../../include/vbuf.h
+rewrite_clnt.o: ../../include/vstream.h
+rewrite_clnt.o: ../../include/vstring_vstream.h
+rewrite_clnt.o: ../../include/events.h
+rewrite_clnt.o: ../../include/iostuff.h
 rewrite_clnt.o: quote_822_local.h
 rewrite_clnt.o: mail_proto.h
 rewrite_clnt.o: mail_params.h
 rewrite_clnt.o: clnt_stream.h
 rewrite_clnt.o: rewrite_clnt.h
 sent.o: sent.c
-sent.o: ../include/sys_defs.h
-sent.o: ../include/msg.h
-sent.o: ../include/vstring.h
-sent.o: ../include/vbuf.h
+sent.o: ../../include/sys_defs.h
+sent.o: ../../include/msg.h
+sent.o: ../../include/vstring.h
+sent.o: ../../include/vbuf.h
 sent.o: sent.h
 smtp_stream.o: smtp_stream.c
-smtp_stream.o: ../include/sys_defs.h
-smtp_stream.o: ../include/vstring.h
-smtp_stream.o: ../include/vbuf.h
-smtp_stream.o: ../include/vstream.h
-smtp_stream.o: ../include/vstring_vstream.h
-smtp_stream.o: ../include/msg.h
-smtp_stream.o: ../include/iostuff.h
+smtp_stream.o: ../../include/sys_defs.h
+smtp_stream.o: ../../include/vstring.h
+smtp_stream.o: ../../include/vbuf.h
+smtp_stream.o: ../../include/vstream.h
+smtp_stream.o: ../../include/vstring_vstream.h
+smtp_stream.o: ../../include/msg.h
+smtp_stream.o: ../../include/iostuff.h
 smtp_stream.o: smtp_stream.h
 split_addr.o: split_addr.c
-split_addr.o: ../include/sys_defs.h
-split_addr.o: ../include/split_at.h
+split_addr.o: ../../include/sys_defs.h
+split_addr.o: ../../include/split_at.h
 split_addr.o: mail_params.h
 split_addr.o: mail_addr.h
 split_addr.o: split_addr.h
 stream2rec.o: stream2rec.c
-stream2rec.o: ../include/sys_defs.h
-stream2rec.o: ../include/vstream.h
-stream2rec.o: ../include/vbuf.h
-stream2rec.o: ../include/vstring.h
+stream2rec.o: ../../include/sys_defs.h
+stream2rec.o: ../../include/vstream.h
+stream2rec.o: ../../include/vbuf.h
+stream2rec.o: ../../include/vstring.h
 stream2rec.o: record.h
 stream2rec.o: rec_streamlf.h
 stream2rec.o: rec_type.h
 string_list.o: string_list.c
-string_list.o: ../include/sys_defs.h
-string_list.o: ../include/match_list.h
-string_list.o: ../include/match_ops.h
+string_list.o: ../../include/sys_defs.h
+string_list.o: ../../include/match_list.h
+string_list.o: ../../include/match_ops.h
 string_list.o: string_list.h
 sys_exits.o: sys_exits.c
-sys_exits.o: ../include/sys_defs.h
-sys_exits.o: ../include/msg.h
+sys_exits.o: ../../include/sys_defs.h
+sys_exits.o: ../../include/msg.h
 sys_exits.o: sys_exits.h
 timed_ipc.o: timed_ipc.c
-timed_ipc.o: ../include/sys_defs.h
-timed_ipc.o: ../include/msg.h
-timed_ipc.o: ../include/vstream.h
-timed_ipc.o: ../include/vbuf.h
+timed_ipc.o: ../../include/sys_defs.h
+timed_ipc.o: ../../include/msg.h
+timed_ipc.o: ../../include/vstream.h
+timed_ipc.o: ../../include/vbuf.h
 timed_ipc.o: mail_params.h
 timed_ipc.o: timed_ipc.h
 tok822_find.o: tok822_find.c
-tok822_find.o: ../include/sys_defs.h
-tok822_find.o: ../include/vstring.h
-tok822_find.o: ../include/vbuf.h
+tok822_find.o: ../../include/sys_defs.h
+tok822_find.o: ../../include/vstring.h
+tok822_find.o: ../../include/vbuf.h
 tok822_find.o: tok822.h
 tok822_find.o: resolve_clnt.h
 tok822_node.o: tok822_node.c
-tok822_node.o: ../include/sys_defs.h
-tok822_node.o: ../include/mymalloc.h
-tok822_node.o: ../include/vstring.h
-tok822_node.o: ../include/vbuf.h
+tok822_node.o: ../../include/sys_defs.h
+tok822_node.o: ../../include/mymalloc.h
+tok822_node.o: ../../include/vstring.h
+tok822_node.o: ../../include/vbuf.h
 tok822_node.o: tok822.h
 tok822_node.o: resolve_clnt.h
 tok822_parse.o: tok822_parse.c
-tok822_parse.o: ../include/sys_defs.h
-tok822_parse.o: ../include/vstring.h
-tok822_parse.o: ../include/vbuf.h
-tok822_parse.o: ../include/msg.h
+tok822_parse.o: ../../include/sys_defs.h
+tok822_parse.o: ../../include/vstring.h
+tok822_parse.o: ../../include/vbuf.h
+tok822_parse.o: ../../include/msg.h
 tok822_parse.o: tok822.h
 tok822_parse.o: resolve_clnt.h
 tok822_resolve.o: tok822_resolve.c
-tok822_resolve.o: ../include/sys_defs.h
-tok822_resolve.o: ../include/vstring.h
-tok822_resolve.o: ../include/vbuf.h
-tok822_resolve.o: ../include/msg.h
+tok822_resolve.o: ../../include/sys_defs.h
+tok822_resolve.o: ../../include/vstring.h
+tok822_resolve.o: ../../include/vbuf.h
+tok822_resolve.o: ../../include/msg.h
 tok822_resolve.o: resolve_clnt.h
 tok822_resolve.o: tok822.h
 tok822_rewrite.o: tok822_rewrite.c
-tok822_rewrite.o: ../include/sys_defs.h
-tok822_rewrite.o: ../include/vstring.h
-tok822_rewrite.o: ../include/vbuf.h
-tok822_rewrite.o: ../include/msg.h
+tok822_rewrite.o: ../../include/sys_defs.h
+tok822_rewrite.o: ../../include/vstring.h
+tok822_rewrite.o: ../../include/vbuf.h
+tok822_rewrite.o: ../../include/msg.h
 tok822_rewrite.o: rewrite_clnt.h
 tok822_rewrite.o: tok822.h
 tok822_rewrite.o: resolve_clnt.h
 tok822_tree.o: tok822_tree.c
-tok822_tree.o: ../include/sys_defs.h
-tok822_tree.o: ../include/mymalloc.h
-tok822_tree.o: ../include/vstring.h
-tok822_tree.o: ../include/vbuf.h
+tok822_tree.o: ../../include/sys_defs.h
+tok822_tree.o: ../../include/mymalloc.h
+tok822_tree.o: ../../include/vstring.h
+tok822_tree.o: ../../include/vbuf.h
 tok822_tree.o: tok822.h
 tok822_tree.o: resolve_clnt.h
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index ca368de49..51c22f0a6 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -15,7 +15,7 @@
   * Version of this program.
   */
 #define VAR_MAIL_VERSION	"mail_version"
-#define DEF_MAIL_VERSION	"Snapshot-20000921"
+#define DEF_MAIL_VERSION	"Snapshot-20000922"
 extern char *var_mail_version;
 
 /* LICENSE
diff --git a/postfix/src/lmtp/Makefile.in b/postfix/src/lmtp/Makefile.in
index 7f2884018..95cb8cb8c 100644
--- a/postfix/src/lmtp/Makefile.in
+++ b/postfix/src/lmtp/Makefile.in
@@ -12,8 +12,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= quote_821_local
 PROG	= lmtp
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libdns.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -21,14 +21,14 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
@@ -36,7 +36,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -60,143 +60,143 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 lmtp.o: lmtp.c
-lmtp.o: ../include/sys_defs.h
-lmtp.o: ../include/dict.h
-lmtp.o: ../include/vstream.h
-lmtp.o: ../include/vbuf.h
-lmtp.o: ../include/argv.h
-lmtp.o: ../include/msg.h
-lmtp.o: ../include/mymalloc.h
-lmtp.o: ../include/name_mask.h
-lmtp.o: ../include/split_at.h
-lmtp.o: ../include/deliver_request.h
-lmtp.o: ../include/vstring.h
-lmtp.o: ../include/recipient_list.h
-lmtp.o: ../include/mail_queue.h
-lmtp.o: ../include/mail_params.h
-lmtp.o: ../include/mail_conf.h
-lmtp.o: ../include/debug_peer.h
-lmtp.o: ../include/mail_error.h
-lmtp.o: ../include/mail_server.h
+lmtp.o: ../../include/sys_defs.h
+lmtp.o: ../../include/dict.h
+lmtp.o: ../../include/vstream.h
+lmtp.o: ../../include/vbuf.h
+lmtp.o: ../../include/argv.h
+lmtp.o: ../../include/msg.h
+lmtp.o: ../../include/mymalloc.h
+lmtp.o: ../../include/name_mask.h
+lmtp.o: ../../include/split_at.h
+lmtp.o: ../../include/deliver_request.h
+lmtp.o: ../../include/vstring.h
+lmtp.o: ../../include/recipient_list.h
+lmtp.o: ../../include/mail_queue.h
+lmtp.o: ../../include/mail_params.h
+lmtp.o: ../../include/mail_conf.h
+lmtp.o: ../../include/debug_peer.h
+lmtp.o: ../../include/mail_error.h
+lmtp.o: ../../include/mail_server.h
 lmtp.o: lmtp.h
 lmtp_addr.o: lmtp_addr.c
-lmtp_addr.o: ../include/sys_defs.h
-lmtp_addr.o: ../include/msg.h
-lmtp_addr.o: ../include/vstring.h
-lmtp_addr.o: ../include/vbuf.h
-lmtp_addr.o: ../include/mymalloc.h
-lmtp_addr.o: ../include/inet_addr_list.h
-lmtp_addr.o: ../include/stringops.h
-lmtp_addr.o: ../include/mail_params.h
-lmtp_addr.o: ../include/own_inet_addr.h
-lmtp_addr.o: ../include/dns.h
+lmtp_addr.o: ../../include/sys_defs.h
+lmtp_addr.o: ../../include/msg.h
+lmtp_addr.o: ../../include/vstring.h
+lmtp_addr.o: ../../include/vbuf.h
+lmtp_addr.o: ../../include/mymalloc.h
+lmtp_addr.o: ../../include/inet_addr_list.h
+lmtp_addr.o: ../../include/stringops.h
+lmtp_addr.o: ../../include/mail_params.h
+lmtp_addr.o: ../../include/own_inet_addr.h
+lmtp_addr.o: ../../include/dns.h
 lmtp_addr.o: lmtp.h
-lmtp_addr.o: ../include/vstream.h
-lmtp_addr.o: ../include/argv.h
-lmtp_addr.o: ../include/deliver_request.h
-lmtp_addr.o: ../include/recipient_list.h
+lmtp_addr.o: ../../include/vstream.h
+lmtp_addr.o: ../../include/argv.h
+lmtp_addr.o: ../../include/deliver_request.h
+lmtp_addr.o: ../../include/recipient_list.h
 lmtp_addr.o: lmtp_addr.h
 lmtp_chat.o: lmtp_chat.c
-lmtp_chat.o: ../include/sys_defs.h
-lmtp_chat.o: ../include/msg.h
-lmtp_chat.o: ../include/vstring.h
-lmtp_chat.o: ../include/vbuf.h
-lmtp_chat.o: ../include/vstream.h
-lmtp_chat.o: ../include/argv.h
-lmtp_chat.o: ../include/stringops.h
-lmtp_chat.o: ../include/line_wrap.h
-lmtp_chat.o: ../include/mymalloc.h
-lmtp_chat.o: ../include/recipient_list.h
-lmtp_chat.o: ../include/deliver_request.h
-lmtp_chat.o: ../include/smtp_stream.h
-lmtp_chat.o: ../include/mail_params.h
-lmtp_chat.o: ../include/mail_addr.h
-lmtp_chat.o: ../include/post_mail.h
-lmtp_chat.o: ../include/cleanup_user.h
+lmtp_chat.o: ../../include/sys_defs.h
+lmtp_chat.o: ../../include/msg.h
+lmtp_chat.o: ../../include/vstring.h
+lmtp_chat.o: ../../include/vbuf.h
+lmtp_chat.o: ../../include/vstream.h
+lmtp_chat.o: ../../include/argv.h
+lmtp_chat.o: ../../include/stringops.h
+lmtp_chat.o: ../../include/line_wrap.h
+lmtp_chat.o: ../../include/mymalloc.h
+lmtp_chat.o: ../../include/recipient_list.h
+lmtp_chat.o: ../../include/deliver_request.h
+lmtp_chat.o: ../../include/smtp_stream.h
+lmtp_chat.o: ../../include/mail_params.h
+lmtp_chat.o: ../../include/mail_addr.h
+lmtp_chat.o: ../../include/post_mail.h
+lmtp_chat.o: ../../include/cleanup_user.h
 lmtp_chat.o: lmtp.h
 lmtp_connect.o: lmtp_connect.c
-lmtp_connect.o: ../include/sys_defs.h
-lmtp_connect.o: ../include/msg.h
-lmtp_connect.o: ../include/vstream.h
-lmtp_connect.o: ../include/vbuf.h
-lmtp_connect.o: ../include/vstring.h
-lmtp_connect.o: ../include/split_at.h
-lmtp_connect.o: ../include/mymalloc.h
-lmtp_connect.o: ../include/iostuff.h
-lmtp_connect.o: ../include/timed_connect.h
-lmtp_connect.o: ../include/stringops.h
-lmtp_connect.o: ../include/mail_params.h
-lmtp_connect.o: ../include/mail_proto.h
-lmtp_connect.o: ../include/dns.h
+lmtp_connect.o: ../../include/sys_defs.h
+lmtp_connect.o: ../../include/msg.h
+lmtp_connect.o: ../../include/vstream.h
+lmtp_connect.o: ../../include/vbuf.h
+lmtp_connect.o: ../../include/vstring.h
+lmtp_connect.o: ../../include/split_at.h
+lmtp_connect.o: ../../include/mymalloc.h
+lmtp_connect.o: ../../include/iostuff.h
+lmtp_connect.o: ../../include/timed_connect.h
+lmtp_connect.o: ../../include/stringops.h
+lmtp_connect.o: ../../include/mail_params.h
+lmtp_connect.o: ../../include/mail_proto.h
+lmtp_connect.o: ../../include/dns.h
 lmtp_connect.o: lmtp.h
-lmtp_connect.o: ../include/argv.h
-lmtp_connect.o: ../include/deliver_request.h
-lmtp_connect.o: ../include/recipient_list.h
+lmtp_connect.o: ../../include/argv.h
+lmtp_connect.o: ../../include/deliver_request.h
+lmtp_connect.o: ../../include/recipient_list.h
 lmtp_connect.o: lmtp_addr.h
 lmtp_proto.o: lmtp_proto.c
-lmtp_proto.o: ../include/sys_defs.h
-lmtp_proto.o: ../include/msg.h
-lmtp_proto.o: ../include/vstring.h
-lmtp_proto.o: ../include/vbuf.h
-lmtp_proto.o: ../include/vstream.h
-lmtp_proto.o: ../include/vstring_vstream.h
-lmtp_proto.o: ../include/stringops.h
-lmtp_proto.o: ../include/mymalloc.h
-lmtp_proto.o: ../include/mail_params.h
-lmtp_proto.o: ../include/smtp_stream.h
-lmtp_proto.o: ../include/mail_queue.h
-lmtp_proto.o: ../include/recipient_list.h
-lmtp_proto.o: ../include/deliver_request.h
-lmtp_proto.o: ../include/deliver_completed.h
-lmtp_proto.o: ../include/defer.h
-lmtp_proto.o: ../include/bounce.h
-lmtp_proto.o: ../include/sent.h
-lmtp_proto.o: ../include/record.h
-lmtp_proto.o: ../include/rec_type.h
-lmtp_proto.o: ../include/off_cvt.h
-lmtp_proto.o: ../include/mark_corrupt.h
+lmtp_proto.o: ../../include/sys_defs.h
+lmtp_proto.o: ../../include/msg.h
+lmtp_proto.o: ../../include/vstring.h
+lmtp_proto.o: ../../include/vbuf.h
+lmtp_proto.o: ../../include/vstream.h
+lmtp_proto.o: ../../include/vstring_vstream.h
+lmtp_proto.o: ../../include/stringops.h
+lmtp_proto.o: ../../include/mymalloc.h
+lmtp_proto.o: ../../include/mail_params.h
+lmtp_proto.o: ../../include/smtp_stream.h
+lmtp_proto.o: ../../include/mail_queue.h
+lmtp_proto.o: ../../include/recipient_list.h
+lmtp_proto.o: ../../include/deliver_request.h
+lmtp_proto.o: ../../include/deliver_completed.h
+lmtp_proto.o: ../../include/defer.h
+lmtp_proto.o: ../../include/bounce.h
+lmtp_proto.o: ../../include/sent.h
+lmtp_proto.o: ../../include/record.h
+lmtp_proto.o: ../../include/rec_type.h
+lmtp_proto.o: ../../include/off_cvt.h
+lmtp_proto.o: ../../include/mark_corrupt.h
 lmtp_proto.o: lmtp.h
-lmtp_proto.o: ../include/argv.h
-lmtp_proto.o: ../include/quote_821_local.h
+lmtp_proto.o: ../../include/argv.h
+lmtp_proto.o: ../../include/quote_821_local.h
 lmtp_session.o: lmtp_session.c
-lmtp_session.o: ../include/sys_defs.h
-lmtp_session.o: ../include/mymalloc.h
-lmtp_session.o: ../include/vstream.h
-lmtp_session.o: ../include/vbuf.h
-lmtp_session.o: ../include/stringops.h
-lmtp_session.o: ../include/vstring.h
-lmtp_session.o: ../include/debug_peer.h
+lmtp_session.o: ../../include/sys_defs.h
+lmtp_session.o: ../../include/mymalloc.h
+lmtp_session.o: ../../include/vstream.h
+lmtp_session.o: ../../include/vbuf.h
+lmtp_session.o: ../../include/stringops.h
+lmtp_session.o: ../../include/vstring.h
+lmtp_session.o: ../../include/debug_peer.h
 lmtp_session.o: lmtp.h
-lmtp_session.o: ../include/argv.h
-lmtp_session.o: ../include/deliver_request.h
-lmtp_session.o: ../include/recipient_list.h
+lmtp_session.o: ../../include/argv.h
+lmtp_session.o: ../../include/deliver_request.h
+lmtp_session.o: ../../include/recipient_list.h
 lmtp_state.o: lmtp_state.c
-lmtp_state.o: ../include/sys_defs.h
-lmtp_state.o: ../include/mymalloc.h
-lmtp_state.o: ../include/vstring.h
-lmtp_state.o: ../include/vbuf.h
-lmtp_state.o: ../include/vstream.h
-lmtp_state.o: ../include/config.h
-lmtp_state.o: ../include/mail_conf.h
+lmtp_state.o: ../../include/sys_defs.h
+lmtp_state.o: ../../include/mymalloc.h
+lmtp_state.o: ../../include/vstring.h
+lmtp_state.o: ../../include/vbuf.h
+lmtp_state.o: ../../include/vstream.h
+lmtp_state.o: ../../include/config.h
+lmtp_state.o: ../../include/mail_conf.h
 lmtp_state.o: lmtp.h
-lmtp_state.o: ../include/argv.h
-lmtp_state.o: ../include/deliver_request.h
-lmtp_state.o: ../include/recipient_list.h
+lmtp_state.o: ../../include/argv.h
+lmtp_state.o: ../../include/deliver_request.h
+lmtp_state.o: ../../include/recipient_list.h
 lmtp_trouble.o: lmtp_trouble.c
-lmtp_trouble.o: ../include/sys_defs.h
-lmtp_trouble.o: ../include/msg.h
-lmtp_trouble.o: ../include/vstring.h
-lmtp_trouble.o: ../include/vbuf.h
-lmtp_trouble.o: ../include/stringops.h
-lmtp_trouble.o: ../include/mymalloc.h
-lmtp_trouble.o: ../include/smtp_stream.h
-lmtp_trouble.o: ../include/vstream.h
-lmtp_trouble.o: ../include/deliver_request.h
-lmtp_trouble.o: ../include/recipient_list.h
-lmtp_trouble.o: ../include/deliver_completed.h
-lmtp_trouble.o: ../include/bounce.h
-lmtp_trouble.o: ../include/defer.h
-lmtp_trouble.o: ../include/mail_error.h
-lmtp_trouble.o: ../include/name_mask.h
+lmtp_trouble.o: ../../include/sys_defs.h
+lmtp_trouble.o: ../../include/msg.h
+lmtp_trouble.o: ../../include/vstring.h
+lmtp_trouble.o: ../../include/vbuf.h
+lmtp_trouble.o: ../../include/stringops.h
+lmtp_trouble.o: ../../include/mymalloc.h
+lmtp_trouble.o: ../../include/smtp_stream.h
+lmtp_trouble.o: ../../include/vstream.h
+lmtp_trouble.o: ../../include/deliver_request.h
+lmtp_trouble.o: ../../include/recipient_list.h
+lmtp_trouble.o: ../../include/deliver_completed.h
+lmtp_trouble.o: ../../include/bounce.h
+lmtp_trouble.o: ../../include/defer.h
+lmtp_trouble.o: ../../include/mail_error.h
+lmtp_trouble.o: ../../include/name_mask.h
 lmtp_trouble.o: lmtp.h
-lmtp_trouble.o: ../include/argv.h
+lmtp_trouble.o: ../../include/argv.h
diff --git a/postfix/src/local/Makefile.in b/postfix/src/local/Makefile.in
index 3f836ffef..022a70881 100644
--- a/postfix/src/local/Makefile.in
+++ b/postfix/src/local/Makefile.in
@@ -16,8 +16,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 PROG	= local
 TESTPROG= 
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -25,14 +25,14 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
@@ -40,7 +40,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -61,362 +61,362 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 alias.o: alias.c
-alias.o: ../include/sys_defs.h
-alias.o: ../include/msg.h
-alias.o: ../include/htable.h
-alias.o: ../include/dict.h
-alias.o: ../include/vstream.h
-alias.o: ../include/vbuf.h
-alias.o: ../include/argv.h
-alias.o: ../include/stringops.h
-alias.o: ../include/vstring.h
-alias.o: ../include/mymalloc.h
-alias.o: ../include/mail_params.h
-alias.o: ../include/mail_addr.h
-alias.o: ../include/sent.h
-alias.o: ../include/defer.h
-alias.o: ../include/bounce.h
-alias.o: ../include/maps.h
-alias.o: ../include/mypwd.h
-alias.o: ../include/canon_addr.h
+alias.o: ../../include/sys_defs.h
+alias.o: ../../include/msg.h
+alias.o: ../../include/htable.h
+alias.o: ../../include/dict.h
+alias.o: ../../include/vstream.h
+alias.o: ../../include/vbuf.h
+alias.o: ../../include/argv.h
+alias.o: ../../include/stringops.h
+alias.o: ../../include/vstring.h
+alias.o: ../../include/mymalloc.h
+alias.o: ../../include/mail_params.h
+alias.o: ../../include/mail_addr.h
+alias.o: ../../include/sent.h
+alias.o: ../../include/defer.h
+alias.o: ../../include/bounce.h
+alias.o: ../../include/maps.h
+alias.o: ../../include/mypwd.h
+alias.o: ../../include/canon_addr.h
 alias.o: local.h
-alias.o: ../include/been_here.h
-alias.o: ../include/tok822.h
-alias.o: ../include/resolve_clnt.h
-alias.o: ../include/deliver_request.h
-alias.o: ../include/recipient_list.h
+alias.o: ../../include/been_here.h
+alias.o: ../../include/tok822.h
+alias.o: ../../include/resolve_clnt.h
+alias.o: ../../include/deliver_request.h
+alias.o: ../../include/recipient_list.h
 biff_notify.o: biff_notify.c
-biff_notify.o: ../include/sys_defs.h
-biff_notify.o: ../include/msg.h
+biff_notify.o: ../../include/sys_defs.h
+biff_notify.o: ../../include/msg.h
 biff_notify.o: biff_notify.h
 command.o: command.c
-command.o: ../include/sys_defs.h
-command.o: ../include/msg.h
-command.o: ../include/htable.h
-command.o: ../include/vstring.h
-command.o: ../include/vbuf.h
-command.o: ../include/vstream.h
-command.o: ../include/argv.h
-command.o: ../include/defer.h
-command.o: ../include/bounce.h
-command.o: ../include/sent.h
-command.o: ../include/been_here.h
-command.o: ../include/mail_params.h
-command.o: ../include/pipe_command.h
-command.o: ../include/mail_copy.h
+command.o: ../../include/sys_defs.h
+command.o: ../../include/msg.h
+command.o: ../../include/htable.h
+command.o: ../../include/vstring.h
+command.o: ../../include/vbuf.h
+command.o: ../../include/vstream.h
+command.o: ../../include/argv.h
+command.o: ../../include/defer.h
+command.o: ../../include/bounce.h
+command.o: ../../include/sent.h
+command.o: ../../include/been_here.h
+command.o: ../../include/mail_params.h
+command.o: ../../include/pipe_command.h
+command.o: ../../include/mail_copy.h
 command.o: local.h
-command.o: ../include/tok822.h
-command.o: ../include/resolve_clnt.h
-command.o: ../include/deliver_request.h
-command.o: ../include/recipient_list.h
+command.o: ../../include/tok822.h
+command.o: ../../include/resolve_clnt.h
+command.o: ../../include/deliver_request.h
+command.o: ../../include/recipient_list.h
 deliver_attr.o: deliver_attr.c
-deliver_attr.o: ../include/sys_defs.h
-deliver_attr.o: ../include/msg.h
-deliver_attr.o: ../include/vstream.h
-deliver_attr.o: ../include/vbuf.h
+deliver_attr.o: ../../include/sys_defs.h
+deliver_attr.o: ../../include/msg.h
+deliver_attr.o: ../../include/vstream.h
+deliver_attr.o: ../../include/vbuf.h
 deliver_attr.o: local.h
-deliver_attr.o: ../include/htable.h
-deliver_attr.o: ../include/vstring.h
-deliver_attr.o: ../include/been_here.h
-deliver_attr.o: ../include/tok822.h
-deliver_attr.o: ../include/resolve_clnt.h
-deliver_attr.o: ../include/deliver_request.h
-deliver_attr.o: ../include/recipient_list.h
+deliver_attr.o: ../../include/htable.h
+deliver_attr.o: ../../include/vstring.h
+deliver_attr.o: ../../include/been_here.h
+deliver_attr.o: ../../include/tok822.h
+deliver_attr.o: ../../include/resolve_clnt.h
+deliver_attr.o: ../../include/deliver_request.h
+deliver_attr.o: ../../include/recipient_list.h
 delivered.o: delivered.c
-delivered.o: ../include/sys_defs.h
-delivered.o: ../include/msg.h
-delivered.o: ../include/htable.h
-delivered.o: ../include/vstring.h
-delivered.o: ../include/vbuf.h
-delivered.o: ../include/vstream.h
-delivered.o: ../include/vstring_vstream.h
-delivered.o: ../include/stringops.h
-delivered.o: ../include/record.h
-delivered.o: ../include/rec_type.h
-delivered.o: ../include/is_header.h
-delivered.o: ../include/quote_822_local.h
-delivered.o: ../include/header_opts.h
+delivered.o: ../../include/sys_defs.h
+delivered.o: ../../include/msg.h
+delivered.o: ../../include/htable.h
+delivered.o: ../../include/vstring.h
+delivered.o: ../../include/vbuf.h
+delivered.o: ../../include/vstream.h
+delivered.o: ../../include/vstring_vstream.h
+delivered.o: ../../include/stringops.h
+delivered.o: ../../include/record.h
+delivered.o: ../../include/rec_type.h
+delivered.o: ../../include/is_header.h
+delivered.o: ../../include/quote_822_local.h
+delivered.o: ../../include/header_opts.h
 delivered.o: local.h
-delivered.o: ../include/been_here.h
-delivered.o: ../include/tok822.h
-delivered.o: ../include/resolve_clnt.h
-delivered.o: ../include/deliver_request.h
-delivered.o: ../include/recipient_list.h
+delivered.o: ../../include/been_here.h
+delivered.o: ../../include/tok822.h
+delivered.o: ../../include/resolve_clnt.h
+delivered.o: ../../include/deliver_request.h
+delivered.o: ../../include/recipient_list.h
 dotforward.o: dotforward.c
-dotforward.o: ../include/sys_defs.h
-dotforward.o: ../include/msg.h
-dotforward.o: ../include/vstring.h
-dotforward.o: ../include/vbuf.h
-dotforward.o: ../include/vstream.h
-dotforward.o: ../include/htable.h
-dotforward.o: ../include/open_as.h
-dotforward.o: ../include/lstat_as.h
-dotforward.o: ../include/iostuff.h
-dotforward.o: ../include/stringops.h
-dotforward.o: ../include/mymalloc.h
-dotforward.o: ../include/mac_expand.h
-dotforward.o: ../include/mac_parse.h
-dotforward.o: ../include/mypwd.h
-dotforward.o: ../include/bounce.h
-dotforward.o: ../include/been_here.h
-dotforward.o: ../include/mail_params.h
-dotforward.o: ../include/mail_conf.h
-dotforward.o: ../include/ext_prop.h
+dotforward.o: ../../include/sys_defs.h
+dotforward.o: ../../include/msg.h
+dotforward.o: ../../include/vstring.h
+dotforward.o: ../../include/vbuf.h
+dotforward.o: ../../include/vstream.h
+dotforward.o: ../../include/htable.h
+dotforward.o: ../../include/open_as.h
+dotforward.o: ../../include/lstat_as.h
+dotforward.o: ../../include/iostuff.h
+dotforward.o: ../../include/stringops.h
+dotforward.o: ../../include/mymalloc.h
+dotforward.o: ../../include/mac_expand.h
+dotforward.o: ../../include/mac_parse.h
+dotforward.o: ../../include/mypwd.h
+dotforward.o: ../../include/bounce.h
+dotforward.o: ../../include/been_here.h
+dotforward.o: ../../include/mail_params.h
+dotforward.o: ../../include/mail_conf.h
+dotforward.o: ../../include/ext_prop.h
 dotforward.o: local.h
-dotforward.o: ../include/tok822.h
-dotforward.o: ../include/resolve_clnt.h
-dotforward.o: ../include/deliver_request.h
-dotforward.o: ../include/recipient_list.h
+dotforward.o: ../../include/tok822.h
+dotforward.o: ../../include/resolve_clnt.h
+dotforward.o: ../../include/deliver_request.h
+dotforward.o: ../../include/recipient_list.h
 file.o: file.c
-file.o: ../include/sys_defs.h
-file.o: ../include/msg.h
-file.o: ../include/htable.h
-file.o: ../include/vstring.h
-file.o: ../include/vbuf.h
-file.o: ../include/vstream.h
-file.o: ../include/deliver_flock.h
-file.o: ../include/open_as.h
-file.o: ../include/mail_copy.h
-file.o: ../include/bounce.h
-file.o: ../include/defer.h
-file.o: ../include/sent.h
-file.o: ../include/been_here.h
-file.o: ../include/mail_params.h
-file.o: ../include/dot_lockfile_as.h
+file.o: ../../include/sys_defs.h
+file.o: ../../include/msg.h
+file.o: ../../include/htable.h
+file.o: ../../include/vstring.h
+file.o: ../../include/vbuf.h
+file.o: ../../include/vstream.h
+file.o: ../../include/deliver_flock.h
+file.o: ../../include/open_as.h
+file.o: ../../include/mail_copy.h
+file.o: ../../include/bounce.h
+file.o: ../../include/defer.h
+file.o: ../../include/sent.h
+file.o: ../../include/been_here.h
+file.o: ../../include/mail_params.h
+file.o: ../../include/dot_lockfile_as.h
 file.o: local.h
-file.o: ../include/tok822.h
-file.o: ../include/resolve_clnt.h
-file.o: ../include/deliver_request.h
-file.o: ../include/recipient_list.h
+file.o: ../../include/tok822.h
+file.o: ../../include/resolve_clnt.h
+file.o: ../../include/deliver_request.h
+file.o: ../../include/recipient_list.h
 forward.o: forward.c
-forward.o: ../include/sys_defs.h
-forward.o: ../include/msg.h
-forward.o: ../include/mymalloc.h
-forward.o: ../include/htable.h
-forward.o: ../include/argv.h
-forward.o: ../include/vstring.h
-forward.o: ../include/vbuf.h
-forward.o: ../include/vstream.h
-forward.o: ../include/vstring_vstream.h
-forward.o: ../include/iostuff.h
-forward.o: ../include/stringops.h
-forward.o: ../include/mail_proto.h
-forward.o: ../include/cleanup_user.h
-forward.o: ../include/sent.h
-forward.o: ../include/record.h
-forward.o: ../include/rec_type.h
-forward.o: ../include/mark_corrupt.h
-forward.o: ../include/mail_date.h
-forward.o: ../include/mail_params.h
+forward.o: ../../include/sys_defs.h
+forward.o: ../../include/msg.h
+forward.o: ../../include/mymalloc.h
+forward.o: ../../include/htable.h
+forward.o: ../../include/argv.h
+forward.o: ../../include/vstring.h
+forward.o: ../../include/vbuf.h
+forward.o: ../../include/vstream.h
+forward.o: ../../include/vstring_vstream.h
+forward.o: ../../include/iostuff.h
+forward.o: ../../include/stringops.h
+forward.o: ../../include/mail_proto.h
+forward.o: ../../include/cleanup_user.h
+forward.o: ../../include/sent.h
+forward.o: ../../include/record.h
+forward.o: ../../include/rec_type.h
+forward.o: ../../include/mark_corrupt.h
+forward.o: ../../include/mail_date.h
+forward.o: ../../include/mail_params.h
 forward.o: local.h
-forward.o: ../include/been_here.h
-forward.o: ../include/tok822.h
-forward.o: ../include/resolve_clnt.h
-forward.o: ../include/deliver_request.h
-forward.o: ../include/recipient_list.h
+forward.o: ../../include/been_here.h
+forward.o: ../../include/tok822.h
+forward.o: ../../include/resolve_clnt.h
+forward.o: ../../include/deliver_request.h
+forward.o: ../../include/recipient_list.h
 include.o: include.c
-include.o: ../include/sys_defs.h
-include.o: ../include/msg.h
-include.o: ../include/htable.h
-include.o: ../include/mymalloc.h
-include.o: ../include/vstream.h
-include.o: ../include/vbuf.h
-include.o: ../include/open_as.h
-include.o: ../include/stat_as.h
-include.o: ../include/iostuff.h
-include.o: ../include/mypwd.h
-include.o: ../include/bounce.h
-include.o: ../include/defer.h
-include.o: ../include/been_here.h
-include.o: ../include/mail_params.h
-include.o: ../include/ext_prop.h
+include.o: ../../include/sys_defs.h
+include.o: ../../include/msg.h
+include.o: ../../include/htable.h
+include.o: ../../include/mymalloc.h
+include.o: ../../include/vstream.h
+include.o: ../../include/vbuf.h
+include.o: ../../include/open_as.h
+include.o: ../../include/stat_as.h
+include.o: ../../include/iostuff.h
+include.o: ../../include/mypwd.h
+include.o: ../../include/bounce.h
+include.o: ../../include/defer.h
+include.o: ../../include/been_here.h
+include.o: ../../include/mail_params.h
+include.o: ../../include/ext_prop.h
 include.o: local.h
-include.o: ../include/vstring.h
-include.o: ../include/tok822.h
-include.o: ../include/resolve_clnt.h
-include.o: ../include/deliver_request.h
-include.o: ../include/recipient_list.h
+include.o: ../../include/vstring.h
+include.o: ../../include/tok822.h
+include.o: ../../include/resolve_clnt.h
+include.o: ../../include/deliver_request.h
+include.o: ../../include/recipient_list.h
 indirect.o: indirect.c
-indirect.o: ../include/sys_defs.h
-indirect.o: ../include/msg.h
-indirect.o: ../include/htable.h
-indirect.o: ../include/mail_params.h
-indirect.o: ../include/bounce.h
-indirect.o: ../include/defer.h
-indirect.o: ../include/been_here.h
+indirect.o: ../../include/sys_defs.h
+indirect.o: ../../include/msg.h
+indirect.o: ../../include/htable.h
+indirect.o: ../../include/mail_params.h
+indirect.o: ../../include/bounce.h
+indirect.o: ../../include/defer.h
+indirect.o: ../../include/been_here.h
 indirect.o: local.h
-indirect.o: ../include/vstream.h
-indirect.o: ../include/vbuf.h
-indirect.o: ../include/vstring.h
-indirect.o: ../include/tok822.h
-indirect.o: ../include/resolve_clnt.h
-indirect.o: ../include/deliver_request.h
-indirect.o: ../include/recipient_list.h
+indirect.o: ../../include/vstream.h
+indirect.o: ../../include/vbuf.h
+indirect.o: ../../include/vstring.h
+indirect.o: ../../include/tok822.h
+indirect.o: ../../include/resolve_clnt.h
+indirect.o: ../../include/deliver_request.h
+indirect.o: ../../include/recipient_list.h
 local.o: local.c
-local.o: ../include/sys_defs.h
-local.o: ../include/msg.h
-local.o: ../include/mymalloc.h
-local.o: ../include/htable.h
-local.o: ../include/vstring.h
-local.o: ../include/vbuf.h
-local.o: ../include/vstream.h
-local.o: ../include/iostuff.h
-local.o: ../include/name_mask.h
-local.o: ../include/set_eugid.h
-local.o: ../include/dict.h
-local.o: ../include/argv.h
-local.o: ../include/recipient_list.h
-local.o: ../include/deliver_request.h
-local.o: ../include/deliver_completed.h
-local.o: ../include/mail_params.h
-local.o: ../include/mail_addr.h
-local.o: ../include/mail_conf.h
-local.o: ../include/been_here.h
-local.o: ../include/ext_prop.h
-local.o: ../include/mail_server.h
+local.o: ../../include/sys_defs.h
+local.o: ../../include/msg.h
+local.o: ../../include/mymalloc.h
+local.o: ../../include/htable.h
+local.o: ../../include/vstring.h
+local.o: ../../include/vbuf.h
+local.o: ../../include/vstream.h
+local.o: ../../include/iostuff.h
+local.o: ../../include/name_mask.h
+local.o: ../../include/set_eugid.h
+local.o: ../../include/dict.h
+local.o: ../../include/argv.h
+local.o: ../../include/recipient_list.h
+local.o: ../../include/deliver_request.h
+local.o: ../../include/deliver_completed.h
+local.o: ../../include/mail_params.h
+local.o: ../../include/mail_addr.h
+local.o: ../../include/mail_conf.h
+local.o: ../../include/been_here.h
+local.o: ../../include/ext_prop.h
+local.o: ../../include/mail_server.h
 local.o: local.h
-local.o: ../include/tok822.h
-local.o: ../include/resolve_clnt.h
+local.o: ../../include/tok822.h
+local.o: ../../include/resolve_clnt.h
 local_expand.o: local_expand.c
-local_expand.o: ../include/sys_defs.h
-local_expand.o: ../include/vstring.h
-local_expand.o: ../include/vbuf.h
-local_expand.o: ../include/mac_expand.h
-local_expand.o: ../include/mac_parse.h
-local_expand.o: ../include/mail_params.h
+local_expand.o: ../../include/sys_defs.h
+local_expand.o: ../../include/vstring.h
+local_expand.o: ../../include/vbuf.h
+local_expand.o: ../../include/mac_expand.h
+local_expand.o: ../../include/mac_parse.h
+local_expand.o: ../../include/mail_params.h
 local_expand.o: local.h
-local_expand.o: ../include/htable.h
-local_expand.o: ../include/vstream.h
-local_expand.o: ../include/been_here.h
-local_expand.o: ../include/tok822.h
-local_expand.o: ../include/resolve_clnt.h
-local_expand.o: ../include/deliver_request.h
-local_expand.o: ../include/recipient_list.h
+local_expand.o: ../../include/htable.h
+local_expand.o: ../../include/vstream.h
+local_expand.o: ../../include/been_here.h
+local_expand.o: ../../include/tok822.h
+local_expand.o: ../../include/resolve_clnt.h
+local_expand.o: ../../include/deliver_request.h
+local_expand.o: ../../include/recipient_list.h
 mailbox.o: mailbox.c
-mailbox.o: ../include/sys_defs.h
-mailbox.o: ../include/msg.h
-mailbox.o: ../include/htable.h
-mailbox.o: ../include/vstring.h
-mailbox.o: ../include/vbuf.h
-mailbox.o: ../include/vstream.h
-mailbox.o: ../include/mymalloc.h
-mailbox.o: ../include/stringops.h
-mailbox.o: ../include/set_eugid.h
-mailbox.o: ../include/mail_copy.h
-mailbox.o: ../include/safe_open.h
-mailbox.o: ../include/deliver_flock.h
-mailbox.o: ../include/defer.h
-mailbox.o: ../include/bounce.h
-mailbox.o: ../include/sent.h
-mailbox.o: ../include/mypwd.h
-mailbox.o: ../include/been_here.h
-mailbox.o: ../include/mail_params.h
-mailbox.o: ../include/deliver_pass.h
-mailbox.o: ../include/deliver_request.h
-mailbox.o: ../include/recipient_list.h
-mailbox.o: ../include/mail_proto.h
-mailbox.o: ../include/iostuff.h
+mailbox.o: ../../include/sys_defs.h
+mailbox.o: ../../include/msg.h
+mailbox.o: ../../include/htable.h
+mailbox.o: ../../include/vstring.h
+mailbox.o: ../../include/vbuf.h
+mailbox.o: ../../include/vstream.h
+mailbox.o: ../../include/mymalloc.h
+mailbox.o: ../../include/stringops.h
+mailbox.o: ../../include/set_eugid.h
+mailbox.o: ../../include/mail_copy.h
+mailbox.o: ../../include/safe_open.h
+mailbox.o: ../../include/deliver_flock.h
+mailbox.o: ../../include/defer.h
+mailbox.o: ../../include/bounce.h
+mailbox.o: ../../include/sent.h
+mailbox.o: ../../include/mypwd.h
+mailbox.o: ../../include/been_here.h
+mailbox.o: ../../include/mail_params.h
+mailbox.o: ../../include/deliver_pass.h
+mailbox.o: ../../include/deliver_request.h
+mailbox.o: ../../include/recipient_list.h
+mailbox.o: ../../include/mail_proto.h
+mailbox.o: ../../include/iostuff.h
 mailbox.o: local.h
-mailbox.o: ../include/tok822.h
-mailbox.o: ../include/resolve_clnt.h
+mailbox.o: ../../include/tok822.h
+mailbox.o: ../../include/resolve_clnt.h
 mailbox.o: biff_notify.h
 maildir.o: maildir.c
-maildir.o: ../include/sys_defs.h
-maildir.o: ../include/msg.h
-maildir.o: ../include/mymalloc.h
-maildir.o: ../include/stringops.h
-maildir.o: ../include/vstring.h
-maildir.o: ../include/vbuf.h
-maildir.o: ../include/vstream.h
-maildir.o: ../include/make_dirs.h
-maildir.o: ../include/set_eugid.h
-maildir.o: ../include/get_hostname.h
-maildir.o: ../include/sane_fsops.h
-maildir.o: ../include/mail_copy.h
-maildir.o: ../include/bounce.h
-maildir.o: ../include/sent.h
-maildir.o: ../include/mail_params.h
+maildir.o: ../../include/sys_defs.h
+maildir.o: ../../include/msg.h
+maildir.o: ../../include/mymalloc.h
+maildir.o: ../../include/stringops.h
+maildir.o: ../../include/vstring.h
+maildir.o: ../../include/vbuf.h
+maildir.o: ../../include/vstream.h
+maildir.o: ../../include/make_dirs.h
+maildir.o: ../../include/set_eugid.h
+maildir.o: ../../include/get_hostname.h
+maildir.o: ../../include/sane_fsops.h
+maildir.o: ../../include/mail_copy.h
+maildir.o: ../../include/bounce.h
+maildir.o: ../../include/sent.h
+maildir.o: ../../include/mail_params.h
 maildir.o: local.h
-maildir.o: ../include/htable.h
-maildir.o: ../include/been_here.h
-maildir.o: ../include/tok822.h
-maildir.o: ../include/resolve_clnt.h
-maildir.o: ../include/deliver_request.h
-maildir.o: ../include/recipient_list.h
+maildir.o: ../../include/htable.h
+maildir.o: ../../include/been_here.h
+maildir.o: ../../include/tok822.h
+maildir.o: ../../include/resolve_clnt.h
+maildir.o: ../../include/deliver_request.h
+maildir.o: ../../include/recipient_list.h
 recipient.o: recipient.c
-recipient.o: ../include/sys_defs.h
-recipient.o: ../include/msg.h
-recipient.o: ../include/mymalloc.h
-recipient.o: ../include/htable.h
-recipient.o: ../include/split_at.h
-recipient.o: ../include/stringops.h
-recipient.o: ../include/vstring.h
-recipient.o: ../include/vbuf.h
-recipient.o: ../include/dict.h
-recipient.o: ../include/vstream.h
-recipient.o: ../include/argv.h
-recipient.o: ../include/bounce.h
-recipient.o: ../include/mail_params.h
-recipient.o: ../include/split_addr.h
-recipient.o: ../include/ext_prop.h
+recipient.o: ../../include/sys_defs.h
+recipient.o: ../../include/msg.h
+recipient.o: ../../include/mymalloc.h
+recipient.o: ../../include/htable.h
+recipient.o: ../../include/split_at.h
+recipient.o: ../../include/stringops.h
+recipient.o: ../../include/vstring.h
+recipient.o: ../../include/vbuf.h
+recipient.o: ../../include/dict.h
+recipient.o: ../../include/vstream.h
+recipient.o: ../../include/argv.h
+recipient.o: ../../include/bounce.h
+recipient.o: ../../include/mail_params.h
+recipient.o: ../../include/split_addr.h
+recipient.o: ../../include/ext_prop.h
 recipient.o: local.h
-recipient.o: ../include/been_here.h
-recipient.o: ../include/tok822.h
-recipient.o: ../include/resolve_clnt.h
-recipient.o: ../include/deliver_request.h
-recipient.o: ../include/recipient_list.h
+recipient.o: ../../include/been_here.h
+recipient.o: ../../include/tok822.h
+recipient.o: ../../include/resolve_clnt.h
+recipient.o: ../../include/deliver_request.h
+recipient.o: ../../include/recipient_list.h
 resolve.o: resolve.c
-resolve.o: ../include/sys_defs.h
-resolve.o: ../include/msg.h
-resolve.o: ../include/vstring.h
-resolve.o: ../include/vbuf.h
-resolve.o: ../include/htable.h
-resolve.o: ../include/mail_proto.h
-resolve.o: ../include/vstream.h
-resolve.o: ../include/iostuff.h
-resolve.o: ../include/resolve_clnt.h
-resolve.o: ../include/rewrite_clnt.h
-resolve.o: ../include/tok822.h
-resolve.o: ../include/mail_params.h
+resolve.o: ../../include/sys_defs.h
+resolve.o: ../../include/msg.h
+resolve.o: ../../include/vstring.h
+resolve.o: ../../include/vbuf.h
+resolve.o: ../../include/htable.h
+resolve.o: ../../include/mail_proto.h
+resolve.o: ../../include/vstream.h
+resolve.o: ../../include/iostuff.h
+resolve.o: ../../include/resolve_clnt.h
+resolve.o: ../../include/rewrite_clnt.h
+resolve.o: ../../include/tok822.h
+resolve.o: ../../include/mail_params.h
 resolve.o: local.h
-resolve.o: ../include/been_here.h
-resolve.o: ../include/deliver_request.h
-resolve.o: ../include/recipient_list.h
+resolve.o: ../../include/been_here.h
+resolve.o: ../../include/deliver_request.h
+resolve.o: ../../include/recipient_list.h
 token.o: token.c
-token.o: ../include/sys_defs.h
-token.o: ../include/msg.h
-token.o: ../include/vstring.h
-token.o: ../include/vbuf.h
-token.o: ../include/vstream.h
-token.o: ../include/htable.h
-token.o: ../include/readlline.h
-token.o: ../include/mymalloc.h
-token.o: ../include/vstring_vstream.h
-token.o: ../include/stringops.h
-token.o: ../include/tok822.h
-token.o: ../include/resolve_clnt.h
-token.o: ../include/mail_params.h
-token.o: ../include/bounce.h
+token.o: ../../include/sys_defs.h
+token.o: ../../include/msg.h
+token.o: ../../include/vstring.h
+token.o: ../../include/vbuf.h
+token.o: ../../include/vstream.h
+token.o: ../../include/htable.h
+token.o: ../../include/readlline.h
+token.o: ../../include/mymalloc.h
+token.o: ../../include/vstring_vstream.h
+token.o: ../../include/stringops.h
+token.o: ../../include/tok822.h
+token.o: ../../include/resolve_clnt.h
+token.o: ../../include/mail_params.h
+token.o: ../../include/bounce.h
 token.o: local.h
-token.o: ../include/been_here.h
-token.o: ../include/deliver_request.h
-token.o: ../include/recipient_list.h
+token.o: ../../include/been_here.h
+token.o: ../../include/deliver_request.h
+token.o: ../../include/recipient_list.h
 unknown.o: unknown.c
-unknown.o: ../include/sys_defs.h
-unknown.o: ../include/msg.h
-unknown.o: ../include/stringops.h
-unknown.o: ../include/vstring.h
-unknown.o: ../include/vbuf.h
-unknown.o: ../include/mymalloc.h
-unknown.o: ../include/been_here.h
-unknown.o: ../include/mail_params.h
-unknown.o: ../include/mail_proto.h
-unknown.o: ../include/vstream.h
-unknown.o: ../include/iostuff.h
-unknown.o: ../include/bounce.h
+unknown.o: ../../include/sys_defs.h
+unknown.o: ../../include/msg.h
+unknown.o: ../../include/stringops.h
+unknown.o: ../../include/vstring.h
+unknown.o: ../../include/vbuf.h
+unknown.o: ../../include/mymalloc.h
+unknown.o: ../../include/been_here.h
+unknown.o: ../../include/mail_params.h
+unknown.o: ../../include/mail_proto.h
+unknown.o: ../../include/vstream.h
+unknown.o: ../../include/iostuff.h
+unknown.o: ../../include/bounce.h
 unknown.o: local.h
-unknown.o: ../include/htable.h
-unknown.o: ../include/tok822.h
-unknown.o: ../include/resolve_clnt.h
-unknown.o: ../include/deliver_request.h
-unknown.o: ../include/recipient_list.h
+unknown.o: ../../include/htable.h
+unknown.o: ../../include/tok822.h
+unknown.o: ../../include/resolve_clnt.h
+unknown.o: ../../include/deliver_request.h
+unknown.o: ../../include/recipient_list.h
diff --git a/postfix/src/master/Makefile.in b/postfix/src/master/Makefile.in
index 8ea5ee440..3a4bffece 100644
--- a/postfix/src/master/Makefile.in
+++ b/postfix/src/master/Makefile.in
@@ -17,17 +17,17 @@ CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 LIB	= libmaster.a
 PROG	= master
 TESTPROG= 
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
-LIB_DIR	= ../lib
-INC_DIR	= ../include
-BIN_DIR	= ../libexec
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
+LIB_DIR	= ../../lib
+INC_DIR	= ../../include
+BIN_DIR	= ../../libexec
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 all:	$(PROG) $(LIB)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
@@ -58,7 +58,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -79,194 +79,194 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 master.o: master.c
-master.o: ../include/sys_defs.h
-master.o: ../include/events.h
-master.o: ../include/msg.h
-master.o: ../include/msg_syslog.h
-master.o: ../include/vstring.h
-master.o: ../include/vbuf.h
-master.o: ../include/mymalloc.h
-master.o: ../include/iostuff.h
-master.o: ../include/vstream.h
-master.o: ../include/stringops.h
-master.o: ../include/myflock.h
-master.o: ../include/watchdog.h
-master.o: ../include/mail_params.h
-master.o: ../include/debug_process.h
-master.o: ../include/mail_task.h
-master.o: ../include/mail_conf.h
-master.o: ../include/open_lock.h
+master.o: ../../include/sys_defs.h
+master.o: ../../include/events.h
+master.o: ../../include/msg.h
+master.o: ../../include/msg_syslog.h
+master.o: ../../include/vstring.h
+master.o: ../../include/vbuf.h
+master.o: ../../include/mymalloc.h
+master.o: ../../include/iostuff.h
+master.o: ../../include/vstream.h
+master.o: ../../include/stringops.h
+master.o: ../../include/myflock.h
+master.o: ../../include/watchdog.h
+master.o: ../../include/mail_params.h
+master.o: ../../include/debug_process.h
+master.o: ../../include/mail_task.h
+master.o: ../../include/mail_conf.h
+master.o: ../../include/open_lock.h
 master.o: master.h
 master_avail.o: master_avail.c
-master_avail.o: ../include/sys_defs.h
-master_avail.o: ../include/events.h
-master_avail.o: ../include/msg.h
+master_avail.o: ../../include/sys_defs.h
+master_avail.o: ../../include/events.h
+master_avail.o: ../../include/msg.h
 master_avail.o: master_proto.h
 master_avail.o: master.h
 master_conf.o: master_conf.c
-master_conf.o: ../include/sys_defs.h
-master_conf.o: ../include/msg.h
-master_conf.o: ../include/argv.h
+master_conf.o: ../../include/sys_defs.h
+master_conf.o: ../../include/msg.h
+master_conf.o: ../../include/argv.h
 master_conf.o: master.h
 master_ent.o: master_ent.c
-master_ent.o: ../include/sys_defs.h
-master_ent.o: ../include/msg.h
-master_ent.o: ../include/mymalloc.h
-master_ent.o: ../include/vstring.h
-master_ent.o: ../include/vbuf.h
-master_ent.o: ../include/vstream.h
-master_ent.o: ../include/argv.h
-master_ent.o: ../include/stringops.h
-master_ent.o: ../include/readlline.h
-master_ent.o: ../include/inet_addr_list.h
-master_ent.o: ../include/mail_proto.h
-master_ent.o: ../include/iostuff.h
-master_ent.o: ../include/mail_params.h
-master_ent.o: ../include/own_inet_addr.h
+master_ent.o: ../../include/sys_defs.h
+master_ent.o: ../../include/msg.h
+master_ent.o: ../../include/mymalloc.h
+master_ent.o: ../../include/vstring.h
+master_ent.o: ../../include/vbuf.h
+master_ent.o: ../../include/vstream.h
+master_ent.o: ../../include/argv.h
+master_ent.o: ../../include/stringops.h
+master_ent.o: ../../include/readlline.h
+master_ent.o: ../../include/inet_addr_list.h
+master_ent.o: ../../include/mail_proto.h
+master_ent.o: ../../include/iostuff.h
+master_ent.o: ../../include/mail_params.h
+master_ent.o: ../../include/own_inet_addr.h
 master_ent.o: master_proto.h
 master_ent.o: master.h
 master_listen.o: master_listen.c
-master_listen.o: ../include/sys_defs.h
-master_listen.o: ../include/msg.h
-master_listen.o: ../include/listen.h
-master_listen.o: ../include/iostuff.h
-master_listen.o: ../include/mymalloc.h
-master_listen.o: ../include/stringops.h
-master_listen.o: ../include/vstring.h
-master_listen.o: ../include/vbuf.h
-master_listen.o: ../include/inet_addr_list.h
-master_listen.o: ../include/set_eugid.h
-master_listen.o: ../include/mail_params.h
+master_listen.o: ../../include/sys_defs.h
+master_listen.o: ../../include/msg.h
+master_listen.o: ../../include/listen.h
+master_listen.o: ../../include/iostuff.h
+master_listen.o: ../../include/mymalloc.h
+master_listen.o: ../../include/stringops.h
+master_listen.o: ../../include/vstring.h
+master_listen.o: ../../include/vbuf.h
+master_listen.o: ../../include/inet_addr_list.h
+master_listen.o: ../../include/set_eugid.h
+master_listen.o: ../../include/mail_params.h
 master_listen.o: master.h
 master_proto.o: master_proto.c
-master_proto.o: ../include/sys_defs.h
-master_proto.o: ../include/msg.h
+master_proto.o: ../../include/sys_defs.h
+master_proto.o: ../../include/msg.h
 master_proto.o: master_proto.h
 master_service.o: master_service.c
-master_service.o: ../include/sys_defs.h
-master_service.o: ../include/msg.h
-master_service.o: ../include/mymalloc.h
+master_service.o: ../../include/sys_defs.h
+master_service.o: ../../include/msg.h
+master_service.o: ../../include/mymalloc.h
 master_service.o: master.h
 master_sig.o: master_sig.c
-master_sig.o: ../include/sys_defs.h
-master_sig.o: ../include/msg.h
-master_sig.o: ../include/posix_signals.h
+master_sig.o: ../../include/sys_defs.h
+master_sig.o: ../../include/msg.h
+master_sig.o: ../../include/posix_signals.h
 master_sig.o: master.h
 master_spawn.o: master_spawn.c
-master_spawn.o: ../include/sys_defs.h
-master_spawn.o: ../include/msg.h
-master_spawn.o: ../include/binhash.h
-master_spawn.o: ../include/mymalloc.h
-master_spawn.o: ../include/events.h
-master_spawn.o: ../include/argv.h
+master_spawn.o: ../../include/sys_defs.h
+master_spawn.o: ../../include/msg.h
+master_spawn.o: ../../include/binhash.h
+master_spawn.o: ../../include/mymalloc.h
+master_spawn.o: ../../include/events.h
+master_spawn.o: ../../include/argv.h
 master_spawn.o: master_proto.h
 master_spawn.o: master.h
 master_status.o: master_status.c
-master_status.o: ../include/sys_defs.h
-master_status.o: ../include/msg.h
-master_status.o: ../include/events.h
-master_status.o: ../include/binhash.h
-master_status.o: ../include/iostuff.h
+master_status.o: ../../include/sys_defs.h
+master_status.o: ../../include/msg.h
+master_status.o: ../../include/events.h
+master_status.o: ../../include/binhash.h
+master_status.o: ../../include/iostuff.h
 master_status.o: master_proto.h
 master_status.o: master.h
 master_vars.o: master_vars.c
-master_vars.o: ../include/sys_defs.h
-master_vars.o: ../include/msg.h
-master_vars.o: ../include/stringops.h
-master_vars.o: ../include/vstring.h
-master_vars.o: ../include/vbuf.h
-master_vars.o: ../include/mymalloc.h
-master_vars.o: ../include/mail_conf.h
-master_vars.o: ../include/mail_params.h
+master_vars.o: ../../include/sys_defs.h
+master_vars.o: ../../include/msg.h
+master_vars.o: ../../include/stringops.h
+master_vars.o: ../../include/vstring.h
+master_vars.o: ../../include/vbuf.h
+master_vars.o: ../../include/mymalloc.h
+master_vars.o: ../../include/mail_conf.h
+master_vars.o: ../../include/mail_params.h
 master_vars.o: master.h
 master_wakeup.o: master_wakeup.c
-master_wakeup.o: ../include/sys_defs.h
-master_wakeup.o: ../include/msg.h
-master_wakeup.o: ../include/trigger.h
-master_wakeup.o: ../include/events.h
-master_wakeup.o: ../include/mail_proto.h
-master_wakeup.o: ../include/vstream.h
-master_wakeup.o: ../include/vbuf.h
-master_wakeup.o: ../include/iostuff.h
+master_wakeup.o: ../../include/sys_defs.h
+master_wakeup.o: ../../include/msg.h
+master_wakeup.o: ../../include/trigger.h
+master_wakeup.o: ../../include/events.h
+master_wakeup.o: ../../include/mail_proto.h
+master_wakeup.o: ../../include/vstream.h
+master_wakeup.o: ../../include/vbuf.h
+master_wakeup.o: ../../include/iostuff.h
 master_wakeup.o: mail_server.h
 master_wakeup.o: master.h
 multi_server.o: multi_server.c
-multi_server.o: ../include/sys_defs.h
-multi_server.o: ../include/msg.h
-multi_server.o: ../include/msg_syslog.h
-multi_server.o: ../include/chroot_uid.h
-multi_server.o: ../include/listen.h
-multi_server.o: ../include/iostuff.h
-multi_server.o: ../include/events.h
-multi_server.o: ../include/vstring.h
-multi_server.o: ../include/vbuf.h
-multi_server.o: ../include/vstream.h
-multi_server.o: ../include/msg_vstream.h
-multi_server.o: ../include/mymalloc.h
-multi_server.o: ../include/stringops.h
-multi_server.o: ../include/sane_accept.h
-multi_server.o: ../include/myflock.h
-multi_server.o: ../include/safe_open.h
-multi_server.o: ../include/watchdog.h
-multi_server.o: ../include/split_at.h
-multi_server.o: ../include/mail_task.h
-multi_server.o: ../include/debug_process.h
-multi_server.o: ../include/mail_params.h
-multi_server.o: ../include/mail_conf.h
-multi_server.o: ../include/timed_ipc.h
-multi_server.o: ../include/resolve_local.h
+multi_server.o: ../../include/sys_defs.h
+multi_server.o: ../../include/msg.h
+multi_server.o: ../../include/msg_syslog.h
+multi_server.o: ../../include/chroot_uid.h
+multi_server.o: ../../include/listen.h
+multi_server.o: ../../include/iostuff.h
+multi_server.o: ../../include/events.h
+multi_server.o: ../../include/vstring.h
+multi_server.o: ../../include/vbuf.h
+multi_server.o: ../../include/vstream.h
+multi_server.o: ../../include/msg_vstream.h
+multi_server.o: ../../include/mymalloc.h
+multi_server.o: ../../include/stringops.h
+multi_server.o: ../../include/sane_accept.h
+multi_server.o: ../../include/myflock.h
+multi_server.o: ../../include/safe_open.h
+multi_server.o: ../../include/watchdog.h
+multi_server.o: ../../include/split_at.h
+multi_server.o: ../../include/mail_task.h
+multi_server.o: ../../include/debug_process.h
+multi_server.o: ../../include/mail_params.h
+multi_server.o: ../../include/mail_conf.h
+multi_server.o: ../../include/timed_ipc.h
+multi_server.o: ../../include/resolve_local.h
 multi_server.o: master_proto.h
 multi_server.o: mail_server.h
 single_server.o: single_server.c
-single_server.o: ../include/sys_defs.h
-single_server.o: ../include/msg.h
-single_server.o: ../include/msg_syslog.h
-single_server.o: ../include/chroot_uid.h
-single_server.o: ../include/vstring.h
-single_server.o: ../include/vbuf.h
-single_server.o: ../include/vstream.h
-single_server.o: ../include/msg_vstream.h
-single_server.o: ../include/mymalloc.h
-single_server.o: ../include/events.h
-single_server.o: ../include/iostuff.h
-single_server.o: ../include/stringops.h
-single_server.o: ../include/sane_accept.h
-single_server.o: ../include/myflock.h
-single_server.o: ../include/safe_open.h
-single_server.o: ../include/listen.h
-single_server.o: ../include/watchdog.h
-single_server.o: ../include/split_at.h
-single_server.o: ../include/mail_params.h
-single_server.o: ../include/mail_task.h
-single_server.o: ../include/debug_process.h
-single_server.o: ../include/mail_conf.h
-single_server.o: ../include/timed_ipc.h
-single_server.o: ../include/resolve_local.h
+single_server.o: ../../include/sys_defs.h
+single_server.o: ../../include/msg.h
+single_server.o: ../../include/msg_syslog.h
+single_server.o: ../../include/chroot_uid.h
+single_server.o: ../../include/vstring.h
+single_server.o: ../../include/vbuf.h
+single_server.o: ../../include/vstream.h
+single_server.o: ../../include/msg_vstream.h
+single_server.o: ../../include/mymalloc.h
+single_server.o: ../../include/events.h
+single_server.o: ../../include/iostuff.h
+single_server.o: ../../include/stringops.h
+single_server.o: ../../include/sane_accept.h
+single_server.o: ../../include/myflock.h
+single_server.o: ../../include/safe_open.h
+single_server.o: ../../include/listen.h
+single_server.o: ../../include/watchdog.h
+single_server.o: ../../include/split_at.h
+single_server.o: ../../include/mail_params.h
+single_server.o: ../../include/mail_task.h
+single_server.o: ../../include/debug_process.h
+single_server.o: ../../include/mail_conf.h
+single_server.o: ../../include/timed_ipc.h
+single_server.o: ../../include/resolve_local.h
 single_server.o: master_proto.h
 single_server.o: mail_server.h
 trigger_server.o: trigger_server.c
-trigger_server.o: ../include/sys_defs.h
-trigger_server.o: ../include/msg.h
-trigger_server.o: ../include/msg_syslog.h
-trigger_server.o: ../include/chroot_uid.h
-trigger_server.o: ../include/vstring.h
-trigger_server.o: ../include/vbuf.h
-trigger_server.o: ../include/vstream.h
-trigger_server.o: ../include/msg_vstream.h
-trigger_server.o: ../include/mymalloc.h
-trigger_server.o: ../include/events.h
-trigger_server.o: ../include/iostuff.h
-trigger_server.o: ../include/stringops.h
-trigger_server.o: ../include/sane_accept.h
-trigger_server.o: ../include/myflock.h
-trigger_server.o: ../include/safe_open.h
-trigger_server.o: ../include/listen.h
-trigger_server.o: ../include/watchdog.h
-trigger_server.o: ../include/split_at.h
-trigger_server.o: ../include/mail_params.h
-trigger_server.o: ../include/mail_task.h
-trigger_server.o: ../include/debug_process.h
-trigger_server.o: ../include/mail_conf.h
-trigger_server.o: ../include/resolve_local.h
+trigger_server.o: ../../include/sys_defs.h
+trigger_server.o: ../../include/msg.h
+trigger_server.o: ../../include/msg_syslog.h
+trigger_server.o: ../../include/chroot_uid.h
+trigger_server.o: ../../include/vstring.h
+trigger_server.o: ../../include/vbuf.h
+trigger_server.o: ../../include/vstream.h
+trigger_server.o: ../../include/msg_vstream.h
+trigger_server.o: ../../include/mymalloc.h
+trigger_server.o: ../../include/events.h
+trigger_server.o: ../../include/iostuff.h
+trigger_server.o: ../../include/stringops.h
+trigger_server.o: ../../include/sane_accept.h
+trigger_server.o: ../../include/myflock.h
+trigger_server.o: ../../include/safe_open.h
+trigger_server.o: ../../include/listen.h
+trigger_server.o: ../../include/watchdog.h
+trigger_server.o: ../../include/split_at.h
+trigger_server.o: ../../include/mail_params.h
+trigger_server.o: ../../include/mail_task.h
+trigger_server.o: ../../include/debug_process.h
+trigger_server.o: ../../include/mail_conf.h
+trigger_server.o: ../../include/resolve_local.h
 trigger_server.o: master_proto.h
 trigger_server.o: mail_server.h
diff --git a/postfix/src/nqmgr/Makefile.in b/postfix/src/nqmgr/Makefile.in
index 6423a22ab..83354ffcf 100644
--- a/postfix/src/nqmgr/Makefile.in
+++ b/postfix/src/nqmgr/Makefile.in
@@ -16,8 +16,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= qmgr
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -25,14 +25,14 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/n$(PROG)
+update: ../../libexec/n$(PROG)
 
-../libexec/n$(PROG): $(PROG)
-	cp $(PROG) ../libexec/n$(PROG)
+../../libexec/n$(PROG): $(PROG)
+	cp $(PROG) ../../libexec/n$(PROG)
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
@@ -40,7 +40,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -61,202 +61,202 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 qmgr.o: qmgr.c
-qmgr.o: ../include/sys_defs.h
-qmgr.o: ../include/msg.h
-qmgr.o: ../include/events.h
-qmgr.o: ../include/vstream.h
-qmgr.o: ../include/vbuf.h
-qmgr.o: ../include/dict.h
-qmgr.o: ../include/argv.h
-qmgr.o: ../include/mail_queue.h
-qmgr.o: ../include/vstring.h
-qmgr.o: ../include/recipient_list.h
-qmgr.o: ../include/mail_conf.h
-qmgr.o: ../include/mail_params.h
-qmgr.o: ../include/mail_proto.h
-qmgr.o: ../include/iostuff.h
-qmgr.o: ../include/master_proto.h
-qmgr.o: ../include/mail_server.h
+qmgr.o: ../../include/sys_defs.h
+qmgr.o: ../../include/msg.h
+qmgr.o: ../../include/events.h
+qmgr.o: ../../include/vstream.h
+qmgr.o: ../../include/vbuf.h
+qmgr.o: ../../include/dict.h
+qmgr.o: ../../include/argv.h
+qmgr.o: ../../include/mail_queue.h
+qmgr.o: ../../include/vstring.h
+qmgr.o: ../../include/recipient_list.h
+qmgr.o: ../../include/mail_conf.h
+qmgr.o: ../../include/mail_params.h
+qmgr.o: ../../include/mail_proto.h
+qmgr.o: ../../include/iostuff.h
+qmgr.o: ../../include/master_proto.h
+qmgr.o: ../../include/mail_server.h
 qmgr.o: qmgr.h
-qmgr.o: ../include/scan_dir.h
-qmgr.o: ../include/maps.h
+qmgr.o: ../../include/scan_dir.h
+qmgr.o: ../../include/maps.h
 qmgr_active.o: qmgr_active.c
-qmgr_active.o: ../include/sys_defs.h
-qmgr_active.o: ../include/msg.h
-qmgr_active.o: ../include/events.h
-qmgr_active.o: ../include/mymalloc.h
-qmgr_active.o: ../include/vstream.h
-qmgr_active.o: ../include/vbuf.h
-qmgr_active.o: ../include/mail_params.h
-qmgr_active.o: ../include/mail_open_ok.h
-qmgr_active.o: ../include/mail_queue.h
-qmgr_active.o: ../include/vstring.h
-qmgr_active.o: ../include/recipient_list.h
-qmgr_active.o: ../include/bounce.h
-qmgr_active.o: ../include/defer.h
-qmgr_active.o: ../include/rec_type.h
+qmgr_active.o: ../../include/sys_defs.h
+qmgr_active.o: ../../include/msg.h
+qmgr_active.o: ../../include/events.h
+qmgr_active.o: ../../include/mymalloc.h
+qmgr_active.o: ../../include/vstream.h
+qmgr_active.o: ../../include/vbuf.h
+qmgr_active.o: ../../include/mail_params.h
+qmgr_active.o: ../../include/mail_open_ok.h
+qmgr_active.o: ../../include/mail_queue.h
+qmgr_active.o: ../../include/vstring.h
+qmgr_active.o: ../../include/recipient_list.h
+qmgr_active.o: ../../include/bounce.h
+qmgr_active.o: ../../include/defer.h
+qmgr_active.o: ../../include/rec_type.h
 qmgr_active.o: qmgr.h
-qmgr_active.o: ../include/scan_dir.h
-qmgr_active.o: ../include/maps.h
-qmgr_active.o: ../include/dict.h
-qmgr_active.o: ../include/argv.h
+qmgr_active.o: ../../include/scan_dir.h
+qmgr_active.o: ../../include/maps.h
+qmgr_active.o: ../../include/dict.h
+qmgr_active.o: ../../include/argv.h
 qmgr_bounce.o: qmgr_bounce.c
-qmgr_bounce.o: ../include/sys_defs.h
-qmgr_bounce.o: ../include/bounce.h
-qmgr_bounce.o: ../include/deliver_completed.h
-qmgr_bounce.o: ../include/vstream.h
-qmgr_bounce.o: ../include/vbuf.h
+qmgr_bounce.o: ../../include/sys_defs.h
+qmgr_bounce.o: ../../include/bounce.h
+qmgr_bounce.o: ../../include/deliver_completed.h
+qmgr_bounce.o: ../../include/vstream.h
+qmgr_bounce.o: ../../include/vbuf.h
 qmgr_bounce.o: qmgr.h
-qmgr_bounce.o: ../include/scan_dir.h
-qmgr_bounce.o: ../include/maps.h
-qmgr_bounce.o: ../include/dict.h
-qmgr_bounce.o: ../include/argv.h
+qmgr_bounce.o: ../../include/scan_dir.h
+qmgr_bounce.o: ../../include/maps.h
+qmgr_bounce.o: ../../include/dict.h
+qmgr_bounce.o: ../../include/argv.h
 qmgr_defer.o: qmgr_defer.c
-qmgr_defer.o: ../include/sys_defs.h
-qmgr_defer.o: ../include/msg.h
-qmgr_defer.o: ../include/vstream.h
-qmgr_defer.o: ../include/vbuf.h
-qmgr_defer.o: ../include/defer.h
-qmgr_defer.o: ../include/bounce.h
+qmgr_defer.o: ../../include/sys_defs.h
+qmgr_defer.o: ../../include/msg.h
+qmgr_defer.o: ../../include/vstream.h
+qmgr_defer.o: ../../include/vbuf.h
+qmgr_defer.o: ../../include/defer.h
+qmgr_defer.o: ../../include/bounce.h
 qmgr_defer.o: qmgr.h
-qmgr_defer.o: ../include/scan_dir.h
-qmgr_defer.o: ../include/maps.h
-qmgr_defer.o: ../include/dict.h
-qmgr_defer.o: ../include/argv.h
+qmgr_defer.o: ../../include/scan_dir.h
+qmgr_defer.o: ../../include/maps.h
+qmgr_defer.o: ../../include/dict.h
+qmgr_defer.o: ../../include/argv.h
 qmgr_deliver.o: qmgr_deliver.c
-qmgr_deliver.o: ../include/sys_defs.h
-qmgr_deliver.o: ../include/msg.h
-qmgr_deliver.o: ../include/vstring.h
-qmgr_deliver.o: ../include/vbuf.h
-qmgr_deliver.o: ../include/vstream.h
-qmgr_deliver.o: ../include/vstring_vstream.h
-qmgr_deliver.o: ../include/events.h
-qmgr_deliver.o: ../include/iostuff.h
-qmgr_deliver.o: ../include/mail_queue.h
-qmgr_deliver.o: ../include/mail_proto.h
-qmgr_deliver.o: ../include/recipient_list.h
-qmgr_deliver.o: ../include/mail_params.h
+qmgr_deliver.o: ../../include/sys_defs.h
+qmgr_deliver.o: ../../include/msg.h
+qmgr_deliver.o: ../../include/vstring.h
+qmgr_deliver.o: ../../include/vbuf.h
+qmgr_deliver.o: ../../include/vstream.h
+qmgr_deliver.o: ../../include/vstring_vstream.h
+qmgr_deliver.o: ../../include/events.h
+qmgr_deliver.o: ../../include/iostuff.h
+qmgr_deliver.o: ../../include/mail_queue.h
+qmgr_deliver.o: ../../include/mail_proto.h
+qmgr_deliver.o: ../../include/recipient_list.h
+qmgr_deliver.o: ../../include/mail_params.h
 qmgr_deliver.o: qmgr.h
-qmgr_deliver.o: ../include/scan_dir.h
-qmgr_deliver.o: ../include/maps.h
-qmgr_deliver.o: ../include/dict.h
-qmgr_deliver.o: ../include/argv.h
+qmgr_deliver.o: ../../include/scan_dir.h
+qmgr_deliver.o: ../../include/maps.h
+qmgr_deliver.o: ../../include/dict.h
+qmgr_deliver.o: ../../include/argv.h
 qmgr_enable.o: qmgr_enable.c
-qmgr_enable.o: ../include/sys_defs.h
-qmgr_enable.o: ../include/msg.h
-qmgr_enable.o: ../include/vstream.h
-qmgr_enable.o: ../include/vbuf.h
+qmgr_enable.o: ../../include/sys_defs.h
+qmgr_enable.o: ../../include/msg.h
+qmgr_enable.o: ../../include/vstream.h
+qmgr_enable.o: ../../include/vbuf.h
 qmgr_enable.o: qmgr.h
-qmgr_enable.o: ../include/scan_dir.h
-qmgr_enable.o: ../include/maps.h
-qmgr_enable.o: ../include/dict.h
-qmgr_enable.o: ../include/argv.h
+qmgr_enable.o: ../../include/scan_dir.h
+qmgr_enable.o: ../../include/maps.h
+qmgr_enable.o: ../../include/dict.h
+qmgr_enable.o: ../../include/argv.h
 qmgr_entry.o: qmgr_entry.c
-qmgr_entry.o: ../include/sys_defs.h
-qmgr_entry.o: ../include/msg.h
-qmgr_entry.o: ../include/mymalloc.h
-qmgr_entry.o: ../include/events.h
-qmgr_entry.o: ../include/vstream.h
-qmgr_entry.o: ../include/vbuf.h
-qmgr_entry.o: ../include/mail_params.h
+qmgr_entry.o: ../../include/sys_defs.h
+qmgr_entry.o: ../../include/msg.h
+qmgr_entry.o: ../../include/mymalloc.h
+qmgr_entry.o: ../../include/events.h
+qmgr_entry.o: ../../include/vstream.h
+qmgr_entry.o: ../../include/vbuf.h
+qmgr_entry.o: ../../include/mail_params.h
 qmgr_entry.o: qmgr.h
-qmgr_entry.o: ../include/scan_dir.h
-qmgr_entry.o: ../include/maps.h
-qmgr_entry.o: ../include/dict.h
-qmgr_entry.o: ../include/argv.h
+qmgr_entry.o: ../../include/scan_dir.h
+qmgr_entry.o: ../../include/maps.h
+qmgr_entry.o: ../../include/dict.h
+qmgr_entry.o: ../../include/argv.h
 qmgr_message.o: qmgr_message.c
-qmgr_message.o: ../include/sys_defs.h
-qmgr_message.o: ../include/msg.h
-qmgr_message.o: ../include/mymalloc.h
-qmgr_message.o: ../include/vstring.h
-qmgr_message.o: ../include/vbuf.h
-qmgr_message.o: ../include/vstream.h
-qmgr_message.o: ../include/split_at.h
-qmgr_message.o: ../include/valid_hostname.h
-qmgr_message.o: ../include/argv.h
-qmgr_message.o: ../include/stringops.h
-qmgr_message.o: ../include/myflock.h
-qmgr_message.o: ../include/dict.h
-qmgr_message.o: ../include/mail_queue.h
-qmgr_message.o: ../include/mail_params.h
-qmgr_message.o: ../include/canon_addr.h
-qmgr_message.o: ../include/record.h
-qmgr_message.o: ../include/rec_type.h
-qmgr_message.o: ../include/sent.h
-qmgr_message.o: ../include/deliver_completed.h
-qmgr_message.o: ../include/mail_addr_find.h
-qmgr_message.o: ../include/maps.h
-qmgr_message.o: ../include/opened.h
-qmgr_message.o: ../include/resolve_local.h
-qmgr_message.o: ../include/resolve_clnt.h
+qmgr_message.o: ../../include/sys_defs.h
+qmgr_message.o: ../../include/msg.h
+qmgr_message.o: ../../include/mymalloc.h
+qmgr_message.o: ../../include/vstring.h
+qmgr_message.o: ../../include/vbuf.h
+qmgr_message.o: ../../include/vstream.h
+qmgr_message.o: ../../include/split_at.h
+qmgr_message.o: ../../include/valid_hostname.h
+qmgr_message.o: ../../include/argv.h
+qmgr_message.o: ../../include/stringops.h
+qmgr_message.o: ../../include/myflock.h
+qmgr_message.o: ../../include/dict.h
+qmgr_message.o: ../../include/mail_queue.h
+qmgr_message.o: ../../include/mail_params.h
+qmgr_message.o: ../../include/canon_addr.h
+qmgr_message.o: ../../include/record.h
+qmgr_message.o: ../../include/rec_type.h
+qmgr_message.o: ../../include/sent.h
+qmgr_message.o: ../../include/deliver_completed.h
+qmgr_message.o: ../../include/mail_addr_find.h
+qmgr_message.o: ../../include/maps.h
+qmgr_message.o: ../../include/opened.h
+qmgr_message.o: ../../include/resolve_local.h
+qmgr_message.o: ../../include/resolve_clnt.h
 qmgr_message.o: qmgr.h
-qmgr_message.o: ../include/scan_dir.h
+qmgr_message.o: ../../include/scan_dir.h
 qmgr_move.o: qmgr_move.c
-qmgr_move.o: ../include/sys_defs.h
-qmgr_move.o: ../include/msg.h
-qmgr_move.o: ../include/scan_dir.h
-qmgr_move.o: ../include/recipient_list.h
-qmgr_move.o: ../include/mail_queue.h
-qmgr_move.o: ../include/vstring.h
-qmgr_move.o: ../include/vbuf.h
-qmgr_move.o: ../include/vstream.h
-qmgr_move.o: ../include/mail_scan_dir.h
+qmgr_move.o: ../../include/sys_defs.h
+qmgr_move.o: ../../include/msg.h
+qmgr_move.o: ../../include/scan_dir.h
+qmgr_move.o: ../../include/recipient_list.h
+qmgr_move.o: ../../include/mail_queue.h
+qmgr_move.o: ../../include/vstring.h
+qmgr_move.o: ../../include/vbuf.h
+qmgr_move.o: ../../include/vstream.h
+qmgr_move.o: ../../include/mail_scan_dir.h
 qmgr_move.o: qmgr.h
-qmgr_move.o: ../include/maps.h
-qmgr_move.o: ../include/dict.h
-qmgr_move.o: ../include/argv.h
+qmgr_move.o: ../../include/maps.h
+qmgr_move.o: ../../include/dict.h
+qmgr_move.o: ../../include/argv.h
 qmgr_queue.o: qmgr_queue.c
-qmgr_queue.o: ../include/sys_defs.h
-qmgr_queue.o: ../include/msg.h
-qmgr_queue.o: ../include/mymalloc.h
-qmgr_queue.o: ../include/events.h
-qmgr_queue.o: ../include/htable.h
-qmgr_queue.o: ../include/mail_params.h
-qmgr_queue.o: ../include/recipient_list.h
+qmgr_queue.o: ../../include/sys_defs.h
+qmgr_queue.o: ../../include/msg.h
+qmgr_queue.o: ../../include/mymalloc.h
+qmgr_queue.o: ../../include/events.h
+qmgr_queue.o: ../../include/htable.h
+qmgr_queue.o: ../../include/mail_params.h
+qmgr_queue.o: ../../include/recipient_list.h
 qmgr_queue.o: qmgr.h
-qmgr_queue.o: ../include/vstream.h
-qmgr_queue.o: ../include/vbuf.h
-qmgr_queue.o: ../include/scan_dir.h
-qmgr_queue.o: ../include/maps.h
-qmgr_queue.o: ../include/dict.h
-qmgr_queue.o: ../include/argv.h
+qmgr_queue.o: ../../include/vstream.h
+qmgr_queue.o: ../../include/vbuf.h
+qmgr_queue.o: ../../include/scan_dir.h
+qmgr_queue.o: ../../include/maps.h
+qmgr_queue.o: ../../include/dict.h
+qmgr_queue.o: ../../include/argv.h
 qmgr_rcpt_list.o: qmgr_rcpt_list.c
-qmgr_rcpt_list.o: ../include/sys_defs.h
-qmgr_rcpt_list.o: ../include/mymalloc.h
+qmgr_rcpt_list.o: ../../include/sys_defs.h
+qmgr_rcpt_list.o: ../../include/mymalloc.h
 qmgr_rcpt_list.o: qmgr.h
-qmgr_rcpt_list.o: ../include/vstream.h
-qmgr_rcpt_list.o: ../include/vbuf.h
-qmgr_rcpt_list.o: ../include/scan_dir.h
-qmgr_rcpt_list.o: ../include/maps.h
-qmgr_rcpt_list.o: ../include/dict.h
-qmgr_rcpt_list.o: ../include/argv.h
+qmgr_rcpt_list.o: ../../include/vstream.h
+qmgr_rcpt_list.o: ../../include/vbuf.h
+qmgr_rcpt_list.o: ../../include/scan_dir.h
+qmgr_rcpt_list.o: ../../include/maps.h
+qmgr_rcpt_list.o: ../../include/dict.h
+qmgr_rcpt_list.o: ../../include/argv.h
 qmgr_scan.o: qmgr_scan.c
-qmgr_scan.o: ../include/sys_defs.h
-qmgr_scan.o: ../include/msg.h
-qmgr_scan.o: ../include/mymalloc.h
-qmgr_scan.o: ../include/scan_dir.h
-qmgr_scan.o: ../include/mail_scan_dir.h
+qmgr_scan.o: ../../include/sys_defs.h
+qmgr_scan.o: ../../include/msg.h
+qmgr_scan.o: ../../include/mymalloc.h
+qmgr_scan.o: ../../include/scan_dir.h
+qmgr_scan.o: ../../include/mail_scan_dir.h
 qmgr_scan.o: qmgr.h
-qmgr_scan.o: ../include/vstream.h
-qmgr_scan.o: ../include/vbuf.h
-qmgr_scan.o: ../include/maps.h
-qmgr_scan.o: ../include/dict.h
-qmgr_scan.o: ../include/argv.h
+qmgr_scan.o: ../../include/vstream.h
+qmgr_scan.o: ../../include/vbuf.h
+qmgr_scan.o: ../../include/maps.h
+qmgr_scan.o: ../../include/dict.h
+qmgr_scan.o: ../../include/argv.h
 qmgr_transport.o: qmgr_transport.c
-qmgr_transport.o: ../include/sys_defs.h
-qmgr_transport.o: ../include/msg.h
-qmgr_transport.o: ../include/htable.h
-qmgr_transport.o: ../include/events.h
-qmgr_transport.o: ../include/mymalloc.h
-qmgr_transport.o: ../include/vstream.h
-qmgr_transport.o: ../include/vbuf.h
-qmgr_transport.o: ../include/iostuff.h
-qmgr_transport.o: ../include/mail_proto.h
-qmgr_transport.o: ../include/recipient_list.h
-qmgr_transport.o: ../include/mail_conf.h
-qmgr_transport.o: ../include/mail_params.h
+qmgr_transport.o: ../../include/sys_defs.h
+qmgr_transport.o: ../../include/msg.h
+qmgr_transport.o: ../../include/htable.h
+qmgr_transport.o: ../../include/events.h
+qmgr_transport.o: ../../include/mymalloc.h
+qmgr_transport.o: ../../include/vstream.h
+qmgr_transport.o: ../../include/vbuf.h
+qmgr_transport.o: ../../include/iostuff.h
+qmgr_transport.o: ../../include/mail_proto.h
+qmgr_transport.o: ../../include/recipient_list.h
+qmgr_transport.o: ../../include/mail_conf.h
+qmgr_transport.o: ../../include/mail_params.h
 qmgr_transport.o: qmgr.h
-qmgr_transport.o: ../include/scan_dir.h
-qmgr_transport.o: ../include/maps.h
-qmgr_transport.o: ../include/dict.h
-qmgr_transport.o: ../include/argv.h
+qmgr_transport.o: ../../include/scan_dir.h
+qmgr_transport.o: ../../include/maps.h
+qmgr_transport.o: ../../include/dict.h
+qmgr_transport.o: ../../include/argv.h
diff --git a/postfix/src/pickup/Makefile.in b/postfix/src/pickup/Makefile.in
index 1f20f1934..0e2120b21 100644
--- a/postfix/src/pickup/Makefile.in
+++ b/postfix/src/pickup/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= pickup
-INC_DIR = ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR = ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,23 +54,23 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 pickup.o: pickup.c
-pickup.o: ../include/sys_defs.h
-pickup.o: ../include/msg.h
-pickup.o: ../include/scan_dir.h
-pickup.o: ../include/vstring.h
-pickup.o: ../include/vbuf.h
-pickup.o: ../include/vstream.h
-pickup.o: ../include/open_as.h
-pickup.o: ../include/set_eugid.h
-pickup.o: ../include/mail_queue.h
-pickup.o: ../include/mail_open_ok.h
-pickup.o: ../include/mymalloc.h
-pickup.o: ../include/mail_proto.h
-pickup.o: ../include/iostuff.h
-pickup.o: ../include/cleanup_user.h
-pickup.o: ../include/mail_date.h
-pickup.o: ../include/mail_params.h
-pickup.o: ../include/mail_conf.h
-pickup.o: ../include/record.h
-pickup.o: ../include/rec_type.h
-pickup.o: ../include/mail_server.h
+pickup.o: ../../include/sys_defs.h
+pickup.o: ../../include/msg.h
+pickup.o: ../../include/scan_dir.h
+pickup.o: ../../include/vstring.h
+pickup.o: ../../include/vbuf.h
+pickup.o: ../../include/vstream.h
+pickup.o: ../../include/open_as.h
+pickup.o: ../../include/set_eugid.h
+pickup.o: ../../include/mail_queue.h
+pickup.o: ../../include/mail_open_ok.h
+pickup.o: ../../include/mymalloc.h
+pickup.o: ../../include/mail_proto.h
+pickup.o: ../../include/iostuff.h
+pickup.o: ../../include/cleanup_user.h
+pickup.o: ../../include/mail_date.h
+pickup.o: ../../include/mail_params.h
+pickup.o: ../../include/mail_conf.h
+pickup.o: ../../include/record.h
+pickup.o: ../../include/rec_type.h
+pickup.o: ../../include/mail_server.h
diff --git a/postfix/src/pipe/Makefile.in b/postfix/src/pipe/Makefile.in
index f6879fa0a..33c636908 100644
--- a/postfix/src/pipe/Makefile.in
+++ b/postfix/src/pipe/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= quote_821_local pipe_unalias
 PROG	= pipe
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,31 +54,31 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 pipe.o: pipe.c
-pipe.o: ../include/sys_defs.h
-pipe.o: ../include/msg.h
-pipe.o: ../include/vstream.h
-pipe.o: ../include/vbuf.h
-pipe.o: ../include/vstring.h
-pipe.o: ../include/argv.h
-pipe.o: ../include/htable.h
-pipe.o: ../include/dict.h
-pipe.o: ../include/iostuff.h
-pipe.o: ../include/mymalloc.h
-pipe.o: ../include/mac_parse.h
-pipe.o: ../include/set_eugid.h
-pipe.o: ../include/split_at.h
-pipe.o: ../include/stringops.h
-pipe.o: ../include/recipient_list.h
-pipe.o: ../include/deliver_request.h
-pipe.o: ../include/mail_params.h
-pipe.o: ../include/mail_conf.h
-pipe.o: ../include/bounce.h
-pipe.o: ../include/defer.h
-pipe.o: ../include/deliver_completed.h
-pipe.o: ../include/sent.h
-pipe.o: ../include/pipe_command.h
-pipe.o: ../include/mail_copy.h
-pipe.o: ../include/mail_addr.h
-pipe.o: ../include/canon_addr.h
-pipe.o: ../include/split_addr.h
-pipe.o: ../include/mail_server.h
+pipe.o: ../../include/sys_defs.h
+pipe.o: ../../include/msg.h
+pipe.o: ../../include/vstream.h
+pipe.o: ../../include/vbuf.h
+pipe.o: ../../include/vstring.h
+pipe.o: ../../include/argv.h
+pipe.o: ../../include/htable.h
+pipe.o: ../../include/dict.h
+pipe.o: ../../include/iostuff.h
+pipe.o: ../../include/mymalloc.h
+pipe.o: ../../include/mac_parse.h
+pipe.o: ../../include/set_eugid.h
+pipe.o: ../../include/split_at.h
+pipe.o: ../../include/stringops.h
+pipe.o: ../../include/recipient_list.h
+pipe.o: ../../include/deliver_request.h
+pipe.o: ../../include/mail_params.h
+pipe.o: ../../include/mail_conf.h
+pipe.o: ../../include/bounce.h
+pipe.o: ../../include/defer.h
+pipe.o: ../../include/deliver_completed.h
+pipe.o: ../../include/sent.h
+pipe.o: ../../include/pipe_command.h
+pipe.o: ../../include/mail_copy.h
+pipe.o: ../../include/mail_addr.h
+pipe.o: ../../include/canon_addr.h
+pipe.o: ../../include/split_addr.h
+pipe.o: ../../include/mail_server.h
diff --git a/postfix/src/postalias/Makefile.in b/postfix/src/postalias/Makefile.in
index 1ffd12352..ad616647c 100644
--- a/postfix/src/postalias/Makefile.in
+++ b/postfix/src/postalias/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= postalias
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,21 +54,21 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postalias.o: postalias.c
-postalias.o: ../include/sys_defs.h
-postalias.o: ../include/msg.h
-postalias.o: ../include/mymalloc.h
-postalias.o: ../include/vstring.h
-postalias.o: ../include/vbuf.h
-postalias.o: ../include/vstream.h
-postalias.o: ../include/msg_vstream.h
-postalias.o: ../include/readlline.h
-postalias.o: ../include/stringops.h
-postalias.o: ../include/split_at.h
-postalias.o: ../include/get_hostname.h
-postalias.o: ../include/tok822.h
-postalias.o: ../include/resolve_clnt.h
-postalias.o: ../include/mail_conf.h
-postalias.o: ../include/mail_params.h
-postalias.o: ../include/mkmap.h
-postalias.o: ../include/dict.h
-postalias.o: ../include/argv.h
+postalias.o: ../../include/sys_defs.h
+postalias.o: ../../include/msg.h
+postalias.o: ../../include/mymalloc.h
+postalias.o: ../../include/vstring.h
+postalias.o: ../../include/vbuf.h
+postalias.o: ../../include/vstream.h
+postalias.o: ../../include/msg_vstream.h
+postalias.o: ../../include/readlline.h
+postalias.o: ../../include/stringops.h
+postalias.o: ../../include/split_at.h
+postalias.o: ../../include/get_hostname.h
+postalias.o: ../../include/tok822.h
+postalias.o: ../../include/resolve_clnt.h
+postalias.o: ../../include/mail_conf.h
+postalias.o: ../../include/mail_params.h
+postalias.o: ../../include/mkmap.h
+postalias.o: ../../include/dict.h
+postalias.o: ../../include/argv.h
diff --git a/postfix/src/postcat/Makefile.in b/postfix/src/postcat/Makefile.in
index 09a495884..5cdac2d99 100644
--- a/postfix/src/postcat/Makefile.in
+++ b/postfix/src/postcat/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= postcat
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,12 +54,12 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postcat.o: postcat.c
-postcat.o: ../include/sys_defs.h
-postcat.o: ../include/msg.h
-postcat.o: ../include/vstream.h
-postcat.o: ../include/vbuf.h
-postcat.o: ../include/vstring.h
-postcat.o: ../include/msg_vstream.h
-postcat.o: ../include/vstring_vstream.h
-postcat.o: ../include/record.h
-postcat.o: ../include/rec_type.h
+postcat.o: ../../include/sys_defs.h
+postcat.o: ../../include/msg.h
+postcat.o: ../../include/vstream.h
+postcat.o: ../../include/vbuf.h
+postcat.o: ../../include/vstring.h
+postcat.o: ../../include/msg_vstream.h
+postcat.o: ../../include/vstring_vstream.h
+postcat.o: ../../include/record.h
+postcat.o: ../../include/rec_type.h
diff --git a/postfix/src/postconf/Makefile.in b/postfix/src/postconf/Makefile.in
index 28514a342..1235c7ebb 100644
--- a/postfix/src/postconf/Makefile.in
+++ b/postfix/src/postconf/Makefile.in
@@ -12,28 +12,28 @@ TESTPROG=
 MAKES	= bool_table.h bool_vars.h int_table.h int_vars.h str_table.h \
 	str_vars.h
 PROG	= postconf
-SAMPLES	= ../conf/main.cf.default
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+SAMPLES	= ../../conf/main.cf.default
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
-../conf/main.cf.default: $(PROG) Makefile
+../../conf/main.cf.default: $(PROG) Makefile
 	rm -f $@
 	./$(PROG) -d |egrep -v '^(myhostname|mydomain|mynetworks) ' >$@
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG) $(SAMPLES)
+update: ../../bin/$(PROG) $(SAMPLES)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 $(MAKES): $(INC_DIR)/mail_params.h
 	$(AWK) -f extract.awk ../*/*.c
@@ -44,7 +44,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -65,29 +65,29 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postconf.o: postconf.c
-postconf.o: ../include/sys_defs.h
-postconf.o: ../include/msg.h
-postconf.o: ../include/vstream.h
-postconf.o: ../include/vbuf.h
-postconf.o: ../include/msg_vstream.h
-postconf.o: ../include/get_hostname.h
-postconf.o: ../include/stringops.h
-postconf.o: ../include/vstring.h
-postconf.o: ../include/htable.h
-postconf.o: ../include/dict.h
-postconf.o: ../include/argv.h
-postconf.o: ../include/safe.h
-postconf.o: ../include/mymalloc.h
-postconf.o: ../include/split_at.h
-postconf.o: ../include/readlline.h
-postconf.o: ../include/myflock.h
-postconf.o: ../include/mynetworks.h
-postconf.o: ../include/mail_conf.h
-postconf.o: ../include/mail_proto.h
-postconf.o: ../include/iostuff.h
-postconf.o: ../include/mail_version.h
-postconf.o: ../include/mail_params.h
-postconf.o: ../include/mail_addr.h
+postconf.o: ../../include/sys_defs.h
+postconf.o: ../../include/msg.h
+postconf.o: ../../include/vstream.h
+postconf.o: ../../include/vbuf.h
+postconf.o: ../../include/msg_vstream.h
+postconf.o: ../../include/get_hostname.h
+postconf.o: ../../include/stringops.h
+postconf.o: ../../include/vstring.h
+postconf.o: ../../include/htable.h
+postconf.o: ../../include/dict.h
+postconf.o: ../../include/argv.h
+postconf.o: ../../include/safe.h
+postconf.o: ../../include/mymalloc.h
+postconf.o: ../../include/split_at.h
+postconf.o: ../../include/readlline.h
+postconf.o: ../../include/myflock.h
+postconf.o: ../../include/mynetworks.h
+postconf.o: ../../include/mail_conf.h
+postconf.o: ../../include/mail_proto.h
+postconf.o: ../../include/iostuff.h
+postconf.o: ../../include/mail_version.h
+postconf.o: ../../include/mail_params.h
+postconf.o: ../../include/mail_addr.h
 postconf.o: bool_vars.h
 postconf.o: int_vars.h
 postconf.o: str_vars.h
diff --git a/postfix/src/postdrop/Makefile.in b/postfix/src/postdrop/Makefile.in
index 8f24b00c0..4cb115291 100644
--- a/postfix/src/postdrop/Makefile.in
+++ b/postfix/src/postdrop/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG=
 PROG	= postdrop
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,22 +54,22 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postdrop.o: postdrop.c
-postdrop.o: ../include/sys_defs.h
-postdrop.o: ../include/msg.h
-postdrop.o: ../include/mymalloc.h
-postdrop.o: ../include/vstream.h
-postdrop.o: ../include/vbuf.h
-postdrop.o: ../include/vstring.h
-postdrop.o: ../include/msg_vstream.h
-postdrop.o: ../include/msg_syslog.h
-postdrop.o: ../include/mail_proto.h
-postdrop.o: ../include/iostuff.h
-postdrop.o: ../include/mail_queue.h
-postdrop.o: ../include/mail_params.h
-postdrop.o: ../include/mail_conf.h
-postdrop.o: ../include/mail_task.h
-postdrop.o: ../include/clean_env.h
-postdrop.o: ../include/mail_stream.h
-postdrop.o: ../include/cleanup_user.h
-postdrop.o: ../include/record.h
-postdrop.o: ../include/rec_type.h
+postdrop.o: ../../include/sys_defs.h
+postdrop.o: ../../include/msg.h
+postdrop.o: ../../include/mymalloc.h
+postdrop.o: ../../include/vstream.h
+postdrop.o: ../../include/vbuf.h
+postdrop.o: ../../include/vstring.h
+postdrop.o: ../../include/msg_vstream.h
+postdrop.o: ../../include/msg_syslog.h
+postdrop.o: ../../include/mail_proto.h
+postdrop.o: ../../include/iostuff.h
+postdrop.o: ../../include/mail_queue.h
+postdrop.o: ../../include/mail_params.h
+postdrop.o: ../../include/mail_conf.h
+postdrop.o: ../../include/mail_task.h
+postdrop.o: ../../include/clean_env.h
+postdrop.o: ../../include/mail_stream.h
+postdrop.o: ../../include/cleanup_user.h
+postdrop.o: ../../include/record.h
+postdrop.o: ../../include/rec_type.h
diff --git a/postfix/src/postfix/Makefile.in b/postfix/src/postfix/Makefile.in
index 4a0a9933e..d2e90caa2 100644
--- a/postfix/src/postfix/Makefile.in
+++ b/postfix/src/postfix/Makefile.in
@@ -9,10 +9,10 @@ WARN	= -W -Wformat -Wimplicit -Wmissing-prototypes \
 DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 FILES	= Makefile $(SRCS) $(HDRS)
-INC_DIR	= ../include
+INC_DIR	= ../../include
 TESTPROG=
 PROG	= postfix
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -20,21 +20,21 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 shar:
 	@shar $(FILES)
@@ -58,13 +58,13 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postfix.o: postfix.c
-postfix.o: ../include/sys_defs.h
-postfix.o: ../include/vstream.h
-postfix.o: ../include/vbuf.h
-postfix.o: ../include/msg.h
-postfix.o: ../include/msg_vstream.h
-postfix.o: ../include/msg_syslog.h
-postfix.o: ../include/stringops.h
-postfix.o: ../include/vstring.h
-postfix.o: ../include/mail_conf.h
-postfix.o: ../include/mail_params.h
+postfix.o: ../../include/sys_defs.h
+postfix.o: ../../include/vstream.h
+postfix.o: ../../include/vbuf.h
+postfix.o: ../../include/msg.h
+postfix.o: ../../include/msg_vstream.h
+postfix.o: ../../include/msg_syslog.h
+postfix.o: ../../include/stringops.h
+postfix.o: ../../include/vstring.h
+postfix.o: ../../include/mail_conf.h
+postfix.o: ../../include/mail_params.h
diff --git a/postfix/src/postkick/Makefile.in b/postfix/src/postkick/Makefile.in
index c846ca697..3f037226c 100644
--- a/postfix/src/postkick/Makefile.in
+++ b/postfix/src/postkick/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG=
 PROG	= postkick
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,14 +54,14 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postkick.o: postkick.c
-postkick.o: ../include/sys_defs.h
-postkick.o: ../include/msg.h
-postkick.o: ../include/mymalloc.h
-postkick.o: ../include/vstream.h
-postkick.o: ../include/vbuf.h
-postkick.o: ../include/msg_vstream.h
-postkick.o: ../include/safe.h
-postkick.o: ../include/mail_proto.h
-postkick.o: ../include/iostuff.h
-postkick.o: ../include/mail_params.h
-postkick.o: ../include/mail_conf.h
+postkick.o: ../../include/sys_defs.h
+postkick.o: ../../include/msg.h
+postkick.o: ../../include/mymalloc.h
+postkick.o: ../../include/vstream.h
+postkick.o: ../../include/vbuf.h
+postkick.o: ../../include/msg_vstream.h
+postkick.o: ../../include/safe.h
+postkick.o: ../../include/mail_proto.h
+postkick.o: ../../include/iostuff.h
+postkick.o: ../../include/mail_params.h
+postkick.o: ../../include/mail_conf.h
diff --git a/postfix/src/postlock/Makefile.in b/postfix/src/postlock/Makefile.in
index 0d194091b..0ef73a595 100644
--- a/postfix/src/postlock/Makefile.in
+++ b/postfix/src/postlock/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG=
 PROG	= postlock
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,15 +54,15 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postlock.o: postlock.c
-postlock.o: ../include/sys_defs.h
-postlock.o: ../include/msg.h
-postlock.o: ../include/vstring.h
-postlock.o: ../include/vbuf.h
-postlock.o: ../include/vstream.h
-postlock.o: ../include/msg_vstream.h
-postlock.o: ../include/iostuff.h
-postlock.o: ../include/mail_params.h
-postlock.o: ../include/dot_lockfile.h
-postlock.o: ../include/deliver_flock.h
-postlock.o: ../include/mail_conf.h
-postlock.o: ../include/sys_exits.h
+postlock.o: ../../include/sys_defs.h
+postlock.o: ../../include/msg.h
+postlock.o: ../../include/vstring.h
+postlock.o: ../../include/vbuf.h
+postlock.o: ../../include/vstream.h
+postlock.o: ../../include/msg_vstream.h
+postlock.o: ../../include/iostuff.h
+postlock.o: ../../include/mail_params.h
+postlock.o: ../../include/dot_lockfile.h
+postlock.o: ../../include/deliver_flock.h
+postlock.o: ../../include/mail_conf.h
+postlock.o: ../../include/sys_exits.h
diff --git a/postfix/src/postlog/Makefile.in b/postfix/src/postlog/Makefile.in
index e3f00e469..6ce0539fd 100644
--- a/postfix/src/postlog/Makefile.in
+++ b/postfix/src/postlog/Makefile.in
@@ -9,10 +9,10 @@ WARN	= -W -Wformat -Wimplicit -Wmissing-prototypes \
 DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 FILES	= Makefile $(SRCS) $(HDRS)
-INC_DIR	= ../include
+INC_DIR	= ../../include
 TESTPROG=
 PROG	= postlog
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -20,21 +20,21 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 shar:
 	@shar $(FILES)
@@ -58,13 +58,13 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postlog.o: postlog.c
-postlog.o: ../include/sys_defs.h
-postlog.o: ../include/msg.h
-postlog.o: ../include/vstring.h
-postlog.o: ../include/vbuf.h
-postlog.o: ../include/vstream.h
-postlog.o: ../include/vstring_vstream.h
-postlog.o: ../include/msg_output.h
-postlog.o: ../include/msg_vstream.h
-postlog.o: ../include/msg_syslog.h
-postlog.o: ../include/mail_params.h
+postlog.o: ../../include/sys_defs.h
+postlog.o: ../../include/msg.h
+postlog.o: ../../include/vstring.h
+postlog.o: ../../include/vbuf.h
+postlog.o: ../../include/vstream.h
+postlog.o: ../../include/vstring_vstream.h
+postlog.o: ../../include/msg_output.h
+postlog.o: ../../include/msg_vstream.h
+postlog.o: ../../include/msg_syslog.h
+postlog.o: ../../include/mail_params.h
diff --git a/postfix/src/postmap/Makefile.in b/postfix/src/postmap/Makefile.in
index db3a6bd5f..fe6ba1bba 100644
--- a/postfix/src/postmap/Makefile.in
+++ b/postfix/src/postmap/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= postmap
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,18 +54,18 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postmap.o: postmap.c
-postmap.o: ../include/sys_defs.h
-postmap.o: ../include/msg.h
-postmap.o: ../include/mymalloc.h
-postmap.o: ../include/vstring.h
-postmap.o: ../include/vbuf.h
-postmap.o: ../include/vstream.h
-postmap.o: ../include/msg_vstream.h
-postmap.o: ../include/readlline.h
-postmap.o: ../include/stringops.h
-postmap.o: ../include/split_at.h
-postmap.o: ../include/mail_conf.h
-postmap.o: ../include/mail_params.h
-postmap.o: ../include/mkmap.h
-postmap.o: ../include/dict.h
-postmap.o: ../include/argv.h
+postmap.o: ../../include/sys_defs.h
+postmap.o: ../../include/msg.h
+postmap.o: ../../include/mymalloc.h
+postmap.o: ../../include/vstring.h
+postmap.o: ../../include/vbuf.h
+postmap.o: ../../include/vstream.h
+postmap.o: ../../include/msg_vstream.h
+postmap.o: ../../include/readlline.h
+postmap.o: ../../include/stringops.h
+postmap.o: ../../include/split_at.h
+postmap.o: ../../include/mail_conf.h
+postmap.o: ../../include/mail_params.h
+postmap.o: ../../include/mkmap.h
+postmap.o: ../../include/dict.h
+postmap.o: ../../include/argv.h
diff --git a/postfix/src/postsuper/Makefile.in b/postfix/src/postsuper/Makefile.in
index b5caf22cb..c2f4dca68 100644
--- a/postfix/src/postsuper/Makefile.in
+++ b/postfix/src/postsuper/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= postsuper
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,19 +54,19 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 postsuper.o: postsuper.c
-postsuper.o: ../include/sys_defs.h
-postsuper.o: ../include/mymalloc.h
-postsuper.o: ../include/msg.h
-postsuper.o: ../include/msg_syslog.h
-postsuper.o: ../include/vstream.h
-postsuper.o: ../include/vbuf.h
-postsuper.o: ../include/msg_vstream.h
-postsuper.o: ../include/scan_dir.h
-postsuper.o: ../include/vstring.h
-postsuper.o: ../include/safe.h
-postsuper.o: ../include/set_ugid.h
-postsuper.o: ../include/argv.h
-postsuper.o: ../include/mail_task.h
-postsuper.o: ../include/mail_conf.h
-postsuper.o: ../include/mail_params.h
-postsuper.o: ../include/mail_queue.h
+postsuper.o: ../../include/sys_defs.h
+postsuper.o: ../../include/mymalloc.h
+postsuper.o: ../../include/msg.h
+postsuper.o: ../../include/msg_syslog.h
+postsuper.o: ../../include/vstream.h
+postsuper.o: ../../include/vbuf.h
+postsuper.o: ../../include/msg_vstream.h
+postsuper.o: ../../include/scan_dir.h
+postsuper.o: ../../include/vstring.h
+postsuper.o: ../../include/safe.h
+postsuper.o: ../../include/set_ugid.h
+postsuper.o: ../../include/argv.h
+postsuper.o: ../../include/mail_task.h
+postsuper.o: ../../include/mail_conf.h
+postsuper.o: ../../include/mail_params.h
+postsuper.o: ../../include/mail_queue.h
diff --git a/postfix/src/qmgr/Makefile.in b/postfix/src/qmgr/Makefile.in
index a078dcaee..ad3320b48 100644
--- a/postfix/src/qmgr/Makefile.in
+++ b/postfix/src/qmgr/Makefile.in
@@ -14,8 +14,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= qmgr
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -23,14 +23,14 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
@@ -38,7 +38,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -59,203 +59,203 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 qmgr.o: qmgr.c
-qmgr.o: ../include/sys_defs.h
-qmgr.o: ../include/msg.h
-qmgr.o: ../include/events.h
-qmgr.o: ../include/vstream.h
-qmgr.o: ../include/vbuf.h
-qmgr.o: ../include/dict.h
-qmgr.o: ../include/argv.h
-qmgr.o: ../include/mail_queue.h
-qmgr.o: ../include/vstring.h
-qmgr.o: ../include/recipient_list.h
-qmgr.o: ../include/mail_conf.h
-qmgr.o: ../include/mail_params.h
-qmgr.o: ../include/mail_proto.h
-qmgr.o: ../include/iostuff.h
-qmgr.o: ../include/master_proto.h
-qmgr.o: ../include/mail_server.h
+qmgr.o: ../../include/sys_defs.h
+qmgr.o: ../../include/msg.h
+qmgr.o: ../../include/events.h
+qmgr.o: ../../include/vstream.h
+qmgr.o: ../../include/vbuf.h
+qmgr.o: ../../include/dict.h
+qmgr.o: ../../include/argv.h
+qmgr.o: ../../include/mail_queue.h
+qmgr.o: ../../include/vstring.h
+qmgr.o: ../../include/recipient_list.h
+qmgr.o: ../../include/mail_conf.h
+qmgr.o: ../../include/mail_params.h
+qmgr.o: ../../include/mail_proto.h
+qmgr.o: ../../include/iostuff.h
+qmgr.o: ../../include/master_proto.h
+qmgr.o: ../../include/mail_server.h
 qmgr.o: qmgr.h
-qmgr.o: ../include/scan_dir.h
-qmgr.o: ../include/maps.h
+qmgr.o: ../../include/scan_dir.h
+qmgr.o: ../../include/maps.h
 qmgr_active.o: qmgr_active.c
-qmgr_active.o: ../include/sys_defs.h
-qmgr_active.o: ../include/msg.h
-qmgr_active.o: ../include/events.h
-qmgr_active.o: ../include/mymalloc.h
-qmgr_active.o: ../include/vstream.h
-qmgr_active.o: ../include/vbuf.h
-qmgr_active.o: ../include/mail_params.h
-qmgr_active.o: ../include/mail_open_ok.h
-qmgr_active.o: ../include/mail_queue.h
-qmgr_active.o: ../include/vstring.h
-qmgr_active.o: ../include/recipient_list.h
-qmgr_active.o: ../include/bounce.h
-qmgr_active.o: ../include/defer.h
-qmgr_active.o: ../include/rec_type.h
+qmgr_active.o: ../../include/sys_defs.h
+qmgr_active.o: ../../include/msg.h
+qmgr_active.o: ../../include/events.h
+qmgr_active.o: ../../include/mymalloc.h
+qmgr_active.o: ../../include/vstream.h
+qmgr_active.o: ../../include/vbuf.h
+qmgr_active.o: ../../include/mail_params.h
+qmgr_active.o: ../../include/mail_open_ok.h
+qmgr_active.o: ../../include/mail_queue.h
+qmgr_active.o: ../../include/vstring.h
+qmgr_active.o: ../../include/recipient_list.h
+qmgr_active.o: ../../include/bounce.h
+qmgr_active.o: ../../include/defer.h
+qmgr_active.o: ../../include/rec_type.h
 qmgr_active.o: qmgr.h
-qmgr_active.o: ../include/scan_dir.h
-qmgr_active.o: ../include/maps.h
-qmgr_active.o: ../include/dict.h
-qmgr_active.o: ../include/argv.h
+qmgr_active.o: ../../include/scan_dir.h
+qmgr_active.o: ../../include/maps.h
+qmgr_active.o: ../../include/dict.h
+qmgr_active.o: ../../include/argv.h
 qmgr_bounce.o: qmgr_bounce.c
-qmgr_bounce.o: ../include/sys_defs.h
-qmgr_bounce.o: ../include/bounce.h
-qmgr_bounce.o: ../include/deliver_completed.h
-qmgr_bounce.o: ../include/vstream.h
-qmgr_bounce.o: ../include/vbuf.h
+qmgr_bounce.o: ../../include/sys_defs.h
+qmgr_bounce.o: ../../include/bounce.h
+qmgr_bounce.o: ../../include/deliver_completed.h
+qmgr_bounce.o: ../../include/vstream.h
+qmgr_bounce.o: ../../include/vbuf.h
 qmgr_bounce.o: qmgr.h
-qmgr_bounce.o: ../include/scan_dir.h
-qmgr_bounce.o: ../include/maps.h
-qmgr_bounce.o: ../include/dict.h
-qmgr_bounce.o: ../include/argv.h
+qmgr_bounce.o: ../../include/scan_dir.h
+qmgr_bounce.o: ../../include/maps.h
+qmgr_bounce.o: ../../include/dict.h
+qmgr_bounce.o: ../../include/argv.h
 qmgr_defer.o: qmgr_defer.c
-qmgr_defer.o: ../include/sys_defs.h
-qmgr_defer.o: ../include/msg.h
-qmgr_defer.o: ../include/vstream.h
-qmgr_defer.o: ../include/vbuf.h
-qmgr_defer.o: ../include/defer.h
-qmgr_defer.o: ../include/bounce.h
+qmgr_defer.o: ../../include/sys_defs.h
+qmgr_defer.o: ../../include/msg.h
+qmgr_defer.o: ../../include/vstream.h
+qmgr_defer.o: ../../include/vbuf.h
+qmgr_defer.o: ../../include/defer.h
+qmgr_defer.o: ../../include/bounce.h
 qmgr_defer.o: qmgr.h
-qmgr_defer.o: ../include/scan_dir.h
-qmgr_defer.o: ../include/maps.h
-qmgr_defer.o: ../include/dict.h
-qmgr_defer.o: ../include/argv.h
+qmgr_defer.o: ../../include/scan_dir.h
+qmgr_defer.o: ../../include/maps.h
+qmgr_defer.o: ../../include/dict.h
+qmgr_defer.o: ../../include/argv.h
 qmgr_deliver.o: qmgr_deliver.c
-qmgr_deliver.o: ../include/sys_defs.h
-qmgr_deliver.o: ../include/msg.h
-qmgr_deliver.o: ../include/vstring.h
-qmgr_deliver.o: ../include/vbuf.h
-qmgr_deliver.o: ../include/vstream.h
-qmgr_deliver.o: ../include/vstring_vstream.h
-qmgr_deliver.o: ../include/events.h
-qmgr_deliver.o: ../include/iostuff.h
-qmgr_deliver.o: ../include/mail_queue.h
-qmgr_deliver.o: ../include/mail_proto.h
-qmgr_deliver.o: ../include/recipient_list.h
-qmgr_deliver.o: ../include/mail_params.h
-qmgr_deliver.o: ../include/deliver_request.h
+qmgr_deliver.o: ../../include/sys_defs.h
+qmgr_deliver.o: ../../include/msg.h
+qmgr_deliver.o: ../../include/vstring.h
+qmgr_deliver.o: ../../include/vbuf.h
+qmgr_deliver.o: ../../include/vstream.h
+qmgr_deliver.o: ../../include/vstring_vstream.h
+qmgr_deliver.o: ../../include/events.h
+qmgr_deliver.o: ../../include/iostuff.h
+qmgr_deliver.o: ../../include/mail_queue.h
+qmgr_deliver.o: ../../include/mail_proto.h
+qmgr_deliver.o: ../../include/recipient_list.h
+qmgr_deliver.o: ../../include/mail_params.h
+qmgr_deliver.o: ../../include/deliver_request.h
 qmgr_deliver.o: qmgr.h
-qmgr_deliver.o: ../include/scan_dir.h
-qmgr_deliver.o: ../include/maps.h
-qmgr_deliver.o: ../include/dict.h
-qmgr_deliver.o: ../include/argv.h
+qmgr_deliver.o: ../../include/scan_dir.h
+qmgr_deliver.o: ../../include/maps.h
+qmgr_deliver.o: ../../include/dict.h
+qmgr_deliver.o: ../../include/argv.h
 qmgr_enable.o: qmgr_enable.c
-qmgr_enable.o: ../include/sys_defs.h
-qmgr_enable.o: ../include/msg.h
-qmgr_enable.o: ../include/vstream.h
-qmgr_enable.o: ../include/vbuf.h
+qmgr_enable.o: ../../include/sys_defs.h
+qmgr_enable.o: ../../include/msg.h
+qmgr_enable.o: ../../include/vstream.h
+qmgr_enable.o: ../../include/vbuf.h
 qmgr_enable.o: qmgr.h
-qmgr_enable.o: ../include/scan_dir.h
-qmgr_enable.o: ../include/maps.h
-qmgr_enable.o: ../include/dict.h
-qmgr_enable.o: ../include/argv.h
+qmgr_enable.o: ../../include/scan_dir.h
+qmgr_enable.o: ../../include/maps.h
+qmgr_enable.o: ../../include/dict.h
+qmgr_enable.o: ../../include/argv.h
 qmgr_entry.o: qmgr_entry.c
-qmgr_entry.o: ../include/sys_defs.h
-qmgr_entry.o: ../include/msg.h
-qmgr_entry.o: ../include/mymalloc.h
-qmgr_entry.o: ../include/events.h
-qmgr_entry.o: ../include/vstream.h
-qmgr_entry.o: ../include/vbuf.h
-qmgr_entry.o: ../include/mail_params.h
+qmgr_entry.o: ../../include/sys_defs.h
+qmgr_entry.o: ../../include/msg.h
+qmgr_entry.o: ../../include/mymalloc.h
+qmgr_entry.o: ../../include/events.h
+qmgr_entry.o: ../../include/vstream.h
+qmgr_entry.o: ../../include/vbuf.h
+qmgr_entry.o: ../../include/mail_params.h
 qmgr_entry.o: qmgr.h
-qmgr_entry.o: ../include/scan_dir.h
-qmgr_entry.o: ../include/maps.h
-qmgr_entry.o: ../include/dict.h
-qmgr_entry.o: ../include/argv.h
+qmgr_entry.o: ../../include/scan_dir.h
+qmgr_entry.o: ../../include/maps.h
+qmgr_entry.o: ../../include/dict.h
+qmgr_entry.o: ../../include/argv.h
 qmgr_message.o: qmgr_message.c
-qmgr_message.o: ../include/sys_defs.h
-qmgr_message.o: ../include/msg.h
-qmgr_message.o: ../include/mymalloc.h
-qmgr_message.o: ../include/vstring.h
-qmgr_message.o: ../include/vbuf.h
-qmgr_message.o: ../include/vstream.h
-qmgr_message.o: ../include/split_at.h
-qmgr_message.o: ../include/valid_hostname.h
-qmgr_message.o: ../include/argv.h
-qmgr_message.o: ../include/stringops.h
-qmgr_message.o: ../include/myflock.h
-qmgr_message.o: ../include/dict.h
-qmgr_message.o: ../include/mail_queue.h
-qmgr_message.o: ../include/mail_params.h
-qmgr_message.o: ../include/canon_addr.h
-qmgr_message.o: ../include/record.h
-qmgr_message.o: ../include/rec_type.h
-qmgr_message.o: ../include/sent.h
-qmgr_message.o: ../include/deliver_completed.h
-qmgr_message.o: ../include/mail_addr_find.h
-qmgr_message.o: ../include/maps.h
-qmgr_message.o: ../include/opened.h
-qmgr_message.o: ../include/resolve_local.h
-qmgr_message.o: ../include/resolve_clnt.h
+qmgr_message.o: ../../include/sys_defs.h
+qmgr_message.o: ../../include/msg.h
+qmgr_message.o: ../../include/mymalloc.h
+qmgr_message.o: ../../include/vstring.h
+qmgr_message.o: ../../include/vbuf.h
+qmgr_message.o: ../../include/vstream.h
+qmgr_message.o: ../../include/split_at.h
+qmgr_message.o: ../../include/valid_hostname.h
+qmgr_message.o: ../../include/argv.h
+qmgr_message.o: ../../include/stringops.h
+qmgr_message.o: ../../include/myflock.h
+qmgr_message.o: ../../include/dict.h
+qmgr_message.o: ../../include/mail_queue.h
+qmgr_message.o: ../../include/mail_params.h
+qmgr_message.o: ../../include/canon_addr.h
+qmgr_message.o: ../../include/record.h
+qmgr_message.o: ../../include/rec_type.h
+qmgr_message.o: ../../include/sent.h
+qmgr_message.o: ../../include/deliver_completed.h
+qmgr_message.o: ../../include/mail_addr_find.h
+qmgr_message.o: ../../include/maps.h
+qmgr_message.o: ../../include/opened.h
+qmgr_message.o: ../../include/resolve_local.h
+qmgr_message.o: ../../include/resolve_clnt.h
 qmgr_message.o: qmgr.h
-qmgr_message.o: ../include/scan_dir.h
+qmgr_message.o: ../../include/scan_dir.h
 qmgr_move.o: qmgr_move.c
-qmgr_move.o: ../include/sys_defs.h
-qmgr_move.o: ../include/msg.h
-qmgr_move.o: ../include/scan_dir.h
-qmgr_move.o: ../include/recipient_list.h
-qmgr_move.o: ../include/mail_queue.h
-qmgr_move.o: ../include/vstring.h
-qmgr_move.o: ../include/vbuf.h
-qmgr_move.o: ../include/vstream.h
-qmgr_move.o: ../include/mail_scan_dir.h
+qmgr_move.o: ../../include/sys_defs.h
+qmgr_move.o: ../../include/msg.h
+qmgr_move.o: ../../include/scan_dir.h
+qmgr_move.o: ../../include/recipient_list.h
+qmgr_move.o: ../../include/mail_queue.h
+qmgr_move.o: ../../include/vstring.h
+qmgr_move.o: ../../include/vbuf.h
+qmgr_move.o: ../../include/vstream.h
+qmgr_move.o: ../../include/mail_scan_dir.h
 qmgr_move.o: qmgr.h
-qmgr_move.o: ../include/maps.h
-qmgr_move.o: ../include/dict.h
-qmgr_move.o: ../include/argv.h
+qmgr_move.o: ../../include/maps.h
+qmgr_move.o: ../../include/dict.h
+qmgr_move.o: ../../include/argv.h
 qmgr_queue.o: qmgr_queue.c
-qmgr_queue.o: ../include/sys_defs.h
-qmgr_queue.o: ../include/msg.h
-qmgr_queue.o: ../include/mymalloc.h
-qmgr_queue.o: ../include/events.h
-qmgr_queue.o: ../include/htable.h
-qmgr_queue.o: ../include/mail_params.h
-qmgr_queue.o: ../include/recipient_list.h
+qmgr_queue.o: ../../include/sys_defs.h
+qmgr_queue.o: ../../include/msg.h
+qmgr_queue.o: ../../include/mymalloc.h
+qmgr_queue.o: ../../include/events.h
+qmgr_queue.o: ../../include/htable.h
+qmgr_queue.o: ../../include/mail_params.h
+qmgr_queue.o: ../../include/recipient_list.h
 qmgr_queue.o: qmgr.h
-qmgr_queue.o: ../include/vstream.h
-qmgr_queue.o: ../include/vbuf.h
-qmgr_queue.o: ../include/scan_dir.h
-qmgr_queue.o: ../include/maps.h
-qmgr_queue.o: ../include/dict.h
-qmgr_queue.o: ../include/argv.h
+qmgr_queue.o: ../../include/vstream.h
+qmgr_queue.o: ../../include/vbuf.h
+qmgr_queue.o: ../../include/scan_dir.h
+qmgr_queue.o: ../../include/maps.h
+qmgr_queue.o: ../../include/dict.h
+qmgr_queue.o: ../../include/argv.h
 qmgr_rcpt_list.o: qmgr_rcpt_list.c
-qmgr_rcpt_list.o: ../include/sys_defs.h
-qmgr_rcpt_list.o: ../include/mymalloc.h
+qmgr_rcpt_list.o: ../../include/sys_defs.h
+qmgr_rcpt_list.o: ../../include/mymalloc.h
 qmgr_rcpt_list.o: qmgr.h
-qmgr_rcpt_list.o: ../include/vstream.h
-qmgr_rcpt_list.o: ../include/vbuf.h
-qmgr_rcpt_list.o: ../include/scan_dir.h
-qmgr_rcpt_list.o: ../include/maps.h
-qmgr_rcpt_list.o: ../include/dict.h
-qmgr_rcpt_list.o: ../include/argv.h
+qmgr_rcpt_list.o: ../../include/vstream.h
+qmgr_rcpt_list.o: ../../include/vbuf.h
+qmgr_rcpt_list.o: ../../include/scan_dir.h
+qmgr_rcpt_list.o: ../../include/maps.h
+qmgr_rcpt_list.o: ../../include/dict.h
+qmgr_rcpt_list.o: ../../include/argv.h
 qmgr_scan.o: qmgr_scan.c
-qmgr_scan.o: ../include/sys_defs.h
-qmgr_scan.o: ../include/msg.h
-qmgr_scan.o: ../include/mymalloc.h
-qmgr_scan.o: ../include/scan_dir.h
-qmgr_scan.o: ../include/mail_scan_dir.h
+qmgr_scan.o: ../../include/sys_defs.h
+qmgr_scan.o: ../../include/msg.h
+qmgr_scan.o: ../../include/mymalloc.h
+qmgr_scan.o: ../../include/scan_dir.h
+qmgr_scan.o: ../../include/mail_scan_dir.h
 qmgr_scan.o: qmgr.h
-qmgr_scan.o: ../include/vstream.h
-qmgr_scan.o: ../include/vbuf.h
-qmgr_scan.o: ../include/maps.h
-qmgr_scan.o: ../include/dict.h
-qmgr_scan.o: ../include/argv.h
+qmgr_scan.o: ../../include/vstream.h
+qmgr_scan.o: ../../include/vbuf.h
+qmgr_scan.o: ../../include/maps.h
+qmgr_scan.o: ../../include/dict.h
+qmgr_scan.o: ../../include/argv.h
 qmgr_transport.o: qmgr_transport.c
-qmgr_transport.o: ../include/sys_defs.h
-qmgr_transport.o: ../include/msg.h
-qmgr_transport.o: ../include/htable.h
-qmgr_transport.o: ../include/events.h
-qmgr_transport.o: ../include/mymalloc.h
-qmgr_transport.o: ../include/vstream.h
-qmgr_transport.o: ../include/vbuf.h
-qmgr_transport.o: ../include/iostuff.h
-qmgr_transport.o: ../include/mail_proto.h
-qmgr_transport.o: ../include/recipient_list.h
-qmgr_transport.o: ../include/mail_conf.h
-qmgr_transport.o: ../include/mail_params.h
+qmgr_transport.o: ../../include/sys_defs.h
+qmgr_transport.o: ../../include/msg.h
+qmgr_transport.o: ../../include/htable.h
+qmgr_transport.o: ../../include/events.h
+qmgr_transport.o: ../../include/mymalloc.h
+qmgr_transport.o: ../../include/vstream.h
+qmgr_transport.o: ../../include/vbuf.h
+qmgr_transport.o: ../../include/iostuff.h
+qmgr_transport.o: ../../include/mail_proto.h
+qmgr_transport.o: ../../include/recipient_list.h
+qmgr_transport.o: ../../include/mail_conf.h
+qmgr_transport.o: ../../include/mail_params.h
 qmgr_transport.o: qmgr.h
-qmgr_transport.o: ../include/scan_dir.h
-qmgr_transport.o: ../include/maps.h
-qmgr_transport.o: ../include/dict.h
-qmgr_transport.o: ../include/argv.h
+qmgr_transport.o: ../../include/scan_dir.h
+qmgr_transport.o: ../../include/maps.h
+qmgr_transport.o: ../../include/dict.h
+qmgr_transport.o: ../../include/argv.h
diff --git a/postfix/src/sendmail/Makefile.in b/postfix/src/sendmail/Makefile.in
index da946438b..66a63f31f 100644
--- a/postfix/src/sendmail/Makefile.in
+++ b/postfix/src/sendmail/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG=
 PROG	= sendmail
-INC_DIR	= ../include
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../bin/$(PROG)
+update: ../../bin/$(PROG)
 
-../bin/$(PROG): $(PROG)
-	cp $(PROG) ../bin
+../../bin/$(PROG): $(PROG)
+	cp $(PROG) ../../bin
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,34 +54,34 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 sendmail.o: sendmail.c
-sendmail.o: ../include/sys_defs.h
-sendmail.o: ../include/msg.h
-sendmail.o: ../include/mymalloc.h
-sendmail.o: ../include/vstream.h
-sendmail.o: ../include/vbuf.h
-sendmail.o: ../include/vstring.h
-sendmail.o: ../include/msg_vstream.h
-sendmail.o: ../include/msg_syslog.h
-sendmail.o: ../include/vstring_vstream.h
-sendmail.o: ../include/username.h
-sendmail.o: ../include/fullname.h
-sendmail.o: ../include/argv.h
-sendmail.o: ../include/safe.h
-sendmail.o: ../include/iostuff.h
-sendmail.o: ../include/stringops.h
-sendmail.o: ../include/set_ugid.h
-sendmail.o: ../include/mail_queue.h
-sendmail.o: ../include/mail_proto.h
-sendmail.o: ../include/mail_params.h
-sendmail.o: ../include/record.h
-sendmail.o: ../include/rec_type.h
-sendmail.o: ../include/rec_streamlf.h
-sendmail.o: ../include/mail_conf.h
-sendmail.o: ../include/cleanup_user.h
-sendmail.o: ../include/mail_task.h
-sendmail.o: ../include/mail_run.h
-sendmail.o: ../include/debug_process.h
-sendmail.o: ../include/tok822.h
-sendmail.o: ../include/resolve_clnt.h
-sendmail.o: ../include/mail_flush.h
-sendmail.o: ../include/mail_stream.h
+sendmail.o: ../../include/sys_defs.h
+sendmail.o: ../../include/msg.h
+sendmail.o: ../../include/mymalloc.h
+sendmail.o: ../../include/vstream.h
+sendmail.o: ../../include/vbuf.h
+sendmail.o: ../../include/vstring.h
+sendmail.o: ../../include/msg_vstream.h
+sendmail.o: ../../include/msg_syslog.h
+sendmail.o: ../../include/vstring_vstream.h
+sendmail.o: ../../include/username.h
+sendmail.o: ../../include/fullname.h
+sendmail.o: ../../include/argv.h
+sendmail.o: ../../include/safe.h
+sendmail.o: ../../include/iostuff.h
+sendmail.o: ../../include/stringops.h
+sendmail.o: ../../include/set_ugid.h
+sendmail.o: ../../include/mail_queue.h
+sendmail.o: ../../include/mail_proto.h
+sendmail.o: ../../include/mail_params.h
+sendmail.o: ../../include/record.h
+sendmail.o: ../../include/rec_type.h
+sendmail.o: ../../include/rec_streamlf.h
+sendmail.o: ../../include/mail_conf.h
+sendmail.o: ../../include/cleanup_user.h
+sendmail.o: ../../include/mail_task.h
+sendmail.o: ../../include/mail_run.h
+sendmail.o: ../../include/debug_process.h
+sendmail.o: ../../include/tok822.h
+sendmail.o: ../../include/resolve_clnt.h
+sendmail.o: ../../include/mail_flush.h
+sendmail.o: ../../include/mail_stream.h
diff --git a/postfix/src/showq/Makefile.in b/postfix/src/showq/Makefile.in
index ec75f8c9b..cfcaf2daf 100644
--- a/postfix/src/showq/Makefile.in
+++ b/postfix/src/showq/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= showq
-INC_DIR = ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR = ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,24 +54,24 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 showq.o: showq.c
-showq.o: ../include/sys_defs.h
-showq.o: ../include/msg.h
-showq.o: ../include/scan_dir.h
-showq.o: ../include/vstring.h
-showq.o: ../include/vbuf.h
-showq.o: ../include/vstream.h
-showq.o: ../include/vstring_vstream.h
-showq.o: ../include/stringops.h
-showq.o: ../include/mymalloc.h
-showq.o: ../include/mail_queue.h
-showq.o: ../include/mail_open_ok.h
-showq.o: ../include/mail_proto.h
-showq.o: ../include/iostuff.h
-showq.o: ../include/mail_date.h
-showq.o: ../include/mail_params.h
-showq.o: ../include/mail_scan_dir.h
-showq.o: ../include/mail_conf.h
-showq.o: ../include/record.h
-showq.o: ../include/rec_type.h
-showq.o: ../include/htable.h
-showq.o: ../include/mail_server.h
+showq.o: ../../include/sys_defs.h
+showq.o: ../../include/msg.h
+showq.o: ../../include/scan_dir.h
+showq.o: ../../include/vstring.h
+showq.o: ../../include/vbuf.h
+showq.o: ../../include/vstream.h
+showq.o: ../../include/vstring_vstream.h
+showq.o: ../../include/stringops.h
+showq.o: ../../include/mymalloc.h
+showq.o: ../../include/mail_queue.h
+showq.o: ../../include/mail_open_ok.h
+showq.o: ../../include/mail_proto.h
+showq.o: ../../include/iostuff.h
+showq.o: ../../include/mail_date.h
+showq.o: ../../include/mail_params.h
+showq.o: ../../include/mail_scan_dir.h
+showq.o: ../../include/mail_conf.h
+showq.o: ../../include/record.h
+showq.o: ../../include/rec_type.h
+showq.o: ../../include/htable.h
+showq.o: ../../include/mail_server.h
diff --git a/postfix/src/smtp/Makefile.in b/postfix/src/smtp/Makefile.in
index a39e68a3e..7dd7cbcae 100644
--- a/postfix/src/smtp/Makefile.in
+++ b/postfix/src/smtp/Makefile.in
@@ -14,8 +14,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= smtp_unalias
 PROG	= smtp
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libdns.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -23,14 +23,14 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
@@ -38,7 +38,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -62,189 +62,189 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 smtp.o: smtp.c
-smtp.o: ../include/sys_defs.h
-smtp.o: ../include/dict.h
-smtp.o: ../include/vstream.h
-smtp.o: ../include/vbuf.h
-smtp.o: ../include/argv.h
-smtp.o: ../include/msg.h
-smtp.o: ../include/mymalloc.h
-smtp.o: ../include/name_mask.h
-smtp.o: ../include/deliver_request.h
-smtp.o: ../include/vstring.h
-smtp.o: ../include/recipient_list.h
-smtp.o: ../include/mail_params.h
-smtp.o: ../include/mail_conf.h
-smtp.o: ../include/debug_peer.h
-smtp.o: ../include/mail_error.h
-smtp.o: ../include/deliver_pass.h
-smtp.o: ../include/mail_proto.h
-smtp.o: ../include/iostuff.h
-smtp.o: ../include/mail_server.h
+smtp.o: ../../include/sys_defs.h
+smtp.o: ../../include/dict.h
+smtp.o: ../../include/vstream.h
+smtp.o: ../../include/vbuf.h
+smtp.o: ../../include/argv.h
+smtp.o: ../../include/msg.h
+smtp.o: ../../include/mymalloc.h
+smtp.o: ../../include/name_mask.h
+smtp.o: ../../include/deliver_request.h
+smtp.o: ../../include/vstring.h
+smtp.o: ../../include/recipient_list.h
+smtp.o: ../../include/mail_params.h
+smtp.o: ../../include/mail_conf.h
+smtp.o: ../../include/debug_peer.h
+smtp.o: ../../include/mail_error.h
+smtp.o: ../../include/deliver_pass.h
+smtp.o: ../../include/mail_proto.h
+smtp.o: ../../include/iostuff.h
+smtp.o: ../../include/mail_server.h
 smtp.o: smtp.h
 smtp.o: smtp_sasl.h
 smtp_addr.o: smtp_addr.c
-smtp_addr.o: ../include/sys_defs.h
-smtp_addr.o: ../include/msg.h
-smtp_addr.o: ../include/vstring.h
-smtp_addr.o: ../include/vbuf.h
-smtp_addr.o: ../include/mymalloc.h
-smtp_addr.o: ../include/inet_addr_list.h
-smtp_addr.o: ../include/stringops.h
-smtp_addr.o: ../include/mail_params.h
-smtp_addr.o: ../include/own_inet_addr.h
-smtp_addr.o: ../include/dns.h
+smtp_addr.o: ../../include/sys_defs.h
+smtp_addr.o: ../../include/msg.h
+smtp_addr.o: ../../include/vstring.h
+smtp_addr.o: ../../include/vbuf.h
+smtp_addr.o: ../../include/mymalloc.h
+smtp_addr.o: ../../include/inet_addr_list.h
+smtp_addr.o: ../../include/stringops.h
+smtp_addr.o: ../../include/mail_params.h
+smtp_addr.o: ../../include/own_inet_addr.h
+smtp_addr.o: ../../include/dns.h
 smtp_addr.o: smtp.h
-smtp_addr.o: ../include/vstream.h
-smtp_addr.o: ../include/argv.h
-smtp_addr.o: ../include/deliver_request.h
-smtp_addr.o: ../include/recipient_list.h
+smtp_addr.o: ../../include/vstream.h
+smtp_addr.o: ../../include/argv.h
+smtp_addr.o: ../../include/deliver_request.h
+smtp_addr.o: ../../include/recipient_list.h
 smtp_addr.o: smtp_addr.h
 smtp_chat.o: smtp_chat.c
-smtp_chat.o: ../include/sys_defs.h
-smtp_chat.o: ../include/msg.h
-smtp_chat.o: ../include/vstring.h
-smtp_chat.o: ../include/vbuf.h
-smtp_chat.o: ../include/vstream.h
-smtp_chat.o: ../include/argv.h
-smtp_chat.o: ../include/stringops.h
-smtp_chat.o: ../include/line_wrap.h
-smtp_chat.o: ../include/mymalloc.h
-smtp_chat.o: ../include/recipient_list.h
-smtp_chat.o: ../include/deliver_request.h
-smtp_chat.o: ../include/smtp_stream.h
-smtp_chat.o: ../include/mail_params.h
-smtp_chat.o: ../include/mail_addr.h
-smtp_chat.o: ../include/post_mail.h
-smtp_chat.o: ../include/cleanup_user.h
+smtp_chat.o: ../../include/sys_defs.h
+smtp_chat.o: ../../include/msg.h
+smtp_chat.o: ../../include/vstring.h
+smtp_chat.o: ../../include/vbuf.h
+smtp_chat.o: ../../include/vstream.h
+smtp_chat.o: ../../include/argv.h
+smtp_chat.o: ../../include/stringops.h
+smtp_chat.o: ../../include/line_wrap.h
+smtp_chat.o: ../../include/mymalloc.h
+smtp_chat.o: ../../include/recipient_list.h
+smtp_chat.o: ../../include/deliver_request.h
+smtp_chat.o: ../../include/smtp_stream.h
+smtp_chat.o: ../../include/mail_params.h
+smtp_chat.o: ../../include/mail_addr.h
+smtp_chat.o: ../../include/post_mail.h
+smtp_chat.o: ../../include/cleanup_user.h
 smtp_chat.o: smtp.h
 smtp_connect.o: smtp_connect.c
-smtp_connect.o: ../include/sys_defs.h
-smtp_connect.o: ../include/msg.h
-smtp_connect.o: ../include/vstream.h
-smtp_connect.o: ../include/vbuf.h
-smtp_connect.o: ../include/vstring.h
-smtp_connect.o: ../include/split_at.h
-smtp_connect.o: ../include/mymalloc.h
-smtp_connect.o: ../include/inet_addr_list.h
-smtp_connect.o: ../include/iostuff.h
-smtp_connect.o: ../include/timed_connect.h
-smtp_connect.o: ../include/mail_params.h
-smtp_connect.o: ../include/own_inet_addr.h
-smtp_connect.o: ../include/dns.h
+smtp_connect.o: ../../include/sys_defs.h
+smtp_connect.o: ../../include/msg.h
+smtp_connect.o: ../../include/vstream.h
+smtp_connect.o: ../../include/vbuf.h
+smtp_connect.o: ../../include/vstring.h
+smtp_connect.o: ../../include/split_at.h
+smtp_connect.o: ../../include/mymalloc.h
+smtp_connect.o: ../../include/inet_addr_list.h
+smtp_connect.o: ../../include/iostuff.h
+smtp_connect.o: ../../include/timed_connect.h
+smtp_connect.o: ../../include/mail_params.h
+smtp_connect.o: ../../include/own_inet_addr.h
+smtp_connect.o: ../../include/dns.h
 smtp_connect.o: smtp.h
-smtp_connect.o: ../include/argv.h
-smtp_connect.o: ../include/deliver_request.h
-smtp_connect.o: ../include/recipient_list.h
+smtp_connect.o: ../../include/argv.h
+smtp_connect.o: ../../include/deliver_request.h
+smtp_connect.o: ../../include/recipient_list.h
 smtp_connect.o: smtp_addr.h
 smtp_proto.o: smtp_proto.c
-smtp_proto.o: ../include/sys_defs.h
-smtp_proto.o: ../include/msg.h
-smtp_proto.o: ../include/vstring.h
-smtp_proto.o: ../include/vbuf.h
-smtp_proto.o: ../include/vstream.h
-smtp_proto.o: ../include/vstring_vstream.h
-smtp_proto.o: ../include/stringops.h
-smtp_proto.o: ../include/mymalloc.h
-smtp_proto.o: ../include/mail_params.h
-smtp_proto.o: ../include/smtp_stream.h
-smtp_proto.o: ../include/mail_queue.h
-smtp_proto.o: ../include/recipient_list.h
-smtp_proto.o: ../include/deliver_request.h
-smtp_proto.o: ../include/deliver_completed.h
-smtp_proto.o: ../include/defer.h
-smtp_proto.o: ../include/bounce.h
-smtp_proto.o: ../include/sent.h
-smtp_proto.o: ../include/record.h
-smtp_proto.o: ../include/rec_type.h
-smtp_proto.o: ../include/off_cvt.h
-smtp_proto.o: ../include/mark_corrupt.h
+smtp_proto.o: ../../include/sys_defs.h
+smtp_proto.o: ../../include/msg.h
+smtp_proto.o: ../../include/vstring.h
+smtp_proto.o: ../../include/vbuf.h
+smtp_proto.o: ../../include/vstream.h
+smtp_proto.o: ../../include/vstring_vstream.h
+smtp_proto.o: ../../include/stringops.h
+smtp_proto.o: ../../include/mymalloc.h
+smtp_proto.o: ../../include/mail_params.h
+smtp_proto.o: ../../include/smtp_stream.h
+smtp_proto.o: ../../include/mail_queue.h
+smtp_proto.o: ../../include/recipient_list.h
+smtp_proto.o: ../../include/deliver_request.h
+smtp_proto.o: ../../include/deliver_completed.h
+smtp_proto.o: ../../include/defer.h
+smtp_proto.o: ../../include/bounce.h
+smtp_proto.o: ../../include/sent.h
+smtp_proto.o: ../../include/record.h
+smtp_proto.o: ../../include/rec_type.h
+smtp_proto.o: ../../include/off_cvt.h
+smtp_proto.o: ../../include/mark_corrupt.h
 smtp_proto.o: smtp.h
-smtp_proto.o: ../include/argv.h
-smtp_proto.o: ../include/quote_821_local.h
+smtp_proto.o: ../../include/argv.h
+smtp_proto.o: ../../include/quote_821_local.h
 smtp_proto.o: smtp_sasl.h
 smtp_sasl_glue.o: smtp_sasl_glue.c
-smtp_sasl_glue.o: ../include/sys_defs.h
-smtp_sasl_glue.o: ../include/msg.h
-smtp_sasl_glue.o: ../include/mymalloc.h
-smtp_sasl_glue.o: ../include/stringops.h
-smtp_sasl_glue.o: ../include/vstring.h
-smtp_sasl_glue.o: ../include/vbuf.h
-smtp_sasl_glue.o: ../include/split_at.h
-smtp_sasl_glue.o: ../include/name_mask.h
-smtp_sasl_glue.o: ../include/mail_params.h
-smtp_sasl_glue.o: ../include/string_list.h
-smtp_sasl_glue.o: ../include/maps.h
-smtp_sasl_glue.o: ../include/dict.h
-smtp_sasl_glue.o: ../include/vstream.h
-smtp_sasl_glue.o: ../include/argv.h
+smtp_sasl_glue.o: ../../include/sys_defs.h
+smtp_sasl_glue.o: ../../include/msg.h
+smtp_sasl_glue.o: ../../include/mymalloc.h
+smtp_sasl_glue.o: ../../include/stringops.h
+smtp_sasl_glue.o: ../../include/vstring.h
+smtp_sasl_glue.o: ../../include/vbuf.h
+smtp_sasl_glue.o: ../../include/split_at.h
+smtp_sasl_glue.o: ../../include/name_mask.h
+smtp_sasl_glue.o: ../../include/mail_params.h
+smtp_sasl_glue.o: ../../include/string_list.h
+smtp_sasl_glue.o: ../../include/maps.h
+smtp_sasl_glue.o: ../../include/dict.h
+smtp_sasl_glue.o: ../../include/vstream.h
+smtp_sasl_glue.o: ../../include/argv.h
 smtp_sasl_glue.o: smtp.h
-smtp_sasl_glue.o: ../include/deliver_request.h
-smtp_sasl_glue.o: ../include/recipient_list.h
+smtp_sasl_glue.o: ../../include/deliver_request.h
+smtp_sasl_glue.o: ../../include/recipient_list.h
 smtp_sasl_glue.o: smtp_sasl.h
 smtp_sasl_proto.o: smtp_sasl_proto.c
-smtp_sasl_proto.o: ../include/sys_defs.h
-smtp_sasl_proto.o: ../include/msg.h
-smtp_sasl_proto.o: ../include/mymalloc.h
-smtp_sasl_proto.o: ../include/mail_params.h
+smtp_sasl_proto.o: ../../include/sys_defs.h
+smtp_sasl_proto.o: ../../include/msg.h
+smtp_sasl_proto.o: ../../include/mymalloc.h
+smtp_sasl_proto.o: ../../include/mail_params.h
 smtp_sasl_proto.o: smtp.h
-smtp_sasl_proto.o: ../include/vstream.h
-smtp_sasl_proto.o: ../include/vbuf.h
-smtp_sasl_proto.o: ../include/vstring.h
-smtp_sasl_proto.o: ../include/argv.h
-smtp_sasl_proto.o: ../include/deliver_request.h
-smtp_sasl_proto.o: ../include/recipient_list.h
+smtp_sasl_proto.o: ../../include/vstream.h
+smtp_sasl_proto.o: ../../include/vbuf.h
+smtp_sasl_proto.o: ../../include/vstring.h
+smtp_sasl_proto.o: ../../include/argv.h
+smtp_sasl_proto.o: ../../include/deliver_request.h
+smtp_sasl_proto.o: ../../include/recipient_list.h
 smtp_sasl_proto.o: smtp_sasl.h
 smtp_session.o: smtp_session.c
-smtp_session.o: ../include/sys_defs.h
-smtp_session.o: ../include/mymalloc.h
-smtp_session.o: ../include/vstream.h
-smtp_session.o: ../include/vbuf.h
-smtp_session.o: ../include/stringops.h
-smtp_session.o: ../include/vstring.h
+smtp_session.o: ../../include/sys_defs.h
+smtp_session.o: ../../include/mymalloc.h
+smtp_session.o: ../../include/vstream.h
+smtp_session.o: ../../include/vbuf.h
+smtp_session.o: ../../include/stringops.h
+smtp_session.o: ../../include/vstring.h
 smtp_session.o: smtp.h
-smtp_session.o: ../include/argv.h
-smtp_session.o: ../include/deliver_request.h
-smtp_session.o: ../include/recipient_list.h
+smtp_session.o: ../../include/argv.h
+smtp_session.o: ../../include/deliver_request.h
+smtp_session.o: ../../include/recipient_list.h
 smtp_state.o: smtp_state.c
-smtp_state.o: ../include/sys_defs.h
-smtp_state.o: ../include/mymalloc.h
-smtp_state.o: ../include/vstring.h
-smtp_state.o: ../include/vbuf.h
-smtp_state.o: ../include/vstream.h
-smtp_state.o: ../include/mail_conf.h
+smtp_state.o: ../../include/sys_defs.h
+smtp_state.o: ../../include/mymalloc.h
+smtp_state.o: ../../include/vstring.h
+smtp_state.o: ../../include/vbuf.h
+smtp_state.o: ../../include/vstream.h
+smtp_state.o: ../../include/mail_conf.h
 smtp_state.o: smtp.h
-smtp_state.o: ../include/argv.h
-smtp_state.o: ../include/deliver_request.h
-smtp_state.o: ../include/recipient_list.h
+smtp_state.o: ../../include/argv.h
+smtp_state.o: ../../include/deliver_request.h
+smtp_state.o: ../../include/recipient_list.h
 smtp_state.o: smtp_sasl.h
 smtp_trouble.o: smtp_trouble.c
-smtp_trouble.o: ../include/sys_defs.h
-smtp_trouble.o: ../include/msg.h
-smtp_trouble.o: ../include/vstring.h
-smtp_trouble.o: ../include/vbuf.h
-smtp_trouble.o: ../include/stringops.h
-smtp_trouble.o: ../include/mymalloc.h
-smtp_trouble.o: ../include/smtp_stream.h
-smtp_trouble.o: ../include/vstream.h
-smtp_trouble.o: ../include/deliver_request.h
-smtp_trouble.o: ../include/recipient_list.h
-smtp_trouble.o: ../include/deliver_completed.h
-smtp_trouble.o: ../include/bounce.h
-smtp_trouble.o: ../include/defer.h
-smtp_trouble.o: ../include/mail_error.h
-smtp_trouble.o: ../include/name_mask.h
+smtp_trouble.o: ../../include/sys_defs.h
+smtp_trouble.o: ../../include/msg.h
+smtp_trouble.o: ../../include/vstring.h
+smtp_trouble.o: ../../include/vbuf.h
+smtp_trouble.o: ../../include/stringops.h
+smtp_trouble.o: ../../include/mymalloc.h
+smtp_trouble.o: ../../include/smtp_stream.h
+smtp_trouble.o: ../../include/vstream.h
+smtp_trouble.o: ../../include/deliver_request.h
+smtp_trouble.o: ../../include/recipient_list.h
+smtp_trouble.o: ../../include/deliver_completed.h
+smtp_trouble.o: ../../include/bounce.h
+smtp_trouble.o: ../../include/defer.h
+smtp_trouble.o: ../../include/mail_error.h
+smtp_trouble.o: ../../include/name_mask.h
 smtp_trouble.o: smtp.h
-smtp_trouble.o: ../include/argv.h
+smtp_trouble.o: ../../include/argv.h
 smtp_unalias.o: smtp_unalias.c
-smtp_unalias.o: ../include/sys_defs.h
-smtp_unalias.o: ../include/htable.h
-smtp_unalias.o: ../include/vstring.h
-smtp_unalias.o: ../include/vbuf.h
-smtp_unalias.o: ../include/msg.h
-smtp_unalias.o: ../include/dns.h
+smtp_unalias.o: ../../include/sys_defs.h
+smtp_unalias.o: ../../include/htable.h
+smtp_unalias.o: ../../include/vstring.h
+smtp_unalias.o: ../../include/vbuf.h
+smtp_unalias.o: ../../include/msg.h
+smtp_unalias.o: ../../include/dns.h
 smtp_unalias.o: smtp.h
-smtp_unalias.o: ../include/vstream.h
-smtp_unalias.o: ../include/argv.h
-smtp_unalias.o: ../include/deliver_request.h
-smtp_unalias.o: ../include/recipient_list.h
+smtp_unalias.o: ../../include/vstream.h
+smtp_unalias.o: ../../include/argv.h
+smtp_unalias.o: ../../include/deliver_request.h
+smtp_unalias.o: ../../include/recipient_list.h
diff --git a/postfix/src/smtpd/Makefile.in b/postfix/src/smtpd/Makefile.in
index 840116d41..f81aad895 100644
--- a/postfix/src/smtpd/Makefile.in
+++ b/postfix/src/smtpd/Makefile.in
@@ -13,8 +13,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= smtpd_token smtpd_check
 PROG	= smtpd
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libdns.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libdns.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -22,14 +22,14 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 SMTPD_CHECK_OBJ = smtpd_state.o smtpd_peer.o
 
@@ -48,7 +48,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -94,37 +94,37 @@ smtpd_token_test: smtpd_token smtpd_token.in smtpd_token.ref
 
 # do not edit below this line - it is generated by 'make depend'
 smtpd.o: smtpd.c
-smtpd.o: ../include/sys_defs.h
-smtpd.o: ../include/msg.h
-smtpd.o: ../include/mymalloc.h
-smtpd.o: ../include/vstring.h
-smtpd.o: ../include/vbuf.h
-smtpd.o: ../include/vstream.h
-smtpd.o: ../include/vstring_vstream.h
-smtpd.o: ../include/stringops.h
-smtpd.o: ../include/events.h
-smtpd.o: ../include/smtp_stream.h
-smtpd.o: ../include/valid_hostname.h
-smtpd.o: ../include/dict.h
-smtpd.o: ../include/argv.h
-smtpd.o: ../include/mail_params.h
-smtpd.o: ../include/record.h
-smtpd.o: ../include/rec_type.h
-smtpd.o: ../include/mail_proto.h
-smtpd.o: ../include/iostuff.h
-smtpd.o: ../include/cleanup_user.h
-smtpd.o: ../include/mail_date.h
-smtpd.o: ../include/mail_conf.h
-smtpd.o: ../include/off_cvt.h
-smtpd.o: ../include/debug_peer.h
-smtpd.o: ../include/mail_error.h
-smtpd.o: ../include/name_mask.h
-smtpd.o: ../include/mail_flush.h
-smtpd.o: ../include/mail_stream.h
-smtpd.o: ../include/mail_queue.h
-smtpd.o: ../include/tok822.h
-smtpd.o: ../include/resolve_clnt.h
-smtpd.o: ../include/mail_server.h
+smtpd.o: ../../include/sys_defs.h
+smtpd.o: ../../include/msg.h
+smtpd.o: ../../include/mymalloc.h
+smtpd.o: ../../include/vstring.h
+smtpd.o: ../../include/vbuf.h
+smtpd.o: ../../include/vstream.h
+smtpd.o: ../../include/vstring_vstream.h
+smtpd.o: ../../include/stringops.h
+smtpd.o: ../../include/events.h
+smtpd.o: ../../include/smtp_stream.h
+smtpd.o: ../../include/valid_hostname.h
+smtpd.o: ../../include/dict.h
+smtpd.o: ../../include/argv.h
+smtpd.o: ../../include/mail_params.h
+smtpd.o: ../../include/record.h
+smtpd.o: ../../include/rec_type.h
+smtpd.o: ../../include/mail_proto.h
+smtpd.o: ../../include/iostuff.h
+smtpd.o: ../../include/cleanup_user.h
+smtpd.o: ../../include/mail_date.h
+smtpd.o: ../../include/mail_conf.h
+smtpd.o: ../../include/off_cvt.h
+smtpd.o: ../../include/debug_peer.h
+smtpd.o: ../../include/mail_error.h
+smtpd.o: ../../include/name_mask.h
+smtpd.o: ../../include/mail_flush.h
+smtpd.o: ../../include/mail_stream.h
+smtpd.o: ../../include/mail_queue.h
+smtpd.o: ../../include/tok822.h
+smtpd.o: ../../include/resolve_clnt.h
+smtpd.o: ../../include/mail_server.h
 smtpd.o: smtpd_token.h
 smtpd.o: smtpd.h
 smtpd.o: smtpd_check.h
@@ -132,127 +132,127 @@ smtpd.o: smtpd_chat.h
 smtpd.o: smtpd_sasl_proto.h
 smtpd.o: smtpd_sasl_glue.h
 smtpd_chat.o: smtpd_chat.c
-smtpd_chat.o: ../include/sys_defs.h
-smtpd_chat.o: ../include/msg.h
-smtpd_chat.o: ../include/argv.h
-smtpd_chat.o: ../include/vstring.h
-smtpd_chat.o: ../include/vbuf.h
-smtpd_chat.o: ../include/vstream.h
-smtpd_chat.o: ../include/stringops.h
-smtpd_chat.o: ../include/line_wrap.h
-smtpd_chat.o: ../include/mymalloc.h
-smtpd_chat.o: ../include/smtp_stream.h
-smtpd_chat.o: ../include/record.h
-smtpd_chat.o: ../include/rec_type.h
-smtpd_chat.o: ../include/mail_proto.h
-smtpd_chat.o: ../include/iostuff.h
-smtpd_chat.o: ../include/mail_params.h
-smtpd_chat.o: ../include/mail_addr.h
-smtpd_chat.o: ../include/post_mail.h
-smtpd_chat.o: ../include/cleanup_user.h
-smtpd_chat.o: ../include/mail_error.h
-smtpd_chat.o: ../include/name_mask.h
+smtpd_chat.o: ../../include/sys_defs.h
+smtpd_chat.o: ../../include/msg.h
+smtpd_chat.o: ../../include/argv.h
+smtpd_chat.o: ../../include/vstring.h
+smtpd_chat.o: ../../include/vbuf.h
+smtpd_chat.o: ../../include/vstream.h
+smtpd_chat.o: ../../include/stringops.h
+smtpd_chat.o: ../../include/line_wrap.h
+smtpd_chat.o: ../../include/mymalloc.h
+smtpd_chat.o: ../../include/smtp_stream.h
+smtpd_chat.o: ../../include/record.h
+smtpd_chat.o: ../../include/rec_type.h
+smtpd_chat.o: ../../include/mail_proto.h
+smtpd_chat.o: ../../include/iostuff.h
+smtpd_chat.o: ../../include/mail_params.h
+smtpd_chat.o: ../../include/mail_addr.h
+smtpd_chat.o: ../../include/post_mail.h
+smtpd_chat.o: ../../include/cleanup_user.h
+smtpd_chat.o: ../../include/mail_error.h
+smtpd_chat.o: ../../include/name_mask.h
 smtpd_chat.o: smtpd.h
-smtpd_chat.o: ../include/mail_stream.h
+smtpd_chat.o: ../../include/mail_stream.h
 smtpd_chat.o: smtpd_chat.h
 smtpd_check.o: smtpd_check.c
-smtpd_check.o: ../include/sys_defs.h
-smtpd_check.o: ../include/msg.h
-smtpd_check.o: ../include/vstring.h
-smtpd_check.o: ../include/vbuf.h
-smtpd_check.o: ../include/split_at.h
-smtpd_check.o: ../include/fsspace.h
-smtpd_check.o: ../include/stringops.h
-smtpd_check.o: ../include/valid_hostname.h
-smtpd_check.o: ../include/argv.h
-smtpd_check.o: ../include/mymalloc.h
-smtpd_check.o: ../include/dict.h
-smtpd_check.o: ../include/vstream.h
-smtpd_check.o: ../include/htable.h
-smtpd_check.o: ../include/dns.h
-smtpd_check.o: ../include/namadr_list.h
-smtpd_check.o: ../include/domain_list.h
-smtpd_check.o: ../include/mail_params.h
-smtpd_check.o: ../include/canon_addr.h
-smtpd_check.o: ../include/resolve_clnt.h
-smtpd_check.o: ../include/mail_error.h
-smtpd_check.o: ../include/name_mask.h
-smtpd_check.o: ../include/resolve_local.h
-smtpd_check.o: ../include/own_inet_addr.h
-smtpd_check.o: ../include/mail_conf.h
-smtpd_check.o: ../include/maps.h
-smtpd_check.o: ../include/mail_addr_find.h
+smtpd_check.o: ../../include/sys_defs.h
+smtpd_check.o: ../../include/msg.h
+smtpd_check.o: ../../include/vstring.h
+smtpd_check.o: ../../include/vbuf.h
+smtpd_check.o: ../../include/split_at.h
+smtpd_check.o: ../../include/fsspace.h
+smtpd_check.o: ../../include/stringops.h
+smtpd_check.o: ../../include/valid_hostname.h
+smtpd_check.o: ../../include/argv.h
+smtpd_check.o: ../../include/mymalloc.h
+smtpd_check.o: ../../include/dict.h
+smtpd_check.o: ../../include/vstream.h
+smtpd_check.o: ../../include/htable.h
+smtpd_check.o: ../../include/dns.h
+smtpd_check.o: ../../include/namadr_list.h
+smtpd_check.o: ../../include/domain_list.h
+smtpd_check.o: ../../include/mail_params.h
+smtpd_check.o: ../../include/canon_addr.h
+smtpd_check.o: ../../include/resolve_clnt.h
+smtpd_check.o: ../../include/mail_error.h
+smtpd_check.o: ../../include/name_mask.h
+smtpd_check.o: ../../include/resolve_local.h
+smtpd_check.o: ../../include/own_inet_addr.h
+smtpd_check.o: ../../include/mail_conf.h
+smtpd_check.o: ../../include/maps.h
+smtpd_check.o: ../../include/mail_addr_find.h
 smtpd_check.o: smtpd.h
-smtpd_check.o: ../include/mail_stream.h
+smtpd_check.o: ../../include/mail_stream.h
 smtpd_check.o: smtpd_check.h
 smtpd_peer.o: smtpd_peer.c
-smtpd_peer.o: ../include/sys_defs.h
-smtpd_peer.o: ../include/msg.h
-smtpd_peer.o: ../include/mymalloc.h
-smtpd_peer.o: ../include/valid_hostname.h
-smtpd_peer.o: ../include/stringops.h
-smtpd_peer.o: ../include/vstring.h
-smtpd_peer.o: ../include/vbuf.h
+smtpd_peer.o: ../../include/sys_defs.h
+smtpd_peer.o: ../../include/msg.h
+smtpd_peer.o: ../../include/mymalloc.h
+smtpd_peer.o: ../../include/valid_hostname.h
+smtpd_peer.o: ../../include/stringops.h
+smtpd_peer.o: ../../include/vstring.h
+smtpd_peer.o: ../../include/vbuf.h
 smtpd_peer.o: smtpd.h
-smtpd_peer.o: ../include/vstream.h
-smtpd_peer.o: ../include/argv.h
-smtpd_peer.o: ../include/mail_stream.h
+smtpd_peer.o: ../../include/vstream.h
+smtpd_peer.o: ../../include/argv.h
+smtpd_peer.o: ../../include/mail_stream.h
 smtpd_sasl_glue.o: smtpd_sasl_glue.c
-smtpd_sasl_glue.o: ../include/sys_defs.h
-smtpd_sasl_glue.o: ../include/msg.h
-smtpd_sasl_glue.o: ../include/mymalloc.h
-smtpd_sasl_glue.o: ../include/namadr_list.h
-smtpd_sasl_glue.o: ../include/name_mask.h
-smtpd_sasl_glue.o: ../include/mail_params.h
-smtpd_sasl_glue.o: ../include/smtp_stream.h
-smtpd_sasl_glue.o: ../include/vstring.h
-smtpd_sasl_glue.o: ../include/vbuf.h
-smtpd_sasl_glue.o: ../include/vstream.h
+smtpd_sasl_glue.o: ../../include/sys_defs.h
+smtpd_sasl_glue.o: ../../include/msg.h
+smtpd_sasl_glue.o: ../../include/mymalloc.h
+smtpd_sasl_glue.o: ../../include/namadr_list.h
+smtpd_sasl_glue.o: ../../include/name_mask.h
+smtpd_sasl_glue.o: ../../include/mail_params.h
+smtpd_sasl_glue.o: ../../include/smtp_stream.h
+smtpd_sasl_glue.o: ../../include/vstring.h
+smtpd_sasl_glue.o: ../../include/vbuf.h
+smtpd_sasl_glue.o: ../../include/vstream.h
 smtpd_sasl_glue.o: smtpd.h
-smtpd_sasl_glue.o: ../include/argv.h
-smtpd_sasl_glue.o: ../include/mail_stream.h
+smtpd_sasl_glue.o: ../../include/argv.h
+smtpd_sasl_glue.o: ../../include/mail_stream.h
 smtpd_sasl_glue.o: smtpd_sasl_glue.h
 smtpd_sasl_glue.o: smtpd_chat.h
 smtpd_sasl_proto.o: smtpd_sasl_proto.c
-smtpd_sasl_proto.o: ../include/sys_defs.h
-smtpd_sasl_proto.o: ../include/msg.h
-smtpd_sasl_proto.o: ../include/mymalloc.h
-smtpd_sasl_proto.o: ../include/mail_params.h
-smtpd_sasl_proto.o: ../include/mail_proto.h
-smtpd_sasl_proto.o: ../include/vstream.h
-smtpd_sasl_proto.o: ../include/vbuf.h
-smtpd_sasl_proto.o: ../include/iostuff.h
-smtpd_sasl_proto.o: ../include/mail_error.h
-smtpd_sasl_proto.o: ../include/name_mask.h
+smtpd_sasl_proto.o: ../../include/sys_defs.h
+smtpd_sasl_proto.o: ../../include/msg.h
+smtpd_sasl_proto.o: ../../include/mymalloc.h
+smtpd_sasl_proto.o: ../../include/mail_params.h
+smtpd_sasl_proto.o: ../../include/mail_proto.h
+smtpd_sasl_proto.o: ../../include/vstream.h
+smtpd_sasl_proto.o: ../../include/vbuf.h
+smtpd_sasl_proto.o: ../../include/iostuff.h
+smtpd_sasl_proto.o: ../../include/mail_error.h
+smtpd_sasl_proto.o: ../../include/name_mask.h
 smtpd_sasl_proto.o: smtpd.h
-smtpd_sasl_proto.o: ../include/vstring.h
-smtpd_sasl_proto.o: ../include/argv.h
-smtpd_sasl_proto.o: ../include/mail_stream.h
+smtpd_sasl_proto.o: ../../include/vstring.h
+smtpd_sasl_proto.o: ../../include/argv.h
+smtpd_sasl_proto.o: ../../include/mail_stream.h
 smtpd_sasl_proto.o: smtpd_token.h
 smtpd_sasl_proto.o: smtpd_chat.h
 smtpd_sasl_proto.o: smtpd_sasl_proto.h
 smtpd_sasl_proto.o: smtpd_sasl_glue.h
 smtpd_state.o: smtpd_state.c
-smtpd_state.o: ../include/sys_defs.h
-smtpd_state.o: ../include/events.h
-smtpd_state.o: ../include/mymalloc.h
-smtpd_state.o: ../include/vstream.h
-smtpd_state.o: ../include/vbuf.h
-smtpd_state.o: ../include/name_mask.h
-smtpd_state.o: ../include/msg.h
-smtpd_state.o: ../include/cleanup_user.h
-smtpd_state.o: ../include/mail_params.h
-smtpd_state.o: ../include/mail_error.h
+smtpd_state.o: ../../include/sys_defs.h
+smtpd_state.o: ../../include/events.h
+smtpd_state.o: ../../include/mymalloc.h
+smtpd_state.o: ../../include/vstream.h
+smtpd_state.o: ../../include/vbuf.h
+smtpd_state.o: ../../include/name_mask.h
+smtpd_state.o: ../../include/msg.h
+smtpd_state.o: ../../include/cleanup_user.h
+smtpd_state.o: ../../include/mail_params.h
+smtpd_state.o: ../../include/mail_error.h
 smtpd_state.o: smtpd.h
-smtpd_state.o: ../include/vstring.h
-smtpd_state.o: ../include/argv.h
-smtpd_state.o: ../include/mail_stream.h
+smtpd_state.o: ../../include/vstring.h
+smtpd_state.o: ../../include/argv.h
+smtpd_state.o: ../../include/mail_stream.h
 smtpd_state.o: smtpd_chat.h
 smtpd_state.o: smtpd_sasl_glue.h
 smtpd_token.o: smtpd_token.c
-smtpd_token.o: ../include/sys_defs.h
-smtpd_token.o: ../include/mymalloc.h
-smtpd_token.o: ../include/mvect.h
+smtpd_token.o: ../../include/sys_defs.h
+smtpd_token.o: ../../include/mymalloc.h
+smtpd_token.o: ../../include/mvect.h
 smtpd_token.o: smtpd_token.h
-smtpd_token.o: ../include/vstring.h
-smtpd_token.o: ../include/vbuf.h
+smtpd_token.o: ../../include/vstring.h
+smtpd_token.o: ../../include/vbuf.h
diff --git a/postfix/src/smtpstone/Makefile.in b/postfix/src/smtpstone/Makefile.in
index 702f55cf6..e4d73e7af 100644
--- a/postfix/src/smtpstone/Makefile.in
+++ b/postfix/src/smtpstone/Makefile.in
@@ -9,16 +9,16 @@ WARN	= -W -Wformat -Wimplicit -Wmissing-prototypes \
 DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
-INC_DIR	= ../include
+INC_DIR	= ../../include
 PROG	= smtp-source smtp-sink
-LIBS	= ../lib/libglobal.a ../lib/libutil.a
+LIBS	= ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 all:	$(PROG)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 smtp-sink: smtp-sink.o $(LIBS)
 	$(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS)
@@ -28,12 +28,12 @@ smtp-source: smtp-source.o $(LIBS)
 
 test:	$(TESTPROG)
 
-update: ../bin/smtp-source ../bin/smtp-sink
+update: ../../bin/smtp-source ../../bin/smtp-sink
 
-../bin/smtp-source: smtp-source
+../../bin/smtp-source: smtp-source
 	cp $? $@
 
-../bin/smtp-sink: smtp-sink
+../../bin/smtp-sink: smtp-sink
 	cp $? $@
 
 printfck: $(OBJS) $(PROG)
@@ -41,7 +41,7 @@ printfck: $(OBJS) $(PROG)
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -62,33 +62,33 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 smtp-sink.o: smtp-sink.c
-smtp-sink.o: ../include/sys_defs.h
-smtp-sink.o: ../include/msg.h
-smtp-sink.o: ../include/vstring.h
-smtp-sink.o: ../include/vbuf.h
-smtp-sink.o: ../include/vstream.h
-smtp-sink.o: ../include/vstring_vstream.h
-smtp-sink.o: ../include/get_hostname.h
-smtp-sink.o: ../include/listen.h
-smtp-sink.o: ../include/iostuff.h
-smtp-sink.o: ../include/events.h
-smtp-sink.o: ../include/mymalloc.h
-smtp-sink.o: ../include/msg_vstream.h
-smtp-sink.o: ../include/smtp_stream.h
+smtp-sink.o: ../../include/sys_defs.h
+smtp-sink.o: ../../include/msg.h
+smtp-sink.o: ../../include/vstring.h
+smtp-sink.o: ../../include/vbuf.h
+smtp-sink.o: ../../include/vstream.h
+smtp-sink.o: ../../include/vstring_vstream.h
+smtp-sink.o: ../../include/get_hostname.h
+smtp-sink.o: ../../include/listen.h
+smtp-sink.o: ../../include/iostuff.h
+smtp-sink.o: ../../include/events.h
+smtp-sink.o: ../../include/mymalloc.h
+smtp-sink.o: ../../include/msg_vstream.h
+smtp-sink.o: ../../include/smtp_stream.h
 smtp-source.o: smtp-source.c
-smtp-source.o: ../include/sys_defs.h
-smtp-source.o: ../include/msg.h
-smtp-source.o: ../include/msg_vstream.h
-smtp-source.o: ../include/vstream.h
-smtp-source.o: ../include/vbuf.h
-smtp-source.o: ../include/vstring.h
-smtp-source.o: ../include/vstring_vstream.h
-smtp-source.o: ../include/get_hostname.h
-smtp-source.o: ../include/split_at.h
-smtp-source.o: ../include/connect.h
-smtp-source.o: ../include/iostuff.h
-smtp-source.o: ../include/mymalloc.h
-smtp-source.o: ../include/events.h
-smtp-source.o: ../include/find_inet.h
-smtp-source.o: ../include/smtp_stream.h
-smtp-source.o: ../include/mail_date.h
+smtp-source.o: ../../include/sys_defs.h
+smtp-source.o: ../../include/msg.h
+smtp-source.o: ../../include/msg_vstream.h
+smtp-source.o: ../../include/vstream.h
+smtp-source.o: ../../include/vbuf.h
+smtp-source.o: ../../include/vstring.h
+smtp-source.o: ../../include/vstring_vstream.h
+smtp-source.o: ../../include/get_hostname.h
+smtp-source.o: ../../include/split_at.h
+smtp-source.o: ../../include/connect.h
+smtp-source.o: ../../include/iostuff.h
+smtp-source.o: ../../include/mymalloc.h
+smtp-source.o: ../../include/events.h
+smtp-source.o: ../../include/find_inet.h
+smtp-source.o: ../../include/smtp_stream.h
+smtp-source.o: ../../include/mail_date.h
diff --git a/postfix/src/spawn/Makefile.in b/postfix/src/spawn/Makefile.in
index d535d6df0..dad6232a4 100644
--- a/postfix/src/spawn/Makefile.in
+++ b/postfix/src/spawn/Makefile.in
@@ -10,8 +10,8 @@ DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
 CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= spawn
-INC_DIR	= ../include
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
+INC_DIR	= ../../include
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -19,21 +19,21 @@ $(PROG):	$(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
-update: ../libexec/$(PROG)
+update: ../../libexec/$(PROG)
 
-../libexec/$(PROG): $(PROG)
-	cp $(PROG) ../libexec
+../../libexec/$(PROG): $(PROG)
+	cp $(PROG) ../../libexec
 
 printfck: $(OBJS) $(PROG)
 	rm -rf printfck
 	mkdir printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -54,17 +54,17 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 spawn.o: spawn.c
-spawn.o: ../include/sys_defs.h
-spawn.o: ../include/msg.h
-spawn.o: ../include/argv.h
-spawn.o: ../include/dict.h
-spawn.o: ../include/vstream.h
-spawn.o: ../include/vbuf.h
-spawn.o: ../include/mymalloc.h
-spawn.o: ../include/spawn_command.h
-spawn.o: ../include/split_at.h
-spawn.o: ../include/timed_wait.h
-spawn.o: ../include/set_eugid.h
-spawn.o: ../include/mail_params.h
-spawn.o: ../include/mail_server.h
-spawn.o: ../include/mail_conf.h
+spawn.o: ../../include/sys_defs.h
+spawn.o: ../../include/msg.h
+spawn.o: ../../include/argv.h
+spawn.o: ../../include/dict.h
+spawn.o: ../../include/vstream.h
+spawn.o: ../../include/vbuf.h
+spawn.o: ../../include/mymalloc.h
+spawn.o: ../../include/spawn_command.h
+spawn.o: ../../include/split_at.h
+spawn.o: ../../include/timed_wait.h
+spawn.o: ../../include/set_eugid.h
+spawn.o: ../../include/mail_params.h
+spawn.o: ../../include/mail_server.h
+spawn.o: ../../include/mail_conf.h
diff --git a/postfix/src/trivial-rewrite/Makefile.in b/postfix/src/trivial-rewrite/Makefile.in
index 07fc185e2..07421aa83 100644
--- a/postfix/src/trivial-rewrite/Makefile.in
+++ b/postfix/src/trivial-rewrite/Makefile.in
@@ -11,10 +11,10 @@ CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 LIB	= 
 TESTPROG= 
 PROG	= trivial-rewrite
-LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libutil.a
-LIB_DIR	= ../lib
-INC_DIR	= ../include
-BIN_DIR	= ../libexec
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+LIB_DIR	= ../../lib
+INC_DIR	= ../../include
+BIN_DIR	= ../../libexec
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
@@ -24,7 +24,7 @@ $(PROG): $(OBJS) $(LIBS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
@@ -39,7 +39,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 lint:
 	lint $(DEFS) $(SRCS) $(LINTFIX)
@@ -60,74 +60,74 @@ depend: $(MAKES)
 
 # do not edit below this line - it is generated by 'make depend'
 resolve.o: resolve.c
-resolve.o: ../include/sys_defs.h
-resolve.o: ../include/msg.h
-resolve.o: ../include/vstring.h
-resolve.o: ../include/vbuf.h
-resolve.o: ../include/vstream.h
-resolve.o: ../include/vstring_vstream.h
-resolve.o: ../include/split_at.h
-resolve.o: ../include/mail_params.h
-resolve.o: ../include/mail_proto.h
-resolve.o: ../include/iostuff.h
-resolve.o: ../include/mail_addr.h
-resolve.o: ../include/rewrite_clnt.h
-resolve.o: ../include/resolve_local.h
-resolve.o: ../include/mail_conf.h
-resolve.o: ../include/quote_822_local.h
-resolve.o: ../include/tok822.h
-resolve.o: ../include/resolve_clnt.h
+resolve.o: ../../include/sys_defs.h
+resolve.o: ../../include/msg.h
+resolve.o: ../../include/vstring.h
+resolve.o: ../../include/vbuf.h
+resolve.o: ../../include/vstream.h
+resolve.o: ../../include/vstring_vstream.h
+resolve.o: ../../include/split_at.h
+resolve.o: ../../include/mail_params.h
+resolve.o: ../../include/mail_proto.h
+resolve.o: ../../include/iostuff.h
+resolve.o: ../../include/mail_addr.h
+resolve.o: ../../include/rewrite_clnt.h
+resolve.o: ../../include/resolve_local.h
+resolve.o: ../../include/mail_conf.h
+resolve.o: ../../include/quote_822_local.h
+resolve.o: ../../include/tok822.h
+resolve.o: ../../include/resolve_clnt.h
 resolve.o: trivial-rewrite.h
 resolve.o: transport.h
 rewrite.o: rewrite.c
-rewrite.o: ../include/sys_defs.h
-rewrite.o: ../include/msg.h
-rewrite.o: ../include/vstring.h
-rewrite.o: ../include/vbuf.h
-rewrite.o: ../include/vstream.h
-rewrite.o: ../include/vstring_vstream.h
-rewrite.o: ../include/split_at.h
-rewrite.o: ../include/mail_params.h
-rewrite.o: ../include/mail_proto.h
-rewrite.o: ../include/iostuff.h
-rewrite.o: ../include/resolve_local.h
-rewrite.o: ../include/tok822.h
-rewrite.o: ../include/resolve_clnt.h
-rewrite.o: ../include/mail_conf.h
+rewrite.o: ../../include/sys_defs.h
+rewrite.o: ../../include/msg.h
+rewrite.o: ../../include/vstring.h
+rewrite.o: ../../include/vbuf.h
+rewrite.o: ../../include/vstream.h
+rewrite.o: ../../include/vstring_vstream.h
+rewrite.o: ../../include/split_at.h
+rewrite.o: ../../include/mail_params.h
+rewrite.o: ../../include/mail_proto.h
+rewrite.o: ../../include/iostuff.h
+rewrite.o: ../../include/resolve_local.h
+rewrite.o: ../../include/tok822.h
+rewrite.o: ../../include/resolve_clnt.h
+rewrite.o: ../../include/mail_conf.h
 rewrite.o: trivial-rewrite.h
 transport.o: transport.c
-transport.o: ../include/sys_defs.h
-transport.o: ../include/msg.h
-transport.o: ../include/stringops.h
-transport.o: ../include/vstring.h
-transport.o: ../include/vbuf.h
-transport.o: ../include/mymalloc.h
-transport.o: ../include/split_at.h
-transport.o: ../include/dict.h
-transport.o: ../include/vstream.h
-transport.o: ../include/argv.h
-transport.o: ../include/mail_params.h
-transport.o: ../include/maps.h
+transport.o: ../../include/sys_defs.h
+transport.o: ../../include/msg.h
+transport.o: ../../include/stringops.h
+transport.o: ../../include/vstring.h
+transport.o: ../../include/vbuf.h
+transport.o: ../../include/mymalloc.h
+transport.o: ../../include/split_at.h
+transport.o: ../../include/dict.h
+transport.o: ../../include/vstream.h
+transport.o: ../../include/argv.h
+transport.o: ../../include/mail_params.h
+transport.o: ../../include/maps.h
 transport.o: transport.h
 trivial-rewrite.o: trivial-rewrite.c
-trivial-rewrite.o: ../include/sys_defs.h
-trivial-rewrite.o: ../include/msg.h
-trivial-rewrite.o: ../include/vstring.h
-trivial-rewrite.o: ../include/vbuf.h
-trivial-rewrite.o: ../include/vstream.h
-trivial-rewrite.o: ../include/vstring_vstream.h
-trivial-rewrite.o: ../include/split_at.h
-trivial-rewrite.o: ../include/stringops.h
-trivial-rewrite.o: ../include/dict.h
-trivial-rewrite.o: ../include/argv.h
-trivial-rewrite.o: ../include/mail_params.h
-trivial-rewrite.o: ../include/mail_proto.h
-trivial-rewrite.o: ../include/iostuff.h
-trivial-rewrite.o: ../include/resolve_local.h
-trivial-rewrite.o: ../include/mail_conf.h
-trivial-rewrite.o: ../include/resolve_clnt.h
-trivial-rewrite.o: ../include/rewrite_clnt.h
-trivial-rewrite.o: ../include/tok822.h
-trivial-rewrite.o: ../include/mail_server.h
+trivial-rewrite.o: ../../include/sys_defs.h
+trivial-rewrite.o: ../../include/msg.h
+trivial-rewrite.o: ../../include/vstring.h
+trivial-rewrite.o: ../../include/vbuf.h
+trivial-rewrite.o: ../../include/vstream.h
+trivial-rewrite.o: ../../include/vstring_vstream.h
+trivial-rewrite.o: ../../include/split_at.h
+trivial-rewrite.o: ../../include/stringops.h
+trivial-rewrite.o: ../../include/dict.h
+trivial-rewrite.o: ../../include/argv.h
+trivial-rewrite.o: ../../include/mail_params.h
+trivial-rewrite.o: ../../include/mail_proto.h
+trivial-rewrite.o: ../../include/iostuff.h
+trivial-rewrite.o: ../../include/resolve_local.h
+trivial-rewrite.o: ../../include/mail_conf.h
+trivial-rewrite.o: ../../include/resolve_clnt.h
+trivial-rewrite.o: ../../include/rewrite_clnt.h
+trivial-rewrite.o: ../../include/tok822.h
+trivial-rewrite.o: ../../include/mail_server.h
 trivial-rewrite.o: trivial-rewrite.h
 trivial-rewrite.o: transport.h
diff --git a/postfix/src/util/Makefile.in b/postfix/src/util/Makefile.in
index 9ce340a7e..7e7ba4293 100644
--- a/postfix/src/util/Makefile.in
+++ b/postfix/src/util/Makefile.in
@@ -79,15 +79,15 @@ TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
 	vstring vstring_vstream doze select_bug stream_test mac_expand \
 	watchdog unescape hex_quote
 
-LIB_DIR	= ../lib
-INC_DIR	= ../include
+LIB_DIR	= ../../lib
+INC_DIR	= ../../include
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 all: $(LIB)
 
 Makefile: Makefile.in
-	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
+	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../../makedefs; cat $?) >$@
 
 test:	$(TESTPROG)
 
@@ -112,7 +112,7 @@ printfck: $(OBJS) $(PROG)
 	cp *.h printfck
 	sed '1,/^# do not edit/!d' Makefile >printfck/Makefile
 	set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done
-	cd printfck; make "INC_DIR=../../include" `cd ..; ls *.o`
+	cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o`
 
 shar:
 	@shar $(FILES)
diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 99e8762b3..ed7b21722 100644
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -77,6 +77,8 @@
 #define STATFS_IN_SYS_MOUNT_H
 #define HAS_POSIX_REGEXP
 #define NORETURN	void
+#define PRINTFLIKE(x,y)
+#define SCANFLIKE(x,y)
 #define HAS_NETINFO
 #endif
 
@@ -555,6 +557,8 @@ extern int opterr;
 #define WEXITSTATUS(x)	((x).w_retcode)
 #define WTERMSIG(x)	((x).w_termsig)
 #define NORETURN			/* the native compiler */
+#define PRINTFLIKE(x,y)
+#define SCANFLIKE(x,y)
 #endif
 
 #ifdef ReliantUnix543