From: Richard Russon <rich@flatcap.org>
Date: Sun, 8 Jul 2018 15:00:51 +0000 (+0100)
Subject: split protos.h 3
X-Git-Tag: 2019-10-25~758^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a45620090694ee114c5e67b9d525b78c03bce8b;p=neomutt

split protos.h 3
---

diff --git a/addrbook.c b/addrbook.c
index a76825b78..00528123b 100644
--- a/addrbook.c
+++ b/addrbook.c
@@ -34,6 +34,7 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
+#include "curs_lib.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "keymap.h"
diff --git a/alias.c b/alias.c
index 43a477197..5baf8dc1c 100644
--- a/alias.c
+++ b/alias.c
@@ -34,11 +34,15 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
+#include "addrbook.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "hdrline.h"
 #include "mutt_curses.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
+#include "sendlib.h"
 
 /**
  * expand_aliases_r - Expand aliases, recursively
diff --git a/bcache.c b/bcache.c
index a95485f23..025ca77f9 100644
--- a/bcache.c
+++ b/bcache.c
@@ -33,6 +33,7 @@
 #include "bcache.h"
 #include "globals.h"
 #include "mutt_account.h"
+#include "muttlib.h"
 #include "protos.h"
 #include "url.h"
 
diff --git a/browser.c b/browser.c
index 46aa01324..086cd1818 100644
--- a/browser.c
+++ b/browser.c
@@ -56,6 +56,7 @@
 #include "opcodes.h"
 #include "options.h"
 #include "protos.h"
+#include "sendlib.h"
 #include "sort.h"
 #include "url.h"
 #ifdef USE_IMAP
diff --git a/buffy.c b/buffy.c
index a4333f564..dae68fe9c 100644
--- a/buffy.c
+++ b/buffy.c
@@ -31,6 +31,7 @@
 #include <utime.h>
 #include "mutt/mutt.h"
 #include "email/email.h"
+#include "mutt.h"
 #include "buffy.h"
 #include "context.h"
 #include "globals.h"
@@ -38,8 +39,10 @@
 #include "maildir/maildir.h"
 #include "menu.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
diff --git a/color.c b/color.c
index cba681a64..77c00ee4d 100644
--- a/color.c
+++ b/color.c
@@ -29,6 +29,7 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt.h"
+#include "color.h"
 #include "context.h"
 #include "globals.h"
 #include "keymap.h"
diff --git a/commands.c b/commands.c
index 560839890..66fae3198 100644
--- a/commands.c
+++ b/commands.c
@@ -42,18 +42,22 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "hdrline.h"
+#include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
+#include "parse.h"
 #include "protos.h"
 #include "recvattach.h"
+#include "sendlib.h"
 #include "sort.h"
 #ifdef USE_IMAP
 #include "imap/imap.h"
diff --git a/complete.c b/complete.c
index d3f71db28..80c262a50 100644
--- a/complete.c
+++ b/complete.c
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 #include "mutt/mutt.h"
 #include "globals.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
 #ifdef USE_IMAP
diff --git a/compose.c b/compose.c
index 1316d057c..c2fdc3b59 100644
--- a/compose.c
+++ b/compose.c
@@ -36,12 +36,14 @@
 #include "compose.h"
 #include "alias.h"
 #include "browser.h"
+#include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "curs_main.h"
 #include "edit.h"
 #include "format_flags.h"
 #include "globals.h"
+#include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"
@@ -55,8 +57,10 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
 #include "recvattach.h"
+#include "sendlib.h"
 #include "sort.h"
 #ifdef ENABLE_NLS
 #include <libintl.h>
diff --git a/compress.c b/compress.c
index 8fac96c7a..9a9d9dc67 100644
--- a/compress.c
+++ b/compress.c
@@ -38,8 +38,10 @@
 #include "mutt.h"
 #include "compress.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "format_flags.h"
 #include "globals.h"
+#include "hook.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "muttlib.h"
diff --git a/conn/conn.h b/conn/conn.h
index 9783dcd1c..a4d0163b9 100644
--- a/conn/conn.h
+++ b/conn/conn.h
@@ -41,6 +41,8 @@
 #ifndef _CONN_CONN_H
 #define _CONN_CONN_H
 
+#include <stdio.h>
+
 #include "account.h"
 #include "conn_globals.h"
 #include "connection.h"
@@ -52,4 +54,6 @@
 #include "sasl.h"
 #endif
 
+int getdnsdomainname(char *d, size_t len);
+
 #endif /* _CONN_CONN_H */
diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 74d4dc3db..02b67fd06 100644
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -44,6 +44,7 @@
 #include <unistd.h>
 #include "conn_globals.h"
 #include "connection.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "options.h"
 #include "protos.h"
diff --git a/conn/sasl.c b/conn/sasl.c
index 30aa0b744..9320cbf9d 100644
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -53,6 +53,7 @@
 #include "sasl.h"
 #include "account.h"
 #include "connection.h"
