From: Richard Russon <rich@flatcap.org>
Date: Mon, 16 Jul 2018 17:19:59 +0000 (+0100)
Subject: iwyu
X-Git-Tag: 2019-10-25~755^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e8893b7ca41ab68a0940d1e50908707c4328ddf;p=neomutt

iwyu
---

diff --git a/addrbook.c b/addrbook.c
index 00528123b..e56722944 100644
--- a/addrbook.c
+++ b/addrbook.c
@@ -42,8 +42,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "options.h"
-#include "protos.h"
 #include "sort.h"
 
 /* These Config Variables are only used in addrbook.c */
diff --git a/alias.c b/alias.c
index 3388efc27..d1d62a88d 100644
--- a/alias.c
+++ b/alias.c
@@ -40,8 +40,6 @@
 #include "hdrline.h"
 #include "mutt_curses.h"
 #include "muttlib.h"
-#include "options.h"
-#include "protos.h"
 #include "sendlib.h"
 
 /**
diff --git a/alias.h b/alias.h
index 26114d682..a03e4a5a6 100644
--- a/alias.h
+++ b/alias.h
@@ -23,9 +23,12 @@
 #ifndef _MUTT_ALIAS_H
 #define _MUTT_ALIAS_H
 
+#include <stddef.h>
 #include <stdbool.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+
+struct Address;
+struct Envelope;
 
 /**
  * struct Alias - A shortcut for an email address
diff --git a/bcache.c b/bcache.c
index 6540d9499..33f07636c 100644
--- a/bcache.c
+++ b/bcache.c
@@ -32,10 +32,8 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "bcache.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "muttlib.h"
-#include "protos.h"
 
 /* These Config Variables are only used in bcache.c */
 char *MessageCachedir;
diff --git a/browser.c b/browser.c
index ddd8bee44..05fc85de1 100644
--- a/browser.c
+++ b/browser.c
@@ -36,6 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "browser.h"
@@ -49,13 +50,11 @@
 #include "maildir/maildir.h"
 #include "menu.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
 #include "sendlib.h"
 #include "sort.h"
 #ifdef USE_IMAP
diff --git a/buffy.c b/buffy.c
index 810f21ada..07e04f432 100644
--- a/buffy.c
+++ b/buffy.c
@@ -26,6 +26,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <utime.h>
@@ -41,7 +42,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
diff --git a/buffy.h b/buffy.h
index a47b61a09..f86b94c2a 100644
--- a/buffy.h
+++ b/buffy.h
@@ -29,6 +29,7 @@
 #include <time.h>
 #include "where.h"
 
+struct Buffer;
 struct stat;
 
 /* These Config Variables are only used in buffy.c */
diff --git a/color.c b/color.c
index 5ddbc03ae..6c5e4f22b 100644
--- a/color.c
+++ b/color.c
@@ -37,7 +37,6 @@
 #include "mutt_curses.h"
 #include "options.h"
 #include "pattern.h"
-#include "protos.h"
 
 /* globals */
 int *ColorQuote = NULL;
diff --git a/commands.c b/commands.c
index 715035a65..da36b7730 100644
--- a/commands.c
+++ b/commands.c
@@ -56,7 +56,6 @@
 #include "options.h"
 #include "pager.h"
 #include "protos.h"
-#include "recvattach.h"
 #include "sendlib.h"
 #include "sort.h"
 #ifdef USE_IMAP
diff --git a/complete.c b/complete.c
index 80c262a50..487229b63 100644
--- a/complete.c
+++ b/complete.c
@@ -36,7 +36,6 @@
 #include "globals.h"
 #include "muttlib.h"
 #include "options.h"
-#include "protos.h"
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #include "mailbox.h"
diff --git a/compress.c b/compress.c
index bf6a7b43b..8884531af 100644
--- a/compress.c
+++ b/compress.c
@@ -35,7 +35,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "compress.h"
 #include "context.h"
 #include "curs_lib.h"
@@ -46,9 +45,10 @@
 #include "mutt_curses.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 
+struct Header;
+
 /* Notes:
  * Any references to compressed files also apply to encrypted files.
  * ctx->path     == plaintext file
diff --git a/conn/conn_globals.c b/conn/conn_globals.c
index 3d237881b..ecbeda4be 100644
--- a/conn/conn_globals.c
+++ b/conn/conn_globals.c
@@ -27,7 +27,6 @@
  */
 
 #include "config.h"
-#include <stdbool.h>
 #include <stdio.h>
 
 short ConnectTimeout = 0; /**< Config: Timeout for a network connection (for IMAP, POP or SMTP) */
diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 14d497444..13d6fe7bb 100644
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -35,6 +35,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/select.h>
@@ -42,13 +43,14 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
+#include "mutt/mutt.h"
 #include "email/email.h"
+#include "conn/account.h"
 #include "conn_globals.h"
 #include "connection.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "options.h"
-#include "protos.h"
 
 /**
  * socket_connect - set up to connect to a socket fd
diff --git a/conn/connection.h b/conn/connection.h
index dec678c82..1f4f7d2a2 100644
--- a/conn/connection.h
+++ b/conn/connection.h
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 #include "account.h"
 
 #define LONG_STRING 1024
diff --git a/conn/getdomain.c b/conn/getdomain.c
index 40f416c9b..0428b8193 100644
--- a/conn/getdomain.c
+++ b/conn/getdomain.c
@@ -32,9 +32,7 @@
 #include <sys/socket.h>
 #include <time.h>
 #include <unistd.h>
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 
 /**
  * getdnsdomainname - Lookup the host's name using DNS
diff --git a/conn/sasl.c b/conn/sasl.c
index 643acf7b9..21508dca1 100644
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -46,17 +46,13 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <time.h>
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "sasl.h"
 #include "account.h"
 #include "connection.h"
 #include "curs_lib.h"
 #include "mutt_account.h"
 #include "options.h"
-#include "protos.h"
 
 /* arbitrary. SASL will probably use a smaller buffer anyway. OTOH it's
  * been a while since I've had access to an SASL server which negotiated
diff --git a/conn/socket.h b/conn/socket.h
index d7b07c2c9..8ff679561 100644
--- a/conn/socket.h
+++ b/conn/socket.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <time.h>
 
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 
 enum ConnectionType
 {
diff --git a/conn/ssl.c b/conn/ssl.c
index d79223238..fcab31401 100644
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -47,11 +47,8 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "mutt/file.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/string2.h"
-#include "email/idna2.h"
+#include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "ssl.h"
 #include "account.h"
diff --git a/conn/tunnel.c b/conn/tunnel.c
index 4f73d77e3..e1140a080 100644
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -40,7 +40,6 @@
 #include "account.h"
 #include "conn_globals.h"
 #include "connection.h"
-#include "protos.h"
 #include "socket.h"
 
 /**
diff --git a/copy.c b/copy.c
index b1db0c856..8e5bd9e93 100644
--- a/copy.c
+++ b/copy.c
@@ -44,8 +44,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
-#include "protos.h"
 #include "sendlib.h"
 #include "state.h"
 #ifdef USE_NOTMUCH
diff --git a/curs_lib.c b/curs_lib.c
index f4fb47e5f..a8062d2f7 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -42,7 +42,6 @@
 #include "curs_lib.h"
 #include "browser.h"
 #include "context.h"
-#include "curs_lib.h"
 #include "enter_state.h"
 #include "globals.h"
 #include "menu.h"
diff --git a/curs_lib.h b/curs_lib.h
index d5e204ddb..edab4cfd8 100644
--- a/curs_lib.h
+++ b/curs_lib.h
@@ -23,10 +23,11 @@
 #ifndef MUTT_CURS_LIB_H
 #define MUTT_CURS_LIB_H
 
+#include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <wchar.h>
 #include "mutt.h"
+#include "browser.h"
 
 struct Context;
 struct Pager;
diff --git a/edit.c b/edit.c
index 05aeceb5e..ffade7c81 100644
--- a/edit.c
+++ b/edit.c
@@ -41,7 +41,6 @@
 #include "mutt_header.h"
 #include "mutt_window.h"
 #include "muttlib.h"
-#include "options.h"
 #include "protos.h"
 
 /* These Config Variables are only used in edit.c */
diff --git a/editmsg.c b/editmsg.c
index 722e4d774..a1b21604f 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -45,7 +45,6 @@
 #include "mailbox.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 
 /**
diff --git a/email/body.c b/email/body.c
index 3fdb2ad06..a37b67a87 100644
--- a/email/body.c
+++ b/email/body.c
@@ -33,6 +33,7 @@
 #include "body.h"
 #include "header.h"
 #include "mime.h"
+#include "parameter.h"
 
 /**
  * mutt_body_new - Create a new Body
diff --git a/email/from.c b/email/from.c
index 73e924bb5..f20e8f936 100644
--- a/email/from.c
+++ b/email/from.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
diff --git a/email/from.h b/email/from.h
index c9f8db2f3..adc4b9b1f 100644
--- a/email/from.h
+++ b/email/from.h
@@ -24,6 +24,7 @@
 #define _EMAIL_FROM_H
 
 #include <stdio.h>
+#include <stdbool.h>
 #include <time.h>
 
 bool is_from(const char *s, char *path, size_t pathlen, time_t *tp);
diff --git a/email/header.h b/email/header.h
index 9999faa83..948ca859a 100644
--- a/email/header.h
+++ b/email/header.h
@@ -25,7 +25,6 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <time.h>
 #include "mutt/mutt.h"
 #include "tags.h"
diff --git a/email/parse.c b/email/parse.c
index 0f6279152..bbd16a902 100644
--- a/email/parse.c
+++ b/email/parse.c
@@ -27,9 +27,12 @@
  */
 
 #include "config.h"
