Revise preprocessor macros for builtin functions.

* doc/mailfromd.texi: Minor change.
* src/builtin/Makefile.am (builtin.h): Depend pn init.m4
(.bi.c): Don't eliminate first #line
* src/builtin/snarf.m4 (MF_BUILTIN_MODULE): New macro.
(MF_INIT): Rewrite.
Revise comments.
* src/builtin/init.m4 (MF_BUILTIN_MODULE): New macro.
(MF_INIT): Remove.

* src/builtin/body.bi: Use MF_BUILTIN_MODULE statement.
* src/builtin/burst.bi: Likewise.
* src/builtin/callout.bi: Likewise.
* src/builtin/ctype.bi: Likewise.
* src/builtin/curhdr.bi: Likewise.
* src/builtin/db.bi: Likewise.
* src/builtin/debug.bi: Likewise.
* src/builtin/dns.bi: Likewise.
* src/builtin/dspam.bi: Likewise.
* src/builtin/email.bi: Likewise.
* src/builtin/from.bi: Likewise.
* src/builtin/geoip.bi: Likewise.
* src/builtin/gethostname.bi: Likewise.
* src/builtin/getopt.bi: Likewise.
* src/builtin/getpw.bi: Likewise.
* src/builtin/gettext.bi: Likewise.
* src/builtin/header.bi: Likewise.
* src/builtin/io.bi: Likewise.
* src/builtin/ipaddr.bi: Likewise.
* src/builtin/macro.bi: Likewise.
* src/builtin/mail.bi: Likewise.
* src/builtin/mbox.bi: Likewise.
* src/builtin/mmq.bi: Likewise.
* src/builtin/msg.bi: Likewise.
* src/builtin/other.bi: Likewise.
* src/builtin/prereq.bi: Likewise.
* src/builtin/progress.bi: Likewise.
* src/builtin/qrnt.bi: Likewise.
* src/builtin/rate.bi: Likewise.
* src/builtin/rcpt.bi: Likewise.
* src/builtin/sa.bi: Likewise.
* src/builtin/sieve.bi: Likewise.
* src/builtin/spf.bi: Likewise.
* src/builtin/sprintf.bi: Likewise.
* src/builtin/string.bi: Likewise.
* src/builtin/syslog.bi: Likewise.
* src/builtin/system.bi: Likewise.
* src/builtin/vars.bi: Likewise.

42 files changed, 465 insertions, 223 deletions

diff --git a/src/builtin/Makefile.am b/src/builtin/Makefile.am
index 2e397f11..7d5db661 100644
--- a/src/builtin/Makefile.am
+++ b/src/builtin/Makefile.am
@@ -76,22 +76,20 @@ AM_CPPFLAGS = \
  -I$(top_srcdir)/lib\
  $(MILTER_INCLUDES)\
  -I$(top_srcdir)/src\
  -I$(top_srcdir)\
  $(DSPAM_CFLAGS)
 
-builtin.h: Makefile.am builtin.def
+builtin.h: Makefile.am builtin.def init.m4
 
 $(BI_FILES:.bi=.c): snarf.m4 init.m4
 
 SUFFIXES = .bi .c .def .h .mfi .mf
 
 M4=m4
 
 .bi.c:
-	$(AM_V_GEN)$(M4) --prefix -s -DSOURCE="$<" $(top_srcdir)/src/builtin/snarf.m4 $< > $@-t && \
-	sed '1{/#line/d;}' $@-t > $@ && \
-	rm $@-t
+	$(AM_V_GEN)$(M4) --prefix -s -DSOURCE="$<" $(top_srcdir)/src/builtin/snarf.m4 $< > $@ 
 
 .def.h:
 	$(AM_V_GEN) $(M4) --prefix $(top_srcdir)/src/builtin/init.m4 $(BI_FILES) $< > $@
 