+#include "curs_lib.h"
 #include "mutt_account.h"
 #include "options.h"
 #include "protos.h"
diff --git a/conn/ssl.c b/conn/ssl.c
index de4334985..2077444db 100644
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -61,6 +61,7 @@
 #include "menu.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
+#include "muttlib.h"
 #include "opcodes.h"
 #include "options.h"
 #include "protos.h"
diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index 20b905b6e..6d4a035f6 100644
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -44,6 +44,7 @@
 #include "keymap.h"
 #include "menu.h"
 #include "mutt_account.h"
+#include "muttlib.h"
 #include "opcodes.h"
 #include "options.h"
 #include "protos.h"
diff --git a/copy.c b/copy.c
index 85dce0259..695778cf8 100644
--- a/copy.c
+++ b/copy.c
@@ -47,6 +47,7 @@
 #include "options.h"
 #include "protos.h"
 #include "rfc2047.h"
+#include "sendlib.h"
 #include "state.h"
 #ifdef USE_NOTMUCH
 #include "notmuch/mutt_notmuch.h"
diff --git a/curs_lib.c b/curs_lib.c
index 89a40564d..f4fb47e5f 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -49,6 +49,7 @@
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "opcodes.h"
 #include "options.h"
 #include "pager.h"
diff --git a/curs_lib.h b/curs_lib.h
index d0121aef6..d5e204ddb 100644
--- a/curs_lib.h
+++ b/curs_lib.h
@@ -26,6 +26,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <wchar.h>
+#include "mutt.h"
 
 struct Context;
 struct Pager;
@@ -69,4 +70,9 @@ void         mutt_unget_string(char *s);
 size_t       mutt_wstr_trunc(const char *src, size_t maxlen, size_t maxwid, size_t *width);
 int          mutt_yesorno(const char *msg, int def);
 
+#define mutt_enter_fname(A, B, C, D)   mutt_enter_fname_full(A, B, C, D, 0, NULL, NULL, 0)
+#define mutt_enter_vfolder(A, B, C, D) mutt_enter_fname_full(A, B, C, D, 0, NULL, NULL, MUTT_SEL_VFOLDER)
+#define mutt_get_field(A, B, C, D)     mutt_get_field_full(A, B, C, D, 0, NULL, NULL)
+#define mutt_get_password(A, B, C)     mutt_get_field_unbuffered(A, B, C, MUTT_PASS)
+
 #endif /* MUTT_CURS_LIB_H */
diff --git a/curs_main.c b/curs_main.c
index d4793e15d..c70ec99b7 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -42,6 +42,7 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "hdrline.h"
+#include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"
@@ -50,6 +51,7 @@
 #include "mutt_logging.h"
 #include "mutt_thread.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
diff --git a/edit.c b/edit.c
index 0a9c5d147..05aeceb5e 100644
--- a/edit.c
+++ b/edit.c
@@ -34,11 +34,13 @@
 #include "email/email.h"
 #include "alias.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "hdrline.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
 
diff --git a/editmsg.c b/editmsg.c
index c691ac508..722e4d774 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -40,8 +40,10 @@
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "mailbox.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "options.h"
 #include "protos.h"
diff --git a/enter.c b/enter.c
index b13acb8e3..3473ccce7 100644
--- a/enter.c
+++ b/enter.c
@@ -45,6 +45,7 @@
 #include "keymap.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "opcodes.h"
 #include "protos.h"
 #include "query.h"
diff --git a/group.c b/group.c
index 2dcaccbd0..c1e4142c3 100644
--- a/group.c
+++ b/group.c
@@ -29,6 +29,7 @@
 #include "group.h"
 #include "globals.h"
 #include "protos.h"
+#include "send.h"
 
 struct Group *mutt_pattern_group(const char *k)
 {
diff --git a/handler.c b/handler.c
index 7fa4faa13..3d3c5c03b 100644
--- a/handler.c
+++ b/handler.c
@@ -43,9 +43,11 @@
 #include "keymap.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
+#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
 #include "recvattach.h"
 #include "rfc1524.h"
diff --git a/hcache/hcache.c b/hcache/hcache.c
index 46799a4ae..c31bcf556 100644
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -33,6 +33,7 @@
 
 #include "config.h"
 #include "email/email.h"
+#include "muttlib.h"
 
 #if !(defined(HAVE_BDB) || defined(HAVE_GDBM) || defined(HAVE_KC) ||           \
       defined(HAVE_LMDB) || defined(HAVE_QDBM) || defined(HAVE_TC))
diff --git a/hdrline.c b/hdrline.c
index c4ff6c0e5..25e15727a 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -35,6 +35,7 @@
 #include "hdrline.h"
 #include "alias.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "mbtable.h"
@@ -44,6 +45,7 @@
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
 #include "sort.h"
 
diff --git a/help.c b/help.c
index 743df7d56..bed865064 100644
--- a/help.c
+++ b/help.c
@@ -32,6 +32,7 @@
 #include "globals.h"
 #include "keymap.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "opcodes.h"
 #include "options.h"
 #include "pager.h"