+#include <ctype.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include "mutt/mutt.h"
 #include "parse.h"
 #include "address.h"
@@ -39,6 +42,7 @@
 #include "from.h"
 #include "header.h"
 #include "mime.h"
+#include "parameter.h"
 #include "rfc2047.h"
 #include "rfc2231.h"
 #include "url.h"
diff --git a/email/parse.h b/email/parse.h
index 4015f89e5..b027ef468 100644
--- a/email/parse.h
+++ b/email/parse.h
@@ -23,6 +23,7 @@
 #ifndef _EMAIL_PARSE_H
 #define _EMAIL_PARSE_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
 struct Body;
diff --git a/email/rfc2231.c b/email/rfc2231.c
index 87b3fda3a..a02678ae6 100644
--- a/email/rfc2231.c
+++ b/email/rfc2231.c
@@ -39,10 +39,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
 #include "rfc2231.h"
-#include "globals.h"
-#include "options.h"
+#include "email_globals.h"
+#include "mime.h"
+#include "parameter.h"
+#include "rfc2047.h"
 
 /* These Config Variables are only used in rfc2231.c */
 bool Rfc2047Parameters;
diff --git a/email/rfc2231.h b/email/rfc2231.h
index e63e674cc..3a0ad12b3 100644
--- a/email/rfc2231.h
+++ b/email/rfc2231.h
@@ -23,6 +23,8 @@
 #ifndef _EMAIL_RFC2231_H
 #define _EMAIL_RFC2231_H
 
+#include <stdbool.h>
+
 struct ParameterList;
 
 /* These Config Variables are only used in rfc2231.c */
diff --git a/flags.c b/flags.c
index 1f4419c2f..4852bf5ce 100644
--- a/flags.c
+++ b/flags.c
@@ -40,7 +40,6 @@
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 #include "sort.h"
 
diff --git a/group.c b/group.c
index c1e4142c3..103cf4895 100644
--- a/group.c
+++ b/group.c
@@ -28,7 +28,6 @@
 #include "email/email.h"
 #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 aeb7a36f7..49fdb0853 100644
--- a/handler.c
+++ b/handler.c
@@ -43,13 +43,10 @@
 #include "keymap.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
-#include "recvattach.h"
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "state.h"
diff --git a/hcache/hcache.c b/hcache/hcache.c
index 98187937d..21d018296 100644
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -45,16 +45,14 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "backend.h"
-#include "globals.h"
 #include "hcache.h"
 #include "hcache/hcversion.h"
-#include "protos.h"
 
 /* These Config Variables are only used in hcache/hcache.c */
 char *HeaderCacheBackend;
diff --git a/hcache/hcache.h b/hcache/hcache.h
index bfa730c86..55258d2ef 100644
--- a/hcache/hcache.h
+++ b/hcache/hcache.h
@@ -50,7 +50,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <time.h>
+#include <sys/time.h>
 
 struct Header;
 
diff --git a/hcache/kc.c b/hcache/kc.c
index 1678d9efa..0ac280dcf 100644
--- a/hcache/kc.c
+++ b/hcache/kc.c
@@ -36,7 +36,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
-#include "options.h"
 
 /**
  * hcache_kyotocabinet_open - Implements HcacheOps::open()
diff --git a/hcache/qdbm.c b/hcache/qdbm.c
index 6c052f19e..2f059871f 100644
--- a/hcache/qdbm.c
+++ b/hcache/qdbm.c
@@ -37,7 +37,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
-#include "options.h"
 
 /**
  * hcache_qdbm_open - Implements HcacheOps::open()
diff --git a/hcache/serialize.c b/hcache/serialize.c
index 82fe9aa96..dfa93a41b 100644
--- a/hcache/serialize.c
+++ b/hcache/serialize.c
@@ -30,11 +30,14 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include "mutt/mutt.h"
 #include "email/email.h"
 #include "hcache.h"
-#include "muttlib.h"
 
 /**
  * lazy_malloc - Allocate some memory
diff --git a/hcache/serialize.h b/hcache/serialize.h
index ddf3c1868..5fd9b4429 100644
--- a/hcache/serialize.h
+++ b/hcache/serialize.h
@@ -26,6 +26,8 @@
 #ifndef _MUTT_HCACHE_SERIALIZE_H
 #define _MUTT_HCACHE_SERIALIZE_H
 
+#include <stdbool.h>
+#include <sys/types.h>
 #include "hcache.h"
 
 struct Address;
diff --git a/hcache/tc.c b/hcache/tc.c
index 1c788300e..4aee20400 100644
--- a/hcache/tc.c
+++ b/hcache/tc.c
@@ -36,7 +36,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
-#include "options.h"
 
 /**
  * hcache_tokyocabinet_open - Implements HcacheOps::open()
diff --git a/hdrline.c b/hdrline.c
index f5aa346ae..e08364159 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -45,8 +45,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
-#include "protos.h"
 #include "sort.h"
 
 /* These Config Variables are only used in hdrline.c */
