move Envelope to library

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 0a733a7f28d22958a522e4f63b57e185dbf55c51..bd80b14676fe6bd371d71e1aca06387bbf9e0f17 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -64,7 +64,7 @@ NEOMUTT=      neomutt$(EXEEXT)
 NEOMUTTOBJS=   addrbook.o alias.o attach.o bcache.o body.o browser.o buffy.o \
                color.o commands.o complete.o compose.o compress.o \
                conststrings.o copy.o curs_lib.o curs_main.o edit.o editmsg.o \
-               enriched.o enter.o envelope.o filter.o flags.o from.o group.o handler.o \
+               enriched.o enter.o filter.o flags.o from.o group.o handler.o \
                hdrline.o header.o help.o history.o hook.o init.o keymap.o \
                main.o mbox.o menu.o mh.o muttlib.o mutt_account.o \
                mutt_logging.o mutt_signal.o mutt_socket.o mutt_window.o mx.o newsrc.o \
@@ -93,7 +93,7 @@ ALLOBJS+=     $(NEOMUTTOBJS)
 # libmutt
 LIBMUTT=       libmutt.a
 LIBMUTTOBJS=   mutt/address.o mutt/base64.o mutt/buffer.o mutt/charset.o \
-               mutt/date.o mutt/envlist.o mutt/exit.o mutt/file.o mutt/hash.o \
+               mutt/date.o mutt/envelope.o mutt/envlist.o mutt/exit.o mutt/file.o mutt/hash.o \
                mutt/idna.o mutt/list.o mutt/logging.o mutt/mapping.o \
                mutt/mbyte.o mutt/md5.o mutt/memory.o mutt/mime.o \
                mutt/parameter.o mutt/regex.o mutt/rfc2047.o mutt/sha1.o \
@@ -265,13 +265,13 @@ git_ver.h: $(ALL_FILES)
 hcache/hcversion.h:    $(SRCDIR)/mutt.h $(SRCDIR)/mutt/address.h \
                        $(SRCDIR)/mutt/list.h $(SRCDIR)/mutt/buffer.h \
                        $(SRCDIR)/mutt/parameter.h $(SRCDIR)/body.h \
-                       $(SRCDIR)/envelope.h $(SRCDIR)/header.h \
+                       $(SRCDIR)/mutt/envelope.h $(SRCDIR)/header.h \
                        $(SRCDIR)/hcache/hcachever.sh
        $(MKDIR_P) $(PWD)/hcache
        ( echo '#include "config.h"'; echo '#include "mutt.h"'; \
        echo '#include "mutt/address.h"'; echo '#include "mutt/list.h"'; \
        echo '#include "mutt/buffer.h"'; echo '#include "mutt/parameter.h"'; \
-       echo '#include "body.h"'; echo '#include "envelope.h"'; \
+       echo '#include "body.h"'; echo '#include "mutt/envelope.h"'; \
        echo '#include "header.h"';) | $(CPP) $(CFLAGS) - | \
        sh $(SRCDIR)/hcache/hcachever.sh hcache/hcversion.h
 

diff --git a/alias.c b/alias.c
index 6c884f5a4360addc95d281dbb7b705a6b4ec2038..d51ee4c40265d27d0f75f8d5ea07d19c7f45ff80 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -32,7 +32,6 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "alias.h"
-#include "envelope.h"
 #include "globals.h"
 #include "mutt_curses.h"
 #include "options.h"

diff --git a/buffy.c b/buffy.c
index ab89026f7bd1cc89d84120f154d08435f7520092..8eb209e2dad7306b5c376c8e981199d8af427d87 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -33,7 +33,6 @@
 #include "conn/conn.h"
 #include "buffy.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/commands.c b/commands.c
index bdb12a15c397d52efccd32f8e27b5d896595c23a..47241ebd747011aa2f41df73a635335a77cc8103 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -37,7 +37,6 @@
 #include "buffy.h"
 #include "context.h"
 #include "copy.h"
-#include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/compose.c b/compose.c
index d21106e89ec0a05ef4ce6c4cfcbdd69ca19fe8b4..960997150a300b825d10490eaff056074a7e2a38 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -37,7 +37,6 @@
 #include "body.h"
 #include "content.h"
 #include "context.h"
-#include "envelope.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "header.h"

diff --git a/copy.c b/copy.c
index 54b5c3ad7293d2cc45ac589353278195e88cf57f..12d02570d5097e9810cc496f11ddb8ecbab264e5 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -36,7 +36,6 @@
 #include "copy.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "handler.h"
 #include "header.h"