diff --git a/src/builtin/body.bi b/src/builtin/body.bi
index ab6611ff..8626f122 100644
--- a/src/builtin/body.bi
+++ b/src/builtin/body.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #include "msg.h"
 
 MF_STATE(body)
 MF_DEFUN(body_string, STRING, POINTER text, NUMBER length)
 {
 	size_t off;
@@ -63,7 +65,6 @@ END
 MF_DEFUN(replbody_fd, VOID, NUMBER fd)
 {
 	env_msgmod(env, body_repl_fd, "BODYFD", NULL, _bi_io_fd(env, fd, 0));
 }
 END
 
-MF_INIT
diff --git a/src/builtin/builtin.def b/src/builtin/builtin.def
index ea1b39a4..3595df79 100644
--- a/src/builtin/builtin.def
+++ b/src/builtin/builtin.def
@@ -1,7 +1,7 @@
-/* This file is part of Mailfromd.
+/* This file is part of Mailfromd. -*- C -*-
    Copyright (C) 2010-2018 Sergey Poznyakoff
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3, or (at your option)
    any later version.
diff --git a/src/builtin/burst.bi b/src/builtin/burst.bi
index 34971f3b..ae0bb83c 100644
--- a/src/builtin/burst.bi
+++ b/src/builtin/burst.bi
@@ -13,12 +13,14 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /* Functions for converting RFC-934 digests into MIME messages.
    Largely inspired by MU's mh/burst.c */
+
+MF_BUILTIN_MODULE
 #include <mflib/status.h>
 #include "msg.h"
 #include "global.h"
 
 #define DEFAULT_EB_LEN 2
 
diff --git a/src/builtin/callout.bi b/src/builtin/callout.bi
index 3c3f1586..24f9400f 100644
--- a/src/builtin/callout.bi
+++ b/src/builtin/callout.bi
@@ -12,12 +12,13 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /* Run-time support for callout functions */
+MF_BUILTIN_MODULE
 #include "filenames.h"
 #include "callout.h"
 
 MF_VAR(ehlo_domain, STRING, SYM_PRECIOUS);
 MF_VAR(mailfrom_address, STRING, SYM_PRECIOUS);
 
diff --git a/src/builtin/ctype.bi b/src/builtin/ctype.bi
index e452e25d..faa3e703 100644
--- a/src/builtin/ctype.bi
+++ b/src/builtin/ctype.bi
@@ -11,12 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
 MF_VAR(ctype_mismatch, NUMBER);
 
 m4_define([<MF_DEFUN_CTYPE>],[<
 MF_DEFUN($1, NUMBER, STRING str)
 {
 	int i;
@@ -41,7 +42,6 @@ MF_DEFUN_CTYPE(islower)
 MF_DEFUN_CTYPE(isprint)
 MF_DEFUN_CTYPE(ispunct)
 MF_DEFUN_CTYPE(isspace)
 MF_DEFUN_CTYPE(isupper)
 MF_DEFUN_CTYPE(isxdigit)
 
-MF_INIT
diff --git a/src/builtin/curhdr.bi b/src/builtin/curhdr.bi
index e7dc4606..14430d6c 100644
--- a/src/builtin/curhdr.bi
+++ b/src/builtin/curhdr.bi
@@ -11,12 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
 #include "msg.h"
 
 /* number current_header_count([string name]) */
 MF_STATE(eoh)
 MF_STATE(body)
 MF_STATE(eom)
@@ -145,7 +146,6 @@ MF_DEFUN(current_header, STRING, STRING name, OPTIONAL, NUMBER index)
 			 "mu_header_sget_field_name: %s",
 			 mu_strerror(rc));
 	MF_RETURN(sptr);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/db.bi b/src/builtin/db.bi
index 7186e3c7..8dea160e 100644
--- a/src/builtin/db.bi
+++ b/src/builtin/db.bi
@@ -11,12 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
 #define DEFAULT_DB_MODE 0640
 #include <fnmatch.h>
 
 struct db_prop {                /* Database properties */
 	char *pat;              /* Database name pattern */
 	mode_t mode;            /* File mode */
@@ -964,8 +965,6 @@ MF_DEFUN(db_expire_interval, NUMBER, STRING fmtid)
 		  mfe_not_found,
 		  _("no such db format: %s"), fmtid);
 	MF_RETURN(fmt->expire_interval);
 }
 END
 
-MF_INIT
-
diff --git a/src/builtin/debug.bi b/src/builtin/debug.bi
index e2307946..f9a49c69 100644
--- a/src/builtin/debug.bi
+++ b/src/builtin/debug.bi
@@ -11,12 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
 #include "mflib/_register.h"
 #include "srvcfg.h"
 
 MF_DEFUN(debug_level, NUMBER, OPTIONAL, STRING modname)
 {
 	mu_debug_level_t level;
@@ -129,7 +130,7 @@ MF_INIT([<
    I do that manually, because there is no m4 magic for that
    (so far it is the only built-in alias). */
       va_builtin_install_ex("mailutils_set_debug_level",
 			    bi_debug, 0, dtype_unspecified, 1, 0, 0,
 			    dtype_string);
 >])
-	
+
diff --git a/src/builtin/dns.bi b/src/builtin/dns.bi
index 6a98dfd5..b417a8c1 100644
--- a/src/builtin/dns.bi
+++ b/src/builtin/dns.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #include "srvcfg.h"
 #include "global.h"
@@ -274,7 +276,6 @@ MF_DEFUN(ptr_validate, NUMBER, STRING s)
 			 _("failed to get PTR record for %s"), s);
 	}
 	MF_RETURN(res);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/dspam.bi b/src/builtin/dspam.bi
index cc4b7d23..d1ab7e71 100644
--- a/src/builtin/dspam.bi
+++ b/src/builtin/dspam.bi
@@ -11,12 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
 MF_COND(WITH_DSPAM)
 
 #include "srvcfg.h"
 #undef HAVE_CONFIG_H
 #define CONFIG_DEFAULT "/dev/null"
 #define LOGDIR "/dev/null"
@@ -526,7 +527,6 @@ MF_DEFUN(dspam, NUMBER, NUMBER nmsg, NUMBER mode_flags, OPTIONAL, NUMBER class_s
 	/* FIXME: Any additional processing? */
 
 	MF_RETURN(rc);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/email.bi b/src/builtin/email.bi
index 2d90abcc..a396f24d 100644
--- a/src/builtin/email.bi
+++ b/src/builtin/email.bi
@@ -11,12 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
 #include "mflib/email.h"
 
 MF_DEFUN(domainpart, STRING, STRING str)
 {
 	char *p = strchr(str, '@');
 	MF_RETURN(p ? p+1 : str);
@@ -74,7 +75,6 @@ MF_DEFUN(email_map, NUMBER, STRING str)
 		f |= EMAIL_ROUTE;
 	mu_address_destroy(&addr);
 	MF_RETURN(f);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/from.bi b/src/builtin/from.bi
index 57201520..73a84cd5 100644
--- a/src/builtin/from.bi
+++ b/src/builtin/from.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 MF_DEFUN(set_from, VOID, STRING addr, OPTIONAL, STRING args)
 {
 	struct mu_locus_range locus;
 
 	env_get_locus(env, &locus);
 
@@ -26,7 +28,6 @@ MF_DEFUN(set_from, VOID, STRING addr, OPTIONAL, STRING args)
 	      msgmod_opcode_str(set_from),
 	      addr);
 	env_msgmod(env, set_from, addr, MF_OPTVAL(args, NULL), 0);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/geoip.bi b/src/builtin/geoip.bi
index b2dcad93..c40a1845 100644
--- a/src/builtin/geoip.bi
+++ b/src/builtin/geoip.bi
@@ -11,12 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
 MF_COND(WITH_GEOIP)
 #include <GeoIP.h>
 
 MF_DEFUN(geoip_country_code_by_addr, STRING, STRING ip,
 	 OPTIONAL, NUMBER tlc)
 {
@@ -52,8 +53,6 @@ MF_DEFUN(geoip_country_code_by_name, STRING, STRING name,
 		  mfe_not_found,
 		  _("country code not found"));
 	MF_RETURN(ret);
 }
 END
 
-MF_INIT
-
diff --git a/src/builtin/gethostname.bi b/src/builtin/gethostname.bi
index 3d616683..9914a574 100644
--- a/src/builtin/gethostname.bi
+++ b/src/builtin/gethostname.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #ifndef ENAMETOOLONG
 # define ENAMETOOLONG 0
 #endif
 
 #ifndef INITIAL_HOSTNAME_LENGTH
 # define INITIAL_HOSTNAME_LENGTH 34
@@ -131,8 +133,7 @@ MF_DEFUN(getdomainname, STRING)
 		}
 		size = nsize;
 	}
 	MF_RETURN_OBSTACK();
 }
 END
-		
-MF_INIT
+
diff --git a/src/builtin/getopt.bi b/src/builtin/getopt.bi
index 3303052e..e50f3eb0 100644
--- a/src/builtin/getopt.bi
+++ b/src/builtin/getopt.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <getopt.h>
 
 MF_VAR(optarg, STRING);
 MF_VAR(optind, NUMBER);
diff --git a/src/builtin/getpw.bi b/src/builtin/getpw.bi
index a148a713..7e127198 100644
--- a/src/builtin/getpw.bi
+++ b/src/builtin/getpw.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 static void
 return_passwd(eval_environ_t env, struct passwd *pw)
 {
 	char buf[NUMERIC_BUFSIZE_BOUND];
 	
 	MF_OBSTACK_GROW(pw->pw_name);
@@ -72,8 +74,6 @@ MF_DEFUN(getpwuid, STRING, NUMBER uid)
 	MF_OBSTACK_BEGIN();
 	return_passwd(env, pw);
 	MF_RETURN_OBSTACK();
 }
 END
 
-
-MF_INIT
diff --git a/src/builtin/gettext.bi b/src/builtin/gettext.bi
index 070c294e..329feae9 100644
--- a/src/builtin/gettext.bi
+++ b/src/builtin/gettext.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 MF_DEFUN(bindtextdomain, STRING, STRING domain, STRING dirname)
 {
 	const char *s = bindtextdomain(domain[0] ? domain : NULL, dirname);
 	MF_ASSERT(s != NULL,
 		  mfe_failure,
 		  "bindtextdomain failed: %s", mu_strerror(errno));
@@ -34,9 +36,6 @@ MF_DEFUN(dngettext, STRING, STRING domain,
          STRING msgid, STRING msgid_plural, NUMBER n)
 {
 	MF_RETURN(dngettext(domain, msgid, msgid_plural, n));
 }
 END
 
-MF_INIT
-
-
diff --git a/src/builtin/header.bi b/src/builtin/header.bi
index 2922157e..e46183df 100644
--- a/src/builtin/header.bi
+++ b/src/builtin/header.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 MF_DEFUN(header_add, VOID, STRING name, STRING value, OPTIONAL, NUMBER idx)
 {
 	struct mu_locus_range locus;
 
 	env_get_locus(env, &locus);
 
@@ -114,7 +116,6 @@ MF_DEFUN(header_replace_nth, VOID, NUMBER idx, STRING name, STRING value)
 	      msgmod_opcode_str(header_replace_nth),
 	      name, value, idx);
 	env_msgmod(env, header_replace_nth, name, value, idx);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/init.m4 b/src/builtin/init.m4
index 64cdd9d7..73168b58 100644
--- a/src/builtin/init.m4
+++ b/src/builtin/init.m4
@@ -15,18 +15,12 @@ m4_divert(-1)
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_changequote([<,>])
 m4_changecom(/*,*/)
 
-m4_define([<MF_MODULE_NAME>],[<m4_dnl
-m4_patsubst(m4___file__,\(.*/\)?\(.*\)\.bi,\2)>])
-
-m4_define([<MF_MODULE_IDX>],[<m4_dnl
-[<BUILTIN_IDX_>]MF_MODULE_NAME()>])
-
 m4_define([<__MODNO__>],0)
 
 m4_define([<MF_BEGIN_OUTPUT>],[<m4_dnl
 m4_divert(0)m4_dnl
 /* -*- buffer-read-only: t -*- vi: set ro:
    THIS FILE IS GENERATED AUTOMATICALLY.  PLEASE DO NOT EDIT.
@@ -48,16 +42,19 @@ static struct builtin_module builtin_module[] = {
 m4_undivert(3)
 	{ NULL, NULL }
 };
 #define BUILTIN_IDX_MAX (sizeof(builtin_module)/sizeof(builtin_module[0])-1)
 >])
 
-m4_define([<MF_INIT>],[<m4_dnl
-m4_pushdef([<MODNAME>],MF_MODULE_NAME())
+m4_define([<MF_BUILTIN_MODULE>],
+[<m4_pushdef([<MF_MODULE_NAME>],
+m4_ifelse([<$1>],,[<m4_dnl
+m4_patsubst(m4___file__,\(.*/\)?\(.*\)\.bi,\2)>],[<$1>]))
+m4_pushdef([<MF_MODULE_IDX>],[<[<BUILTIN_IDX_>]MF_MODULE_NAME()>])
 m4_define([<__MODNO__>],m4_incr(__MODNO__))
 m4_divert(1)m4_dnl
 #define MF_MODULE_IDX (__MODNO__)
 m4_divert(2)m4_dnl
-extern void MODNAME[<>]_init_builtin(void);
+extern void MF_MODULE_NAME[<>]_init_builtin(void);
 m4_divert(3)m4_dnl
-	{ "MODNAME", MODNAME[<>]_init_builtin, 0 },
-m4_divert(-1)m4_dnl>])
+	{ "MF_MODULE_NAME", MF_MODULE_NAME[<>]_init_builtin, 0 },
+m4_divert(-1)>])
diff --git a/src/builtin/io.bi b/src/builtin/io.bi
index 2ca80e2a..d1512ad8 100644
--- a/src/builtin/io.bi
+++ b/src/builtin/io.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #include <mflib/status.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include "global.h"
 #include "msg.h"
diff --git a/src/builtin/ipaddr.bi b/src/builtin/ipaddr.bi
index 9ede3b4d..a586342c 100644
--- a/src/builtin/ipaddr.bi
+++ b/src/builtin/ipaddr.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 MF_DEFUN(ntohl, NUMBER, NUMBER n)
 {
@@ -94,9 +96,6 @@ MF_DEFUN(netmask_to_len, NUMBER, NUMBER x)
 		n >>= 1;
 	}
 	MF_RETURN(i);
 }
 END
 
-MF_INIT
-
-
diff --git a/src/builtin/macro.bi b/src/builtin/macro.bi
index 757bbf8f..2d41ff71 100644
--- a/src/builtin/macro.bi
+++ b/src/builtin/macro.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 /* #pragma miltermacros <handler> <name> [name...] */
 MF_PRAGMA(miltermacros, 3, 0)
 {
 	enum smtp_state state;
 	int i = 1;
 	
@@ -43,7 +45,6 @@ MF_DEFUN(macro_defined, NUMBER, STRING name)
 {
 	int ret = !!env_get_macro(env, name);
 	MF_RETURN(ret);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/mail.bi b/src/builtin/mail.bi
index dc7ea34b..edf21b3b 100644
--- a/src/builtin/mail.bi
+++ b/src/builtin/mail.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #include "msg.h"
 
 static int
 _send(eval_environ_t env,
       const char *mailer_url, char *to, char *from, mu_message_t msg,
       void (*destroy)(void*), void *ptr)
@@ -332,7 +334,6 @@ MF_DEFUN(send_dsn, VOID, STRING to,
 	add_headers(newmsg, MF_OPTVAL(headers, NULL));
 	_send(env, MF_OPTVAL(mailer_url, NULL), to, 
               MF_OPTVAL(from, NULL), newmsg, _destroy_mime, mime);
 }
 END
 
-MF_INIT
diff --git a/src/builtin/mbox.bi b/src/builtin/mbox.bi
index a0226ce2..df4f3ec2 100644
--- a/src/builtin/mbox.bi
+++ b/src/builtin/mbox.bi
@@ -11,12 +11,14 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 #include "msg.h"
 #include "global.h"
 
 static size_t nmboxes = MAX_MBOXES;
 
 static struct mu_cfg_param mbox_cfg_param[] = {
diff --git a/src/builtin/mmq.bi b/src/builtin/mmq.bi
index c9c24bc5..5ad0e32c 100644
--- a/src/builtin/mmq.bi
+++ b/src/builtin/mmq.bi
@@ -11,18 +11,19 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+MF_BUILTIN_MODULE
+
 /* Clear the list of message modification requests. This function undoes
    the effect of the following functions, if they had been called
    previously: rcpt_add, rcpt_delete, header_add, header_insert,
    header_delete, header_replace, replbody, quarantine */
     
 MF_DEFUN(mmq_purge, VOID)
 {
 	env_clear_msgmod(env);
 }
 END
 
-MF_INIT
diff --git a/src/b