diff --git a/hdrline.h b/hdrline.h
index 1023383e9..3b7c70d2f 100644
--- a/hdrline.h
+++ b/hdrline.h
@@ -30,7 +30,6 @@
 struct Address;
 struct Context;
 struct Header;
-struct HdrFormatInfo;
 
 /* These Config Variables are only used in hdrline.c */
 extern struct MbTable *FlagChars;
diff --git a/help.c b/help.c
index bed865064..8b8dc4c2b 100644
--- a/help.c
+++ b/help.c
@@ -34,9 +34,7 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "options.h"
 #include "pager.h"
-#include "protos.h"
 
 static const char *HelpStrings[] = {
 #define DEFINE_HELP_MESSAGE(opcode, help_string) help_string,
diff --git a/hook.c b/hook.c
index dc65fa937..acb1327a5 100644
--- a/hook.c
+++ b/hook.c
@@ -43,9 +43,7 @@
 #include "mailbox.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "pattern.h"
-#include "protos.h"
 #ifdef USE_COMPRESSED
 #include "compress.h"
 #endif
diff --git a/imap/auth.c b/imap/auth.c
index 7e5baab0e..77b6646fa 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "auth.h"
-#include "globals.h"
 
 /* These Config Variables are only used in imap/auth.c */
 char *ImapAuthenticators;
diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index eb9f90f1c..0265504c0 100644
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -33,7 +33,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
-#include "options.h"
 
 /**
  * imap_auth_anon - Authenticate anonymously
diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 508d5821d..d2be14ce4 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -35,7 +35,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
-#include "options.h"
 
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16
diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 298e00061..00174e4a5 100644
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -44,7 +44,6 @@
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
-#include "options.h"
 #ifdef HAVE_HEIMDAL
 #include <gssapi/gssapi.h>
 #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
diff --git a/imap/auth_login.c b/imap/auth_login.c
index 0790dd145..d6b5f0180 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -27,6 +27,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
@@ -34,8 +35,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
-#include "options.h"
-#include "protos.h"
 
 /**
  * imap_auth_login - Plain LOGIN support
diff --git a/imap/auth_plain.c b/imap/auth_plain.c
index 3b96158ac..4523dfa5b 100644
--- a/imap/auth_plain.c
+++ b/imap/auth_plain.c
@@ -35,8 +35,6 @@
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
-#include "options.h"
-#include "protos.h"
 
 /**
  * imap_auth_plain - SASL PLAIN support
diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 2c896f91e..d054d176a 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -39,7 +39,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
-#include "options.h"
 
 /**
  * imap_auth_sasl - Default authenticator if available
diff --git a/imap/browse.c b/imap/browse.c
index bd06165b7..163e0dbcf 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -45,8 +45,6 @@
 #include "imap/imap.h"
 #include "mutt_logging.h"
 #include "muttlib.h"
-#include "options.h"
-#include "protos.h"
 
 /**
  * add_folder - Format and add an IMAP folder to the browser
diff --git a/imap/command.c b/imap/command.c
index 79612ce7b..e4e00927d 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -53,8 +53,6 @@
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "mx.h"
-#include "options.h"
-#include "protos.h"
 
 /* These Config Variables are only used in imap/command.c */
 bool ImapServernoise;
diff --git a/imap/imap.c b/imap/imap.c
index d7e12a251..98cf4b5bc 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -56,10 +56,8 @@
 #include "mutt_socket.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "pattern.h"
 #include "progress.h"
-#include "protos.h"
 #include "sort.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
diff --git a/imap/imap_private.h b/imap/imap_private.h
index 278d4a2b1..2d9d1b520 100644
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -27,13 +27,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
-#include "mutt/list.h"
+#include "mutt/mutt.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
 
 struct Account;
-struct Buffer;
 struct Context;
 struct Header;
 struct ImapHeaderData;
diff --git a/imap/message.c b/imap/message.c
index 027ed2920..f81083d78 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -52,7 +52,6 @@
 #include "mutt_socket.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #ifdef USE_HCACHE
diff --git a/imap/util.c b/imap/util.c
index 2a3827bca..3c1482d10 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -55,7 +55,6 @@
 #include "mutt_account.h"
 #include "mx.h"
 #include "options.h"
-#include "protos.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
diff --git a/init.c b/init.c
index 8e98a5e11..f16accd7c 100644
--- a/init.c
+++ b/init.c
@@ -2203,7 +2203,8 @@ static int parse_set(struct Buffer *buf, struct Buffer *s, unsigned long data,
             *((char **) MuttVars[idx].var) = mutt_str_strdup(scratch);
           }
         }