diff --git a/history.c b/history.c
index 6f07cac4d..9bb79bb6c 100644
--- a/history.c
+++ b/history.c
@@ -78,6 +78,7 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "history.h"
+#include "curs_lib.h"
 #include "format_flags.h"
 #include "keymap.h"
 #include "menu.h"
diff --git a/hook.c b/hook.c
index 2286358e1..bc8f37f62 100644
--- a/hook.c
+++ b/hook.c
@@ -40,6 +40,7 @@
 #include "globals.h"
 #include "hdrline.h"
 #include "mailbox.h"
+#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pattern.h"
diff --git a/imap/browse.c b/imap/browse.c
index babc8b30b..bd06165b7 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -40,9 +40,11 @@
 #include "browser.h"
 #include "buffy.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "imap/imap.h"
 #include "mutt_logging.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
 
diff --git a/imap/command.c b/imap/command.c
index 0cf105ad7..98314d873 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -41,6 +41,7 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "conn/conn.h"
+#include "mutt.h"
 #include "buffy.h"
 #include "context.h"
 #include "globals.h"
diff --git a/imap/imap.c b/imap/imap.c
index 791968fa1..09713024a 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -45,13 +45,16 @@
 #include "auth.h"
 #include "bcache.h"
 #include "buffy.h"
+#include "commands.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "mailbox.h"
 #include "message.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "options.h"
 #include "pattern.h"
diff --git a/imap/message.c b/imap/message.c
index a6748bf87..6683e95e6 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -42,6 +42,7 @@
 #include "message.h"
 #include "bcache.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "imap/imap.h"
 #include "mailbox.h"
@@ -49,8 +50,10 @@
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "options.h"
+#include "parse.h"
 #include "progress.h"
 #include "protos.h"
 #ifdef USE_HCACHE
diff --git a/imap/util.c b/imap/util.c
index 10f403954..08a72d723 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -46,6 +46,7 @@
 #include "conn/conn.h"
 #include "bcache.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "imap/imap.h"
 #include "mailbox.h"
diff --git a/init.h b/init.h
index b8b1687a8..8c8ccef34 100644
--- a/init.h
+++ b/init.h
@@ -36,6 +36,7 @@
 #include "bcache.h"
 #include "browser.h"
 #include "buffy.h"
+#include "color.h"
 #include "commands.h"
 #include "compose.h"
 #include "curs_lib.h"
diff --git a/maildir/mh.c b/maildir/mh.c
index 3e7d9cce4..54abd9918 100644
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -48,8 +48,10 @@
 #include "mailbox.h"
 #include "maildir.h"
 #include "mutt_thread.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "options.h"
+#include "parse.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/main.c b/main.c
index e7737ae77..6395cb23d 100644
--- a/main.c
+++ b/main.c
@@ -52,16 +52,19 @@
 #include "curs_lib.h"
 #include "curs_main.h"
 #include "globals.h"
+#include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "protos.h"
 #include "send.h"
+#include "sendlib.h"
 #include "terminal.h"
 #include "url.h"
 #include "version.h"
diff --git a/mbox/mbox.c b/mbox/mbox.c
index 7eb08a770..d3192bae7 100644
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -42,8 +42,10 @@
 #include "mailbox.h"
 #include "mutt_header.h"
 #include "mutt_thread.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "options.h"
+#include "parse.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/menu.c b/menu.c
index 12f32cc91..dc28fdbad 100644
--- a/menu.c
+++ b/menu.c
@@ -31,6 +31,8 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "menu.h"
+#include "color.h"
+#include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "globals.h"
@@ -38,6 +40,7 @@
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "opcodes.h"
 #include "options.h"
 #include "pattern.h"
diff --git a/mutt_account.c b/mutt_account.c
index a9858be68..242bc35cc 100644
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -32,6 +32,7 @@
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt_account.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "options.h"
 #include "protos.h"
diff --git a/mutt_attach.c b/mutt_attach.c
index f7550165b..0c9d450e6 100644
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -43,13 +43,16 @@
 #include "handler.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
+#include "parse.h"
 #include "protos.h"
 #include "recvattach.h"
 #include "rfc1524.h"
+#include "sendlib.h"
 #include "state.h"
 
 int mutt_get_tmp_attachment(struct Body *a)
diff --git a/mutt_body.c b/mutt_body.c
index fb0f0900c..ab92c619d 100644
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -34,7 +34,9 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt_attach.h"
+#include "muttlib.h"
 #include "protos.h"
+#include "sendlib.h"
 
 /**
  * mutt_body_copy - Create a send-mode duplicate from a receive-mode body
diff --git a/mutt_header.c b/mutt_header.c
index d0f92e471..c2e089e7c 100644
--- a/mutt_header.c
+++ b/mutt_header.c
@@ -32,11 +32,15 @@
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "curs_main.h"
 #include "globals.h"
+#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
+#include "sendlib.h"
 
 static void label_ref_dec(struct Context *ctx, char *label)
 {
diff --git a/mutt_logging.c b/mutt_logging.c
index b3108679f..d0dfe22ea 100644
--- a/mutt_logging.c
+++ b/mutt_logging.c
@@ -41,6 +41,7 @@
 #include "globals.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
 
diff --git a/mutt_lua.c b/mutt_lua.c
index aca54f251..115dfc50c 100644
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -36,6 +36,7 @@
 #include "mbtable.h"
 #include "mutt_commands.h"
 #include "mutt_options.h"
+#include "muttlib.h"
 #include "protos.h"
 
 static int handle_panic(lua_State *l)
diff --git a/mutt_socket.c b/mutt_socket.c
index bf62750a4..8bfb3e867 100644
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -32,6 +32,7 @@
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt_socket.h"
+#include "hook.h"
 #include "mutt_account.h"
 #include "protos.h"
 #include "url.h"
diff --git a/mutt_thread.c b/mutt_thread.c
index 6106dd1a2..7fde461b3 100644
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -32,6 +32,7 @@
 #include "mutt.h"
 #include "mutt_thread.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "options.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/muttlib.c b/muttlib.c
index 5dcb9c2a7..07eb023ab 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -39,11 +39,13 @@
 #include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
+#include "muttlib.h"
 #include "alias.h"
 #include "curs_lib.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"
+#include "hook.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
diff --git a/muttlib.h b/muttlib.h
index 14395d007..1f9af75a0 100644
--- a/muttlib.h
+++ b/muttlib.h
@@ -38,6 +38,8 @@ struct stat;
 /* These Config Variables are only used in muttlib.c */
 extern struct Regex *GecosMask;
 
+#define MUTT_RANDTAG_LEN 16
+
 void        mutt_adv_mktemp(char *s, size_t l);
 int         mutt_check_overwrite(const char *attname, const char *path, char *fname, size_t flen, int *append, char **directory);
 void        mutt_encode_path(char *dest, size_t dlen, const char *src);
@@ -66,4 +68,7 @@ int         mutt_save_confirm(const char *s, struct stat *st);
 void        mutt_save_path(char *d, size_t dsize, struct Address *a);
 void        mutt_sleep(short s);
 
+#define mutt_mktemp(a, b)               mutt_mktemp_pfx_sfx(a, b, "neomutt", NULL)
+#define mutt_mktemp_pfx_sfx(a, b, c, d) mutt_mktemp_full(a, b, c, d, __FILE__, __LINE__)
+
 #endif /* MUTT_MUTTLIB_H */
diff --git a/mx.c b/mx.c
index 0ab89be52..37a5d9574 100644
--- a/mx.c
+++ b/mx.c
@@ -45,6 +45,7 @@
 #include "context.h"
 #include "copy.h"
 #include "globals.h"
+#include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "maildir/maildir.h"
@@ -52,6 +53,7 @@
 #include "mutt_header.h"
 #include "mutt_logging.h"
 #include "mutt_thread.h"
+#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 008921aaf..8b58b20c1 100644
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -49,9 +49,13 @@
 #include "globals.h"
 #include "handler.h"
 #include "mutt_curses.h"
+#include "muttlib.h"
 #include "ncrypt.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
+#include "send.h"
+#include "sendlib.h"
 #include "state.h"
 
 /* These Config Variables are only used in ncrypt/crypt.c */
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index f5894af6e..c5ed94580 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -57,6 +57,7 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "handler.h"
+#include "hook.h"
 #include "keymap.h"
 #include "menu.h"
 #include "mutt_attach.h"
@@ -68,8 +69,10 @@
 #include "opcodes.h"
 #include "options.h"
 #include "pager.h"
+#include "parse.h"
 #include "protos.h"
 #include "recvattach.h"
+#include "sendlib.h"
 #include "sort.h"
 #include "state.h"
 #ifdef ENABLE_NLS
diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index d75927d45..aabdca050 100644
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "crypt_mod.h"
+#include "curs_lib.h"
 #include "ncrypt.h"
 #include "options.h"
 #include "protos.h"
diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index d3bfdda4e..788cf6ebc 100644
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -51,14 +51,18 @@
 #include "filter.h"
 #include "globals.h"
 #include "handler.h"
+#include "hook.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
+#include "muttlib.h"
 #include "ncrypt.h"
 #include "options.h"
+#include "parse.h"
 #include "pgpinvoke.h"
 #include "pgplib.h"
 #include "pgpmicalg.h"
 #include "protos.h"
+#include "sendlib.h"
 #include "state.h"
 
 /* These Config Variables are only used in ncrypt/pgp.c */
diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 6d36df92b..434d061a9 100644
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -62,6 +62,7 @@
 #include "pgplib.h"
 #include "protos.h"
 #include "recvattach.h"
+#include "sendlib.h"
 #include "sort.h"
 
 /**
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index fd72ff722..94c922863 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -57,7 +57,10 @@
 #include "ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
+#include "send.h"
+#include "sendlib.h"
 #include "state.h"
 
 /* These Config Variables are only used in ncrypt/smime.c */
diff --git a/nntp/nntp.c b/nntp/nntp.c
index 6ce1b9f67..7f64b6b83 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -43,15 +43,18 @@
 #include "nntp.h"
 #include "bcache.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "mailbox.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "mutt_thread.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
+#include "parse.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index d5bb03bce..791d3524c 100644
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -52,6 +52,7 @@
 #include "mutt_notmuch.h"
 #include "buffy.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "curs_main.h"
 #include "globals.h"
 #include "mailbox.h"
diff --git a/pager.c b/pager.c
index 79bdf4bb0..f7eff283b 100644
--- a/pager.c
+++ b/pager.c
@@ -37,6 +37,7 @@
 #include "pager.h"
 #include "alias.h"
 #include "buffy.h"
+#include "color.h"
 #include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
@@ -44,6 +45,7 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "hdrline.h"
+#include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"
diff --git a/pattern.c b/pattern.c
index aa744cfd2..7d5d061b3 100644
--- a/pattern.c
+++ b/pattern.c
@@ -39,6 +39,7 @@
 #include "alias.h"
 #include "context.h"
 #include "copy.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "group.h"
 #include "handler.h"
@@ -46,10 +47,12 @@
 #include "mailbox.h"
 #include "menu.h"
 #include "mutt_logging.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#include "parse.h"
 #include "progress.h"
 #include "protos.h"
 #include "state.h"
diff --git a/pop/pop.c b/pop/pop.c
index 2c5a91311..97a16fd76 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -49,9 +49,11 @@
 #include "mutt_header.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
+#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
+#include "parse.h"
 #include "progress.h"
 #include "protos.h"
 #include "url.h"
diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index dd0dd767e..791d84499 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -39,6 +39,7 @@
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
+#include "muttlib.h"
 #include "options.h"
 #include "pop.h"
 #include "progress.h"
diff --git a/postpone.c b/postpone.c
index a23ab90b4..a32518e7e 100644
--- a/postpone.c
+++ b/postpone.c
@@ -49,11 +49,14 @@
 #include "menu.h"
 #include "mutt_logging.h"
 #include "mutt_thread.h"
+#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
 #include "send.h"
+#include "sendlib.h"
 #include "sort.h"
 #include "state.h"
 #ifdef USE_IMAP
diff --git a/protos.h b/protos.h
index 0f87ad430..17622e18c 100644
--- a/protos.h
+++ b/protos.h
@@ -26,24 +26,12 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <time.h>
-#include "mutt.h"
 
-struct Address;
-struct AliasList;
-struct Body;
-struct Buffer;
 struct Context;
 struct EnterState;
-struct Envelope;
 struct Header;
-struct ListHead;
-struct ParameterList;
-
-struct stat;
-struct passwd;
 
 /**
  * enum XdgType - XDG variable types
@@ -56,197 +44,32 @@ enum XdgType
 
 int mutt_system(const char *cmd);
 
-void mutt_parse_content_type(char *s, struct Body *ct);
-void mutt_generate_boundary(struct ParameterList *parm);
-
-FILE *mutt_open_read(const char *path, pid_t *thepid);
-
-char *mutt_extract_message_id(const char *s, const char **saveptr);
-
-struct Address *mutt_default_from(void);
-struct Address *mutt_remove_duplicates(struct Address *addr);
-struct Address *mutt_remove_xrefs(struct Address *a, struct Address *b);
-
-struct Body *mutt_make_file_attach(const char *path);
-struct Body *mutt_make_message_attach(struct Context *ctx, struct Header *hdr, bool attach_msg);
-struct Body *mutt_remove_multipart(struct Body *b);
-struct Body *mutt_make_multipart(struct Body *b);
-struct Body *mutt_parse_multipart(FILE *fp, const char *boundary, LOFF_T end_off, bool digest);
-struct Body *mutt_rfc822_parse_message(FILE *fp, struct Body *parent);
-struct Body *mutt_read_mime_header(FILE *fp, bool digest);
-
-struct Content *mutt_get_content_info(const char *fname, struct Body *b);
-
-char *mutt_rfc822_read_line(FILE *f, char *line, size_t *linelen);
-struct Envelope *mutt_rfc822_read_header(FILE *f, struct Header *hdr, short user_hdrs, short weed);
-
 int is_from(const char *s, char *path, size_t pathlen, time_t *tp);
 
-char *mutt_expand_path(char *s, size_t slen);
-char *mutt_expand_path_regex(char *s, size_t slen, bool regex);
-char *mutt_find_hook(int type, const char *pat);
-char *mutt_gecos_name(char *dest, size_t destlen, struct passwd *pw);
-char *mutt_body_get_charset(struct Body *b, char *buf, size_t buflen);
-void mutt_crypt_hook(struct ListHead *list, struct Address *addr);
-void mutt_timeout_hook(void);
-void mutt_startup_shutdown_hook(int type);
 int mutt_set_xdg_path(enum XdgType type, char *buf, size_t bufsize);
-
-const char *mutt_make_version(void);
-
-const char *mutt_fqdn(bool may_hide_host);
-
-void mutt_account_hook(const char *url);
-void mutt_add_to_reference_headers(struct Envelope *env, struct Envelope *curenv);
-void mutt_adv_mktemp(char *s, size_t l);
-void mutt_alias_menu(char *buf, size_t buflen, struct AliasList *aliases);
-int mutt_bounce_message(FILE *fp, struct Header *h, struct Address *to);
-void mutt_check_stats(void);
-int mutt_count_body_parts(struct Context *ctx, struct Header *hdr);
-void mutt_default_save(char *path, size_t pathlen, struct Header *hdr);
-void mutt_display_address(struct Envelope *env);
-int mutt_edit_content_type (struct Header *h, struct Body *b, FILE *fp);
-void mutt_edit_file(const char *editor, const char *data);
-void mutt_encode_descriptions(struct Body *b, short recurse);
-void mutt_encode_path(char *dest, size_t dlen, const char *src);
-void mutt_enter_command(void);
-void mutt_expand_file_fmt(char *dest, size_t destlen, const char *fmt, const char *src);
-void mutt_expand_fmt(char *dest, size_t destlen, const char *fmt, const char *src);
-void mutt_fix_reply_recipients(struct Envelope *env);
-void mutt_folder_hook(const char *path);
-void mutt_simple_format(char *buf, size_t buflen, int min_width, int max_width,
-                        int justify, char pad_char, const char *s, size_t n, int arboreal);
-void mutt_format_s(char *buf, size_t buflen, const char *prec, const char *s);
-void mutt_format_s_tree(char *buf, size_t buflen, const char *prec, const char *s);
-void mutt_forward_intro(struct Context *ctx, struct Header *cur, FILE *fp);
-void mutt_forward_trailer(struct Context *ctx, struct Header *cur, FILE *fp);
-void mutt_free_color(int fg, int bg);
-void mutt_free_colors(void);
 void mutt_help(int menu);
-void mutt_make_attribution(struct Context *ctx, struct Header *cur, FILE *out);
-void mutt_make_forward_subject(struct Envelope *env, struct Context *ctx, struct Header *cur);
 void mutt_make_help(char *d, size_t dlen, const char *txt, int menu, int op);
-void mutt_make_misc_reply_headers(struct Envelope *env, struct Envelope *curenv);
-void mutt_make_post_indent(struct Context *ctx, struct Header *cur, FILE *out);
-void mutt_message_to_7bit(struct Body *a, FILE *fp);
-void mutt_mktemp_full(char *s, size_t slen, const char *prefix, const char *suffix, const char *src, int line);
-#define mutt_mktemp_pfx_sfx(a, b, c, d) mutt_mktemp_full(a, b, c, d, __FILE__, __LINE__)
-#define mutt_mktemp(a, b) mutt_mktemp_pfx_sfx(a, b, "neomutt", NULL)
-void mutt_paddstr(int n, const char *s);
-void mutt_parse_mime_message(struct Context *ctx, struct Header *cur);
-void mutt_parse_part(FILE *fp, struct Body *b);
-void mutt_perror_debug(const char *s);
-void mutt_prepare_envelope(struct Envelope *env, bool final);
-void mutt_unprepare_envelope(struct Envelope *env);
-void mutt_pretty_mailbox(char *s, size_t buflen);
-void mutt_pipe_message(struct Header *h);
-void mutt_print_message(struct Header *h);
-void mutt_query_exit(void);
-void mutt_safe_path(char *s, size_t l, struct Address *a);
-void mutt_save_path(char *d, size_t dsize, struct Address *a);
-void mutt_select_fcc(char *path, size_t pathlen, struct Header *hdr);
-void mutt_message_hook(struct Context *ctx, struct Header *hdr, int type);
 void mutt_set_flag_update(struct Context *ctx, struct Header *h, int flag, bool bf, bool upd_ctx);
 #define mutt_set_flag(a, b, c, d) mutt_set_flag_update(a, b, c, d, true)
-void mutt_set_followup_to(struct Envelope *e);
-void mutt_shell_escape(void);
-void mutt_show_error(void);
 void mutt_signal_init(void);
-void mutt_stamp_attachment(struct Body *a);
 void mutt_tag_set_flag(int flag, int bf);
-void mutt_update_encoding(struct Body *a);
-void mutt_version(void);
-void mutt_write_address_list(struct Address *addr, FILE *fp, int linelen, bool display);
-int mutt_addwch(wchar_t wc);
-int mutt_alloc_color(int fg, int bg);
-int mutt_combine_color(int fg_attr, int bg_attr);
-int mutt_any_key_to_continue(const char *s);
 int mutt_change_flag(struct Header *h, int bf);
-int mutt_check_encoding(const char *c);
 
-int mutt_check_mime_type(const char *s);
-int mutt_check_overwrite(const char *attname, const char *path, char *fname,
-                         size_t flen, int *append, char **directory);
-int mutt_check_traditional_pgp(struct Header *h, int *redraw);
 int mutt_complete(char *buf, size_t buflen);
-int mutt_display_message(struct Header *cur);
 int mutt_edit_message(struct Context *ctx, struct Header *hdr);
 int mutt_view_message(struct Context *ctx, struct Header *hdr);
-int mutt_fetch_recips(struct Envelope *out, struct Envelope *in, int flags);
 int mutt_prepare_template(FILE *fp, struct Context *ctx, struct Header *newhdr, struct Header *hdr, short resend);
-int mutt_resend_message(FILE *fp, struct Context *ctx, struct Header *cur);
-int mutt_compose_to_sender(struct Header *hdr);
-#define mutt_enter_fname(A, B, C, D)   mutt_enter_fname_full(A, B, C, D, 0, NULL, NULL, 0)
-#define mutt_enter_vfolder(A, B, C, D) mutt_enter_fname_full(A, B, C, D, 0, NULL, NULL, MUTT_SEL_VFOLDER)
-int mutt_enter_fname_full(const char *prompt, char *buf, size_t blen, int buffy,
-                      int multiple, char ***files, int *numfiles, int flags);
 int mutt_enter_string(char *buf, size_t buflen, int col, int flags);
 int mutt_enter_string_full(char *buf, size_t buflen, int col, int flags, int multiple,
                        char ***files, int *numfiles, struct EnterState *state);
-#define mutt_get_field(A, B, C, D) mutt_get_field_full(A, B, C, D, 0, NULL, NULL)
-int mutt_get_field_full(const char *field, char *buf, size_t buflen, int complete,
-                    int multiple, char ***files, int *numfiles);
-int mutt_get_field_unbuffered(char *msg, char *buf, size_t buflen, int flags);
-#define mutt_get_password(A, B, C) mutt_get_field_unbuffered(A, B, C, MUTT_PASS)
-
 int mutt_get_postponed(struct Context *ctx, struct Header *hdr, struct Header **cur, char *fcc, size_t fcclen);
 int mutt_parse_crypt_hdr(const char *p, int set_empty_signas, int crypt_app);
-int mutt_invoke_sendmail(struct Address *from, struct Address *to, struct Address *cc, struct Address *bcc,
-                         const char *msg, int eightbit);
-bool mutt_is_text_part(struct Body *b);
-int mutt_lookup_mime_type(struct Body *att, const char *path);
-int mutt_multi_choice(char *prompt, char *letters);
-bool mutt_needs_mailcap(struct Body *m);
 int mutt_num_postponed(int force);
-int mutt_parse_color(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
-int mutt_parse_uncolor(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
-int mutt_parse_hook(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
-int mutt_parse_mono(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
-int mutt_parse_unmono(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
-int mutt_rfc822_parse_line(struct Envelope *e, struct Header *hdr, char *line, char *p,
-                           short user_hdrs, short weed, short do_2047);
-int mutt_parse_unhook(struct Buffer *buf, struct Buffer *s, unsigned long data, struct Buffer *err);
-void mutt_delete_hooks(int type);
-int mutt_save_message_ctx(struct Header *h, int delete, int decode, int decrypt, struct Context *ctx);
-int mutt_save_message(struct Header *h, int delete, int decode, int decrypt);
-
-size_t mutt_wstr_trunc(const char *src, size_t maxlen, size_t maxwid, size_t *width);
-int mutt_strwidth(const char *s);
 int mutt_thread_set_flag(struct Header *hdr, int flag, int bf, int subthread);
 void mutt_update_num_postponed(void);
-int mutt_write_fcc(const char *path, struct Header *hdr, const char *msgid, int post,
-                   char *fcc, char **finalpath);
-int mutt_write_multiple_fcc(const char *path, struct Header *hdr, const char *msgid,
-                            int post, char *fcc, char **finalpath);
-int mutt_write_mime_body(struct Body *a, FILE *f);
-int mutt_write_mime_header(struct Body *a, FILE *f);
-int mutt_write_one_header(FILE *fp, const char *tag, const char *value,
-                          const char *pfx, int wraplen, int flags);
-int mutt_rfc822_write_header(FILE *fp, struct Envelope *env, struct Body *attach, int mode, bool privacy);
-void mutt_write_references(const struct ListHead *r, FILE *f, size_t trim);
-int mutt_yesorno(const char *msg, int def);
-void mutt_sleep(short s);
-int mutt_save_confirm(const char *s, struct stat *st);
-
-void mutt_get_parent_path(char *output, char *path, size_t olen);
-size_t mutt_realpath(char *buf);
-
-#define MUTT_RANDTAG_LEN 16
-void mutt_rand_base32(void *out, size_t len);
-uint32_t mutt_rand32(void);
-uint64_t mutt_rand64(void);
-int mutt_randbuf(void *out, size_t len);
-
-int getdnsdomainname(char *d, size_t len);
-
-void ci_bounce_message(struct Header *h);
-int ci_send_message(int flags, struct Header *msg, char *tempfile, struct Context *ctx, struct Header *cur);
 
 #ifndef HAVE_WCSCASECMP
 int wcscasecmp(const wchar_t *a, const wchar_t *b);
 #endif
 
-bool message_is_tagged(struct Context *ctx, int index);
-bool message_is_visible(struct Context *ctx, int index);
-
 #endif /* _MUTT_PROTOS_H */
diff --git a/query.c b/query.c
index de63586e6..0aa9e8cc9 100644
--- a/query.c
+++ b/query.c
@@ -30,6 +30,7 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
+#include "curs_lib.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"
@@ -40,6 +41,7 @@
 #include "muttlib.h"
 #include "opcodes.h"
 #include "protos.h"
+#include "send.h"
 
 /* These Config Variables are only used in query.c */
 char *QueryCommand;
diff --git a/recvattach.c b/recvattach.c
index fccbf68c7..9bf317c29 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -32,6 +32,7 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "recvattach.h"
+#include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "filter.h"
@@ -39,6 +40,7 @@
 #include "globals.h"
 #include "handler.h"
 #include "hdrline.h"
+#include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"
@@ -51,10 +53,12 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#include "parse.h"
 #include "protos.h"
 #include "recvcmd.h"
 #include "rfc1524.h"
 #include "send.h"
+#include "sendlib.h"
 #include "state.h"
 #ifdef ENABLE_NLS
 #include <libintl.h>
diff --git a/recvcmd.c b/recvcmd.c
index 5fefa0ce1..4b86f559a 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -37,10 +37,12 @@
 #include "mutt_body.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
 #include "recvattach.h"
 #include "send.h"
+#include "sendlib.h"
 #include "state.h"
 #ifdef ENABLE_NLS
 #include <libintl.h>
diff --git a/remailer.c b/remailer.c
index 305946bf7..5bf5c590d 100644
--- a/remailer.c
+++ b/remailer.c
@@ -43,6 +43,7 @@
 #include "options.h"
 #include "protos.h"
 #include "recvattach.h"
+#include "sendlib.h"
 
 /* These Config Variables are only used in remailer.c */
 char *MixEntryFormat;
diff --git a/rfc1524.c b/rfc1524.c
index 7202682a0..095606e55 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -43,6 +43,7 @@
 #include "rfc1524.h"
 #include "globals.h"
 #include "mutt_attach.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
 
diff --git a/rfc3676.c b/rfc3676.c
index 18aebd001..31b4b86dd 100644
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -31,8 +31,10 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "email/email.h"
+#include "curs_lib.h"
 #include "globals.h"
 #include "mutt_window.h"
+#include "muttlib.h"
 #include "options.h"
 #include "protos.h"
 #include "state.h"
diff --git a/send.c b/send.c
index b583c47db..403ae4b13 100644
--- a/send.c
+++ b/send.c
@@ -39,19 +39,24 @@
 #include "compose.h"
 #include "context.h"
 #include "copy.h"
+#include "curs_lib.h"
 #include "edit.h"
 #include "filter.h"
 #include "globals.h"
 #include "hdrline.h"
+#include "hook.h"
 #include "mailbox.h"
 #include "mutt_attach.h"
 #include "mutt_header.h"
 #include "mutt_logging.h"
+#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
+#include "parse.h"
 #include "pattern.h"
 #include "protos.h"
 #include "rfc3676.h"
+#include "sendlib.h"
 #include "smtp.h"
 #include "sort.h"
 #include "url.h"
diff --git a/sendlib.c b/sendlib.c
index 712a558d7..c9df37ca6 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -38,6 +38,7 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt.h"
+#include "sendlib.h"
 #include "buffy.h"
 #include "context.h"
 #include "copy.h"
@@ -54,10 +55,12 @@
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
+#include "parse.h"
 #include "protos.h"
 #include "recvattach.h"
 #include "rfc2047.h"
 #include "rfc2231.h"
+#include "send.h"
 #include "smtp.h"
 #include "state.h"
 #ifdef USE_NNTP
diff --git a/sidebar.c b/sidebar.c
index 3b20133a7..a038ba18e 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -39,6 +39,7 @@
 #include "sidebar.h"
 #include "buffy.h"
 #include "context.h"
+#include "curs_lib.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "menu.h"
diff --git a/smtp.c b/smtp.c
index 436c29676..f0f6086eb 100644
--- a/smtp.c
+++ b/smtp.c
@@ -41,6 +41,7 @@
 #include "options.h"
 #include "progress.h"
 #include "protos.h"
+#include "sendlib.h"
 #include "url.h"
 #ifdef USE_SASL
 #include <sasl/sasl.h>
diff --git a/url.c b/url.c
index 52a79a432..3bab2a9a3 100644
--- a/url.c
+++ b/url.c
@@ -29,6 +29,7 @@
 #include "mutt.h"
 #include "url.h"
 #include "globals.h"
+#include "parse.h"
 #include "protos.h"
 #include "rfc2047.h"