diff --git a/curs_main.c b/curs_main.c
index e2fc119d8b2ad156a00806e6c59e293b87575397..00cc73b2dd70d3dced2dc7d1569db36e83658b82 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -35,7 +35,6 @@
 #include "body.h"
 #include "buffy.h"
 #include "context.h"
-#include "envelope.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "header.h"

diff --git a/edit.c b/edit.c
index 8fe7b71d5e5b3c009828143102c64b58cd6af53c..cd480e30d6ab6d115ee602f428df99e888020688 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -34,7 +34,6 @@
 #include "alias.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mutt_curses.h"

diff --git a/hcache/hcache.c b/hcache/hcache.c
index 27ddfa6e4897359a017aa6c78d75f1c9bc1144b1..073e166cfb2f7e4b6241aa0490ac41ed312d7ab9 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -50,7 +50,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "body.h"
-#include "envelope.h"
 #include "globals.h"
 #include "hcache.h"
 #include "hcache/hcversion.h"

diff --git a/hdrline.c b/hdrline.c
index cb9cf845b278e4464edbabfb2a535d69a0300b81..f5414cb8577af7f01e0f93038eb1e3ac727dc8ec 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -33,7 +33,6 @@
 #include "mutt.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "header.h"

diff --git a/header.c b/header.c
index 2af55222a4e131e051b6dfa97d6ec7e9cfc8792a..f838bfe1c9d51f1a268edd7e39d2655c315143de 100644 (file)
--- a/header.c
+++ b/header.c
@@ -33,7 +33,6 @@
 #include "alias.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"

diff --git a/hook.c b/hook.c
index b329db8b0f463fad9910e578649b1d936dad0ed3..9646cd2170b8f5ae468d048b69c4560a105d9a1c 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -35,7 +35,6 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/imap/imap.c b/imap/imap.c
index 09ef50cbc88abcabcd0853c76c969a7388691ad5..e7fe8e66f84c906417c93f45b0a612e6e19dfd4c 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -47,7 +47,6 @@
 #include "body.h"
 #include "buffy.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/imap/message.c b/imap/message.c
index 62bace9a752c7d35bdaaa4daad0f209590ec90a3..a08092227b53ab0076e4204f196c142ad97b5a58 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -42,7 +42,6 @@
 #include "bcache.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "imap/imap.h"

diff --git a/init.c b/init.c
index ac49cd4b0606ee308a3996c9c8608f89691f48ac..3829bd19a23ba0d8add88d35987f3960c3e6a13a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -39,7 +39,6 @@
 #include "init.h"
 #include "alias.h"
 #include "context.h"
-#include "envelope.h"
 #include "filter.h"
 #include "group.h"
 #include "hcache/hcache.h"

diff --git a/main.c b/main.c
index f7cd9a4930d83b5addde2a84736863e1ed7fbcbb..081602b924376393782ee55317e90d5675220d2b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -47,7 +47,6 @@
 #include "alias.h"
 #include "body.h"
 #include "buffy.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "keymap.h"

diff --git a/mbox.c b/mbox.c
index f95fa3380cac8602aec8a671f63eb4d2cf242d91..df94b10dccb21113dc98f7b5f1e935654c31c4af 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -38,7 +38,6 @@
 #include "buffy.h"
 #include "context.h"
 #include "copy.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/mh.c b/mh.c
index ca8faff4660d63fdbd603e6ead11598f3c3ab0b9..68d2d5369c1644cc658523396df8f9a1e1b23208 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -44,7 +44,6 @@
 #include "buffy.h"
 #include "context.h"
 #include "copy.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/envelope.c b/mutt/envelope.c
similarity index 98%
rename from envelope.c
rename to mutt/envelope.c
index f2576c12b199d760b098715c45b74187f6584266..db732d9e5fb8a5ce6ec0eeefaf8848f868fd96cb 100644 (file)
--- a/envelope.c
+++ b/mutt/envelope.c
@@ -28,9 +28,14 @@
 
 #include "config.h"
 #include <stddef.h>
-#include "mutt/mutt.h"
+#include <stdbool.h>
 #include "envelope.h"
-#include "protos.h"
+#include "address.h"
+#include "buffer.h"
+#include "list.h"
+#include "memory.h"
+#include "queue.h"
+#include "string2.h"
 
 /**
  * mutt_env_new - Create a new Envelope

diff --git a/envelope.h b/mutt/envelope.h
similarity index 99%
rename from envelope.h
rename to mutt/envelope.h
index 07fde699907a7ae81d60200052d356afe1b1f5f3..8f998e7a377d896c19431457bb5c5d5335c55b4a 100644 (file)
--- a/envelope.h
+++ b/mutt/envelope.h
@@ -24,7 +24,7 @@
 #define _MUTT_ENVELOPE_H
 
 #include <stdbool.h>
-#include "mutt/mutt.h"
+#include "list.h"
 
 /**
  * struct Envelope - The header of an email

diff --git a/mutt/mutt.h b/mutt/mutt.h
index 98bfdaa107a9bd5f9c9b8fd50ed2a0823ea154ea..76e91e8bc821b172f1389d82521b31f186e76997 100644 (file)
--- a/mutt/mutt.h
+++ b/mutt/mutt.h
@@ -32,6 +32,7 @@
  * | mutt/buffer.c    | @subpage buffer    |
  * | mutt/charset.c   | @subpage charset   |
  * | mutt/date.c      | @subpage date      |
+ * | mutt/envelope.c  | @subpage envelope  |
  * | mutt/envlist.c   | @subpage envlist   |
  * | mutt/exit.c      | @subpage exit      |
  * | mutt/file.c      | @subpage file      |
@@ -63,8 +64,9 @@
 #include "buffer.h"
 #include "charset.h"
 #include "date.h"
-#include "exit.h"
+#include "envelope.h"
 #include "envlist.h"
+#include "exit.h"
 #include "file.h"
 #include "hash.h"
 #include "idna2.h"

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index d44bda43f5ecfbc8296014a047979594a65b24fd..3c1276e52fe11375ee074fd9bd5dde7e95894685 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -53,7 +53,6 @@
 #include "body.h"
 #include "buffy.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/muttlib.c b/muttlib.c
index 264c5677afe4efad319805e394ef7ae5866bcb41..0970e23ccf7b02d1a13c76e32cc59ee042b72f7b 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -44,7 +44,6 @@
 #include "mutt.h"
 #include "alias.h"
 #include "body.h"
-#include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/mx.c b/mx.c
index 9bb7d0ee971bd7a402f26b81ae72ecd159e0549e..a5b846a2ad5162f25d77711195103fc8367c4da1 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -43,7 +43,6 @@
 #include "buffy.h"
 #include "context.h"
 #include "copy.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "keymap.h"

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index a70cf0ee124c8cc2bd0659c4b14a4f2e3e6488db..2dba1fdb6ee401da48f12fe22372fddda7f65445 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -46,7 +46,6 @@
 #include "context.h"
 #include "copy.h"
 #include "cryptglue.h"
-#include "envelope.h"
 #include "globals.h"
 #include "handler.h"
 #include "header.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 83d9caa5780fa5a8c5f5954972cb15468aac0969..a1157f21ab679204f408d887cd7f91a50a72a286 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -53,7 +53,6 @@
 #include "alias.h"
 #include "body.h"
 #include "crypt.h"
-#include "envelope.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "handler.h"

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 8f06ab652f926dc864eb8242d7217567b42d7eac..e4ffe26de45b49b6d05b6e05961b21d4fdcc919b 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -43,7 +43,6 @@
 #include "copy.h"
 #include "crypt.h"
 #include "cryptglue.h"
-#include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/nntp.c b/nntp.c
index 71a810a7687bb319854c20c0576c9a4e6b41b6cd..36732787a297be5ccd25496d8ee5e0a12dddf3b5 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -41,7 +41,6 @@
 #include "bcache.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/pager.c b/pager.c
index dd8dc6a0a451ea0d2d3f18d0e65d8ca2a882a07b..c21af6fe48c2180bd4024c151d35a3fb07a73080 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -39,7 +39,6 @@
 #include "attach.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "header.h"

diff --git a/parse.c b/parse.c
index c9a22f44e86ff44f123933ff2cdedbef420cb163..6e6966a0c3ab05cc2617fef0c1d1cd1de37c76f6 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -31,7 +31,6 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "body.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/pattern.c b/pattern.c
index a1ec27b540afc595de6af3c0531784cef5b63d3d..ed7d2a756327223e5fee46bd5366eecead3f4797 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -40,7 +40,6 @@
 #include "body.h"
 #include "context.h"
 #include "copy.h"
-#include "envelope.h"
 #include "globals.h"
 #include "group.h"
 #include "handler.h"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f980168d78eb1a56ba6bde8d39c2672d9b84908f..55aba6b01e22e9b0cae863115ab837a1cb960aee 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,6 @@ edit.c
 editmsg.c
 enriched.c
 enter.c
-envelope.c
 filter.c
 flags.c
 from.c
@@ -68,6 +67,7 @@ mutt/base64.c
 mutt/buffer.c
 mutt/charset.c
 mutt/date.c
+mutt/envelope.c
 mutt/envlist.c
 mutt/exit.c
 mutt/file.c
@@ -86,7 +86,6 @@ mutt/rfc2047.c
 mutt/sha1.c
 mutt/signal.c
 mutt/string.c
-muttlib.c
 mutt_account.c
 mutt_logging.c
 mutt_lua.c
@@ -94,15 +93,16 @@ mutt_notmuch.c
 mutt_signal.c
 mutt_socket.c
 mutt_window.c
+muttlib.c
 mx.c
 ncrypt/crypt.c
-ncrypt/cryptglue.c
 ncrypt/crypt_gpgme.c
 ncrypt/crypt_mod.c
 ncrypt/crypt_mod_pgp_classic.c
 ncrypt/crypt_mod_pgp_gpgme.c
 ncrypt/crypt_mod_smime_classic.c
 ncrypt/crypt_mod_smime_gpgme.c
+ncrypt/cryptglue.c
 ncrypt/gnupgparse.c
 ncrypt/pgp.c
 ncrypt/pgpinvoke.c

diff --git a/pop.c b/pop.c
index c52585abe7d08ffcf04e5726599e0c67207b2d7d..aef7d651ec9e60059d6a8cef29956964f2494745 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -41,7 +41,6 @@
 #include "bcache.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"

diff --git a/postpone.c b/postpone.c
index 125d40ef469bba86ed6c4e0521509cb37761b72a..3c62a932a411b2fdd548b4ac047586f60b698ab3 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -40,7 +40,6 @@
 #include "mutt.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "handler.h"

diff --git a/query.c b/query.c
index 2f4f2cd41d19a85eaba8a6e2e76cff0251c6e781..ffc90126cb6c3a811ac1dad93a0f063541f6ee56 100644 (file)
--- a/query.c
+++ b/query.c
@@ -30,7 +30,6 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "alias.h"
-#include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/recvattach.c b/recvattach.c
index 8f8ec04f20860e4cdee1955b05aef555c8f66a3c..aa60d79b2ad78dd08efd9ba45e61d59516cc20de 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -33,7 +33,6 @@
 #include "attach.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/recvcmd.c b/recvcmd.c
index 4558a15172c39c1d3310ec58b86a1db40a21bd72..c9a16e540a331fceb0a12e489adbf72a8ee9e6b6 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -31,7 +31,6 @@
 #include "attach.h"
 #include "body.h"
 #include "copy.h"
-#include "envelope.h"
 #include "globals.h"
 #include "handler.h"
 #include "header.h"

diff --git a/remailer.c b/remailer.c
index 0ec1f434085a87873c0be4d098e98e1f982a25fb..daaddcdc6ac465849471bea6639895392e2d96f8 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -30,7 +30,6 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "remailer.h"
-#include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/send.c b/send.c
index 05706c285f8b657881595335d8d5a16a6224a145..fd80df9dec024ddfdb6ef839f5102e76a6ab4ba2 100644 (file)
--- a/send.c
+++ b/send.c
@@ -37,7 +37,6 @@
 #include "body.h"
 #include "context.h"
 #include "copy.h"
-#include "envelope.h"
 #include "filter.h"
 #include "globals.h"
 #include "header.h"

diff --git a/sendlib.c b/sendlib.c
index db2e234a31f007bb9d4f87284a876ad740ae9b50..b760703ea27d6f2398b8f63d4ca2846d7185d19c 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -42,7 +42,6 @@
 #include "content.h"
 #include "context.h"
 #include "copy.h"
-#include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/sort.c b/sort.c
index 1b4312cec125e9a5af4d0eef48f869f125d2d4a2..3384cd06195f9fdc1639b19b759c95af793a42ce 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -28,7 +28,6 @@
 #include "sort.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "options.h"

diff --git a/thread.c b/thread.c
index d66ff685fb8633806efe600c847c239e69a87476..07b77ffd6d2f47bf50a4768b6b2f43e263eef4da 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -31,7 +31,6 @@
 #include "thread.h"
 #include "body.h"
 #include "context.h"
-#include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "options.h"

diff --git a/url.c b/url.c
index 8a36a1a08e68a0cd66f129a681c18e6631b92725..1b443da771de8c754ccf829fe10261352ac064a5 100644 (file)
--- a/url.c
+++ b/url.c
@@ -27,7 +27,6 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "url.h"
-#include "envelope.h"
 #include "globals.h"
 #include "protos.h"
 #include "rfc2047.h"