-        else if ((idx >= 0) && ((DTYPE(MuttVars[idx].type) == DT_STRING) || (DTYPE(MuttVars[idx].type) == DT_COMMAND)))
+        else if ((idx >= 0) && ((DTYPE(MuttVars[idx].type) == DT_STRING) ||
+                                (DTYPE(MuttVars[idx].type) == DT_COMMAND)))
         {
           if ((strstr(MuttVars[idx].name, "charset") &&
                check_charset(&MuttVars[idx], buf->data) < 0) |
diff --git a/keymap.c b/keymap.c
index 06ae54fee..d6000b2bd 100644
--- a/keymap.c
+++ b/keymap.c
@@ -40,7 +40,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
diff --git a/maildir/mh.c b/maildir/mh.c
index a8b078544..db12db812 100644
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -56,7 +56,6 @@
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/mbox/mbox.c b/mbox/mbox.c
index 3581c179f..3f925c844 100644
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -50,7 +50,6 @@
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/menu.c b/menu.c
index dc28fdbad..d9f4d2994 100644
--- a/menu.c
+++ b/menu.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/mutt/mbyte.c b/mutt/mbyte.c
index cb7ddf147..174e93841 100644
--- a/mutt/mbyte.c
+++ b/mutt/mbyte.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#include <wctype.h>
 #include "mbyte.h"
 #include "buffer.h"
 #include "charset.h"
diff --git a/mutt_account.c b/mutt_account.c
index 9aad748e8..9b0ac6583 100644
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -36,7 +36,6 @@
 #include "curs_lib.h"
 #include "globals.h"
 #include "options.h"
-#include "protos.h"
 
 /* These Config Variables are only used in mutt_account.c */
 char *ImapLogin;
diff --git a/mutt_attach.c b/mutt_attach.c
index 5b92c5ab3..2915da0f5 100644
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
@@ -42,14 +41,12 @@
 #include "globals.h"
 #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 "protos.h"
-#include "recvattach.h"
 #include "rfc1524.h"
 #include "sendlib.h"
 #include "state.h"
diff --git a/mutt_body.c b/mutt_body.c
index 61a597bc6..0ca37d02f 100644
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -29,7 +29,6 @@
 #include "email/email.h"
 #include "mutt_attach.h"
 #include "muttlib.h"
-#include "protos.h"
 #include "sendlib.h"
 
 /**
diff --git a/mutt_curses.h b/mutt_curses.h
index 6523c8e9a..f5df34fd0 100644
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -26,7 +26,6 @@
 
 #include <regex.h>
 #include "mutt/mutt.h"
-#include "options.h"
 
 #ifdef USE_SLANG_CURSES
 
diff --git a/mutt_logging.c b/mutt_logging.c
index d0dfe22ea..21f52f464 100644
--- a/mutt_logging.c
+++ b/mutt_logging.c
@@ -36,14 +36,12 @@
 #include <sys/time.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "options.h"
-#include "protos.h"
 
 struct timeval LastError = { 0 };
 
diff --git a/mutt_lua.c b/mutt_lua.c
index 115dfc50c..bdcff4343 100644
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -37,7 +37,6 @@
 #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_parse.c b/mutt_parse.c
index acfc36cf3..3301e63b7 100644
--- a/mutt_parse.c
+++ b/mutt_parse.c
@@ -21,24 +21,16 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt.h"
 #include "mutt_parse.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
-#include "protos.h"
-#include "recvattach.h"
 
 struct Context;
 
diff --git a/mutt_signal.c b/mutt_signal.c
index 6703a82f2..b36bc57dc 100644
--- a/mutt_signal.c
+++ b/mutt_signal.c
@@ -32,7 +32,6 @@
 #include "mutt/mutt.h"
 #include "globals.h"
 #include "mutt_curses.h"
-#include "options.h"
 
 static int IsEndwin = 0;
 
diff --git a/mutt_socket.c b/mutt_socket.c
index 7d1b57149..446a363b4 100644
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -35,7 +35,6 @@
 #include "mutt_socket.h"
 #include "hook.h"
 #include "mutt_account.h"
-#include "protos.h"
 
 /**
  * mutt_conn_find - Find a connection from a list
diff --git a/mutt_thread.c b/mutt_thread.c
index 628e71185..68eaaec8b 100644
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include <limits.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -33,7 +32,6 @@
 #include "mutt_thread.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "options.h"
 #include "protos.h"
 #include "sort.h"
 
diff --git a/mutt_thread.h b/mutt_thread.h
index 6aa34312b..0248852ac 100644
--- a/mutt_thread.h
+++ b/mutt_thread.h
@@ -23,7 +23,7 @@
 #ifndef _MUTT_THREAD2_H
 #define _MUTT_THREAD2_H
 
-#include "mutt.h"
+#include <stdbool.h>
 
 struct Context;
 struct Header;
diff --git a/mutt_url.c b/mutt_url.c
index e29c14ac0..4d53f9253 100644
--- a/mutt_url.c
+++ b/mutt_url.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
diff --git a/muttlib.c b/muttlib.c
index f6321d24c..b7504dc79 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -32,6 +31,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -47,11 +47,9 @@
 #include "globals.h"
 #include "hook.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "protos.h"
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 64615c966..faba921de 100644
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -53,7 +53,6 @@
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "options.h"
-#include "protos.h"
 #include "send.h"
 #include "sendlib.h"
 #include "state.h"
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index d64c52878..c2f868e9b 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
@@ -61,15 +62,12 @@
 #include "keymap.h"
 #include "menu.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "pager.h"
 #include "protos.h"
 #include "recvattach.h"
 #include "sendlib.h"
diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index aabdca050..e8f1ae0bc 100644
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -41,9 +41,11 @@
 #include "crypt_mod.h"
 #include "curs_lib.h"
 #include "ncrypt.h"
-#include "options.h"
-#include "protos.h"
 
+struct Address;
+struct Body;
+struct Envelope;
+struct Header;
 struct State;
 
 /* These Config Variables are only used in ncrypt/cryptglue.c */
diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index f9ef8b537..9f632267f 100644
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -46,7 +46,6 @@
 #include "filter.h"
 #include "globals.h"
 #include "ncrypt.h"
-#include "options.h"
 #include "pgpinvoke.h"
 #include "pgpkey.h"
 #include "pgplib.h"
diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 889bb8572..accb5897f 100644
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -53,15 +53,13 @@
 #include "handler.h"
 #include "hook.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
-#include "mutt_parse.h"
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "options.h"
 #include "pgpinvoke.h"
+#include "pgpkey.h"
 #include "pgplib.h"
 #include "pgpmicalg.h"
-#include "protos.h"
 #include "sendlib.h"
 #include "state.h"
 
diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 8d4ef936b..dd68765f8 100644
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -56,7 +56,6 @@
 #include "ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "pager.h"
 #include "pgp.h"
 #include "pgpinvoke.h"
 #include "pgplib.h"
diff --git a/ncrypt/pgpmicalg.c b/ncrypt/pgpmicalg.c
index 978c68d74..282449798 100644
--- a/ncrypt/pgpmicalg.c
+++ b/ncrypt/pgpmicalg.c
@@ -27,7 +27,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <iconv.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index e881b5f08..5fdd65f1a 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -52,12 +52,10 @@
 #include "menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "opcodes.h"
-#include "options.h"
 #include "protos.h"
 #include "send.h"
 #include "sendlib.h"
diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 314292a6b..7eca0ad16 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -54,7 +54,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "nntp.h"
-#include "options.h"
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_HCACHE
diff --git a/nntp/nntp.c b/nntp/nntp.c
index 1890b8f68..96898fc71 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -54,7 +54,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/nntp/nntp.h b/nntp/nntp.h
index 3673c9d84..e06152f32 100644
--- a/nntp/nntp.h
+++ b/nntp/nntp.h
@@ -41,12 +41,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
-#include "email/email.h"
 #include "format_flags.h"
 #include "mx.h"
-#ifdef USE_HCACHE
-#include "hcache/hcache.h"
-#endif
 
 struct Account;
 struct Header;
diff --git a/nntp/nntp_private.h b/nntp/nntp_private.h
index feb946e24..26f3cbf65 100644
--- a/nntp/nntp_private.h
+++ b/nntp/nntp_private.h
@@ -28,7 +28,6 @@
 #endif
 
 struct Context;
-struct Header;
 struct NntpData;
 struct NntpServer;
 
diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 3b8e9cf02..d6bf7b85a 100644
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -50,6 +50,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
diff --git a/pager.c b/pager.c
index bc5b88bcf..65013475a 100644
--- a/pager.c
+++ b/pager.c
@@ -62,7 +62,6 @@
 #include "recvattach.h"
 #include "recvcmd.h"
 #include "send.h"
-#include "sort.h"
 #include "status.h"
 #include "terminal.h"
 #ifdef USE_SIDEBAR
diff --git a/pager.h b/pager.h
index b3d74c8f1..2179db800 100644
--- a/pager.h
+++ b/pager.h
@@ -23,11 +23,9 @@
 #ifndef _MUTT_PAGER_H
 #define _MUTT_PAGER_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
-struct Context;
-struct Menu;
-
 /* These Config Variables are only used in pager.c */
 extern bool          AllowAnsi;
 extern bool          HeaderColorPartial;
diff --git a/pop/pop.c b/pop/pop.c
index a2d7993ed..db46ce200 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 #include "pop_private.h"
 #include "mutt/mutt.h"
@@ -52,9 +53,7 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "progress.h"
-#include "protos.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
@@ -62,6 +61,8 @@
 #include <libintl.h>
 #endif
 
+struct BodyCache;
+
 /* These Config Variables are only used in pop/pop.c */
 short PopCheckinterval;
 unsigned char PopDelete;
diff --git a/pop/pop.h b/pop/pop.h
index d5e5e829d..2cb6ac654 100644
--- a/pop/pop.h
+++ b/pop/pop.h
@@ -23,6 +23,7 @@
 #ifndef _POP_POP_H
 #define _POP_POP_H
 
+#include <stdbool.h>
 #include "mx.h"
 
 /**
diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index a089256ca..2ba239781 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -34,12 +34,9 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "conn/conn.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
-#include "options.h"
-#include "pop.h"
 #ifdef USE_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 0b722ace8..1533395d8 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -42,14 +42,10 @@
 #include "context.h"
 #include "globals.h"
 #include "mutt_account.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "muttlib.h"
-#include "options.h"
-#include "pop.h"
 #include "progress.h"
-#include "protos.h"
 
 /* These Config Variables are only used in pop/pop_lib.c */
 unsigned char PopReconnect;
diff --git a/postpone.c b/postpone.c
index 7b0fdf2d4..731e70351 100644
--- a/postpone.c
+++ b/postpone.c
@@ -48,7 +48,6 @@
 #include "mailbox.h"
 #include "menu.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
diff --git a/progress.c b/progress.c
index 51c8fb7f0..a36cd404f 100644
--- a/progress.c
+++ b/progress.c
@@ -33,14 +33,11 @@
 #include <string.h>
 #include <sys/time.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "progress.h"
 #include "curs_lib.h"
-#include "globals.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "options.h"
-#include "protos.h"
 
 /* These Config Variables are only used in progress.c */
 short TimeInc;
diff --git a/protos.h b/protos.h
index f9bfedeac..4d9f0d586 100644
--- a/protos.h
+++ b/protos.h
@@ -27,7 +27,6 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <time.h>
 
 struct Context;
 struct EnterState;
diff --git a/query.c b/query.c
index 0aa9e8cc9..6d1007d52 100644
--- a/query.c
+++ b/query.c
@@ -40,7 +40,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "protos.h"
 #include "send.h"
 
 /* These Config Variables are only used in query.c */
diff --git a/recvattach.c b/recvattach.c
index 51cdb2183..065a91dab 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -45,7 +45,6 @@
 #include "mailbox.h"
 #include "menu.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_parse.h"
 #include "mutt_window.h"
@@ -54,7 +53,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
 #include "recvcmd.h"
 #include "rfc1524.h"
 #include "send.h"
diff --git a/recvattach.h b/recvattach.h
index d29cbbd3c..e9254d05d 100644
--- a/recvattach.h
+++ b/recvattach.h
@@ -24,9 +24,12 @@
 #ifndef _MUTT_RECVATTACH_H
 #define _MUTT_RECVATTACH_H
 
+#include <stddef.h>
+#include <stdbool.h>
 #include "format_flags.h"
 
 struct AttachCtx;
+struct Header;
 
 /* These Config Variables are only used in recvattach.c */
 extern char *AttachSep;
diff --git a/recvcmd.c b/recvcmd.c
index 5203dd49a..3836ae5c9 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -40,7 +40,6 @@
 #include "muttlib.h"
 #include "options.h"
 #include "protos.h"
-#include "recvattach.h"
 #include "send.h"
 #include "sendlib.h"
 #include "state.h"
diff --git a/remailer.c b/remailer.c
index a304fa1c2..e230ac2ac 100644
--- a/remailer.c
+++ b/remailer.c
@@ -33,7 +33,6 @@
 #include "curs_lib.h"
 #include "filter.h"
 #include "format_flags.h"
-#include "globals.h"
 #include "keymap.h"
 #include "menu.h"
 #include "mutt_curses.h"
diff --git a/rfc1524.c b/rfc1524.c
index 095606e55..69802096d 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -44,7 +44,6 @@
 #include "globals.h"
 #include "mutt_attach.h"
 #include "muttlib.h"
-#include "options.h"
 #include "protos.h"
 
 /* These Config Variables are only used in rfc1524.c */
diff --git a/rfc3676.c b/rfc3676.c
index 31b4b86dd..6d4e22a9c 100644
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -35,8 +35,6 @@
 #include "globals.h"
 #include "mutt_window.h"
 #include "muttlib.h"
-#include "options.h"
-#include "protos.h"
 #include "state.h"
 
 /* These Config Variables are only used in rfc3676.c */
diff --git a/rfc3676.h b/rfc3676.h
index 4ef411bd2..89b9440c8 100644
--- a/rfc3676.h
+++ b/rfc3676.h
@@ -25,6 +25,8 @@
 #ifndef _MUTT_RFC3676_H
 #define _MUTT_RFC3676_H
 
+#include <stdbool.h>
+
 struct Body;
 struct Header;
 struct State;
diff --git a/safe_asprintf.c b/safe_asprintf.c
index b5acb8754..6b5985c10 100644
--- a/safe_asprintf.c
+++ b/safe_asprintf.c
@@ -32,6 +32,7 @@
 
 #include "config.h"
 #include <stdarg.h>
+#include <stdio.h>
 #include "mutt/mutt.h"
 
 #ifdef HAVE_VASPRINTF
diff --git a/sendlib.c b/sendlib.c
index 6d66cff8b..9e91470bb 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -44,20 +44,15 @@
 #include "copy.h"
 #include "curs_lib.h"
 #include "filter.h"
-#include "format_flags.h"
 #include "globals.h"
 #include "handler.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
-#include "pager.h"
-#include "protos.h"
-#include "recvattach.h"
 #include "send.h"
 #include "smtp.h"
 #include "state.h"
diff --git a/sidebar.c b/sidebar.c
index a038ba18e..44943be6a 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "sidebar.h"
 #include "buffy.h"
 #include "context.h"
@@ -48,8 +47,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "opcodes.h"
-#include "options.h"
-#include "protos.h"
 #include "sort.h"
 #ifdef USE_NOTMUCH
 #include "notmuch/mutt_notmuch.h"
diff --git a/sidebar.h b/sidebar.h
index ae1e4c2e5..a681dd248 100644
--- a/sidebar.h
+++ b/sidebar.h
@@ -25,6 +25,8 @@
 #ifndef _MUTT_SIDEBAR_H
 #define _MUTT_SIDEBAR_H
 
+#include <stdbool.h>
+
 struct Buffy;
 struct Context;
 
diff --git a/smtp.c b/smtp.c
index 494245a42..9e1a866a0 100644
--- a/smtp.c
+++ b/smtp.c
@@ -40,7 +40,6 @@
 #include "mutt_socket.h"
 #include "options.h"
 #include "progress.h"
-#include "protos.h"
 #include "sendlib.h"
 #ifdef USE_SASL
 #include <sasl/sasl.h>
diff --git a/sort.c b/sort.c
index c51fef0c0..8fca09933 100644
--- a/sort.c
+++ b/sort.c
@@ -33,7 +33,6 @@
 #include "mutt_logging.h"
 #include "mutt_thread.h"
 #include "options.h"
-#include "protos.h"
 #include "score.h"
 #ifdef USE_NNTP
 #include "mx.h"
diff --git a/sort.h b/sort.h
index 9b3548953..dbb926549 100644
--- a/sort.h
+++ b/sort.h
@@ -23,10 +23,11 @@
 #ifndef _MUTT_SORT_H
 #define _MUTT_SORT_H
 
+#include <stdbool.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
 #include "where.h"
 
+struct Address;
 struct Context;
 
 /* These Config Variables are only used in sort.c */
diff --git a/system.c b/system.c
index d7df68ec1..285800ce1 100644
--- a/system.c
+++ b/system.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
-#include "protos.h"
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif