diff --git a/alias.c b/alias.c
index 00ef08ac276..61fb75a6c23 100644
--- a/alias.c
+++ b/alias.c
@@ -38,9 +38,6 @@
 #include "mutt_curses.h"
 #include "options.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 struct Address *mutt_lookup_alias(const char *s)
 {
diff --git a/attach.c b/attach.c
index 191f1d5d6c5..69515289a95 100644
--- a/attach.c
+++ b/attach.c
@@ -40,7 +40,6 @@
 #include "mailbox.h"
 #include "mime.h"
 #include "mutt_curses.h"
-#include "mutt_menu.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
diff --git a/bcache.c b/bcache.c
index 3eb1bd10dcf..719415389ad 100644
--- a/bcache.c
+++ b/bcache.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "bcache.h"
 #include "globals.h"
 #include "mutt_account.h"
diff --git a/bcache.h b/bcache.h
index 9913d5a6640..6626e263f89 100644
--- a/bcache.h
+++ b/bcache.h
@@ -24,7 +24,6 @@
 #ifndef _MUTT_BCACHE_H
 #define _MUTT_BCACHE_H
 
-#include <stdbool.h>
 #include <stdio.h>
 
 struct Account;
diff --git a/body.c b/body.c
index 7acc19ceb0d..b25e6421b49 100644
--- a/body.c
+++ b/body.c
@@ -24,9 +24,7 @@
 #include <limits.h>
 #include <string.h>
 #include <unistd.h>
-#include "mutt/debug.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "body.h"
 #include "header.h"
 #include "mime.h"
diff --git a/browser.c b/browser.c
index 0aa21a7b21a..8b6a3275f4e 100644
--- a/browser.c
+++ b/browser.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
@@ -49,7 +48,6 @@
 #include "keymap.h"
 #include "mailbox.h"
 #include "mbyte.h"
-#include "mutt_account.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mx.h"
@@ -58,9 +56,6 @@
 #include "protos.h"
 #include "sort.h"
 #include "url.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
diff --git a/buffy.c b/buffy.c
index c0555837942..79dfa0fd47b 100644
--- a/buffy.c
+++ b/buffy.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
+#include "conn/conn.h"
 #include "buffy.h"
 #include "context.h"
 #include "envelope.h"
diff --git a/commands.c b/commands.c
index b01d92c021a..526bd1d2f7d 100644
--- a/commands.c
+++ b/commands.c
@@ -23,15 +23,14 @@
 
 #include "config.h"
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"
@@ -56,9 +55,6 @@
 #include "parameter.h"
 #include "protos.h"
 #include "sort.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
diff --git a/complete.c b/complete.c
index 47cda133e5c..c9988e4077f 100644
--- a/complete.c
+++ b/complete.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "globals.h"
 #include "options.h"
 #include "protos.h"
diff --git a/compose.c b/compose.c
index c0c85ec5d07..f68a3f0f8d6 100644
--- a/compose.c
+++ b/compose.c
@@ -53,9 +53,6 @@
 #include "options.h"
 #include "protos.h"
 #include "sort.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef MIXMASTER
 #include "remailer.h"
 #endif
@@ -63,8 +60,6 @@
 #include "nntp.h"
 #endif
 
-struct Address;
-
 static const char *There_are_no_attachments = N_("There are no attachments.");
 
 #define CHECK_COUNT                                                            \
diff --git a/compress.c b/compress.c
index b9a02778045..d96fb7f41b6 100644
--- a/compress.c
+++ b/compress.c
@@ -32,7 +32,6 @@
 #include "compress.h"
 #include "context.h"
 #include "format_flags.h"
-#include "globals.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mx.h"
diff --git a/conn/sasl_plain.c b/conn/sasl_plain.c
index a50d7bf6cdf..e349eb4cfc0 100644
--- a/conn/sasl_plain.c
+++ b/conn/sasl_plain.c
@@ -32,8 +32,7 @@
 
 #include "config.h"
 #include <stdio.h>
-#include "mutt/base64.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 
 /**
  * mutt_sasl_plain_msg - Create an SASL command
diff --git a/conn/socket.c b/conn/socket.c
index ca65bfeaac3..9b0e7c5892f 100644
--- a/conn/socket.c
+++ b/conn/socket.c
@@ -57,10 +57,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
-#include "mutt/debug.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "account.h"
 #include "conn_globals.h"
 #include "connection.h"
diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index c242df8cb19..b9c8b7dc801 100644
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -38,17 +38,10 @@
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
-#include "mutt/date.h"
-#include "mutt/debug.h"
-#include "mutt/file.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/regex3.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "account.h"
 #include "conn_globals.h"
diff --git a/conn/tunnel.c b/conn/tunnel.c
index c99a210ccf4..0d89d13214a 100644
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -34,17 +34,11 @@
 #include "config.h"
 #include <errno.h>
 #include <fcntl.h>
-#include <netinet/in.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/signal2.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "tunnel.h"
 #include "account.h"
diff --git a/copy.h b/copy.h
index 98ed22c20bd..4a57ba88348 100644
--- a/copy.h
+++ b/copy.h
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 
-struct Body;
 struct Header;
 struct Context;
 
diff --git a/curs_lib.c b/curs_lib.c
index 6280451b127..65042a9e387 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -44,16 +44,12 @@
 #include "enter_state.h"
 #include "globals.h"
 #include "header.h"
-#include "mbyte.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "opcodes.h"
 #include "options.h"
 #include "pager.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef HAVE_ISWBLANK
 #include <wctype.h>
 #endif
diff --git a/curs_main.c b/curs_main.c
index af2d0006588..4655a1d6b50 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -52,9 +52,6 @@
 #include "sort.h"
 #include "tags.h"
 #include "thread.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/term.h>
 #elif defined(HAVE_NCURSES_NCURSES_H)
diff --git a/edit.c b/edit.c
index 42fdf945315..bde30283edd 100644
--- a/edit.c
+++ b/edit.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "address.h"
 #include "alias.h"
 #include "body.h"
@@ -42,9 +41,6 @@
 #include "mutt_curses.h"
 #include "options.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /*
  * SLcurses_waddnstr() can't take a "const char *", so this is only
diff --git a/enter.c b/enter.c
index 827105d88ce..11ae63b489e 100644
--- a/enter.c
+++ b/enter.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include <stddef.h>
-#include <limits.h>
+#include <stdbool.h>
 #include <string.h>
 #include <wchar.h>
 #include <wctype.h>
@@ -33,10 +33,8 @@
 #include "globals.h"
 #include "history.h"
 #include "keymap.h"
-#include "mbyte.h"
 #include "mutt_curses.h"
 #include "opcodes.h"
-#include "options.h"
 #include "protos.h"
 
 /**
diff --git a/envelope.c b/envelope.c
index f8e7925d796..c59f8dd835f 100644
--- a/envelope.c
+++ b/envelope.c
@@ -37,10 +37,7 @@
 
 #include "config.h"
 #include <stddef.h>
-#include "mutt/buffer.h"
-#include "mutt/memory.h"
-#include "mutt/queue.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "envelope.h"
 #include "address.h"
 #include "protos.h"
diff --git a/envelope.h b/envelope.h
index 4e4df32cbb7..07fde699907 100644
--- a/envelope.h
+++ b/envelope.h
@@ -24,7 +24,7 @@
 #define _MUTT_ENVELOPE_H
 
 #include <stdbool.h>
-#include "mutt/list.h"
+#include "mutt/mutt.h"
 
 /**
  * struct Envelope - The header of an email
diff --git a/filter.c b/filter.c
index 2775aeb5dbd..584f0d4163f 100644
--- a/filter.c
+++ b/filter.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "filter.h"
 #include "mutt_curses.h"
diff --git a/from.c b/from.c
index c175a3716f9..87fb40140ec 100644
--- a/from.c
+++ b/from.c
@@ -22,13 +22,10 @@
 
 #include "config.h"
 #include <ctype.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "globals.h"
-#include "protos.h"
 
 /*
  * A valid message separator looks like:
diff --git a/group.c b/group.c
index b4783ff7e0b..c780cfa9024 100644
--- a/group.c
+++ b/group.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #include <stdlib.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "group.h"
 #include "address.h"
 #include "globals.h"
diff --git a/handler.c b/handler.c
index 6706ae08b09..c390cc30dcf 100644
--- a/handler.c
+++ b/handler.c
@@ -51,9 +51,6 @@
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 #define BUFI_SIZE 1000
 #define BUFO_SIZE 2000
diff --git a/hdrline.c b/hdrline.c
index c38e6e797bb..cd1f02c8510 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -47,9 +46,6 @@
 #include "sort.h"
 #include "tags.h"
 #include "thread.h"
-#ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
-#endif
 
 /**
  * enum FlagChars - Index into the FlagChars variable ($flag_chars)
diff --git a/header.c b/header.c
index 601a7093422..a859b7f2308 100644
--- a/header.c
+++ b/header.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/help.c b/help.c
index b2a9bd7395a..8491920d704 100644
--- a/help.c
+++ b/help.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include <stddef.h>
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -31,7 +30,6 @@
 #include "mutt/mutt.h"
 #include "globals.h"
 #include "keymap.h"
-#include "mbyte.h"
 #include "mutt_curses.h"
 #include "opcodes.h"
 #include "options.h"
diff --git a/history.c b/history.c
index 44927407a24..43bc198cbcf 100644
--- a/history.c
+++ b/history.c
@@ -29,6 +29,7 @@
 #include "mutt/mutt.h"
 #include "history.h"
 #include "globals.h"
+#include "options.h"
 #include "protos.h"
 
 /* This history ring grows from 0..History, with last marking the
diff --git a/hook.c b/hook.c
index c84ed402206..e0d14bd73b5 100644
--- a/hook.c
+++ b/hook.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
@@ -31,7 +30,6 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
-#include "context.h"
 #include "envelope.h"
 #include "globals.h"
 #include "header.h"
@@ -44,6 +42,8 @@
 #include "compress.h"
 #endif
 
+struct Context;
+
 /**
  * struct Hook - A list of user hooks
  */
diff --git a/imap/browse.c b/imap/browse.c
index 06841714b36..d82eacc3a6c 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -49,9 +49,6 @@
 #include "mutt_account.h"
 #include "options.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /**
  * add_folder - Format and add an IMAP folder to the browser
diff --git a/imap/imap.h b/imap/imap.h
index 9e8f2eb43c8..f366e72eb50 100644
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -44,15 +44,16 @@
 #ifndef _IMAP_IMAP_H
 #define _IMAP_IMAP_H
 
+#include "conn/conn.h"
+#include "mutt_account.h"
 #include <stddef.h>
 #include <sys/types.h>
-#include "mutt_account.h"
 
-struct Header;
-struct Pattern;
+struct BrowserState;
 struct Context;
+struct Header;
 struct Message;
-struct BrowserState;
+struct Pattern;
 
 /**
  * struct ImapMbox - An IMAP mailbox
diff --git a/imap/message.c b/imap/message.c
index 8d69a3a50b0..5581b54f0be 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -71,6 +71,8 @@
 #include "hcache/hcache.h"
 #endif
 
+struct BodyCache;
+
 /**
  * new_header_data - Create a new ImapHeaderData
  * @retval ptr New ImapHeaderData
diff --git a/imap/message.h b/imap/message.h
index 6aa4ef3865f..63e17d43f17 100644
--- a/imap/message.h
+++ b/imap/message.h
@@ -26,7 +26,6 @@
 
 #include <stdbool.h>
 #include <time.h>
-#include "mutt/list.h"
 
 /**
  * struct ImapHeaderData - IMAP-specific header data
diff --git a/imap/util.c b/imap/util.c
index 5e28d203606..5b00c5aef8c 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -69,6 +69,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -78,7 +79,6 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "conn/conn.h"
-#include "mutt.h"
 #include "bcache.h"
 #include "context.h"
 #include "globals.h"
diff --git a/init.c b/init.c
index 239904f4958..795a482eff1 100644
--- a/init.c
+++ b/init.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <pwd.h>
diff --git a/init.h b/init.h
index 574f434944e..75d74b50bc5 100644
--- a/init.h
+++ b/init.h
@@ -35,7 +35,7 @@
 #include "group.h"
 #include "mutt_commands.h"
 #include "mutt_options.h"
-#include "mutt/regex3.h"
+#include "mutt/mutt.h"
 #include "mx.h"
 #include "options.h"
 #include "protos.h"
@@ -47,8 +47,6 @@
 #endif
 #endif
 
-struct Buffer;
-
 #ifndef _MAKEDOC
 /* flags to parse_set() */
 #define MUTT_SET_INV   (1 << 0) /**< default is to invert all vars */
diff --git a/keymap.c b/keymap.c
index 2cf66042aca..873127458e8 100644
--- a/keymap.c
+++ b/keymap.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "keymap.h"
diff --git a/keymap.h b/keymap.h
index d8e44b2d2a3..36d4497e68c 100644
--- a/keymap.h
+++ b/keymap.h
@@ -24,7 +24,7 @@
 #define _MUTT_KEYMAP_H
 
 #include <stddef.h>
-#include "mutt/mapping.h"
+#include "mutt/mutt.h"
 
 /* maximal length of a key binding sequence used for buffer in km_bindkey */
 #define MAX_SEQ 8
diff --git a/main.c b/main.c
index 76b3048feea..fa247d11807 100644
--- a/main.c
+++ b/main.c
@@ -48,7 +48,6 @@
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mutt_socket.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "protos.h"
diff --git a/mbyte.c b/mbyte.c
index a79bf574580..2d8fb8445c1 100644
--- a/mbyte.c
+++ b/mbyte.c
@@ -23,14 +23,14 @@
 
 #include "config.h"
 #include <errno.h>
+#include <libintl.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <string.h>
 #include <wchar.h>
+#include <wctype.h>
 #include "mutt/mutt.h"
 #include "mbyte.h"
-#include "options.h"
-#include "protos.h"
 
 #ifndef EILSEQ
 #define EILSEQ EINVAL
diff --git a/mbyte.h b/mbyte.h
index 367aeb02f45..11be857c019 100644
--- a/mbyte.h
+++ b/mbyte.h
@@ -25,7 +25,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <wchar.h>
 
 void mutt_set_charset(char *charset);
 extern bool Charset_is_utf8;
diff --git a/menu.c b/menu.c
index 7eaedfe1bba..dbe7df1ec09 100644
--- a/menu.c
+++ b/menu.c
@@ -40,13 +40,12 @@
 #include "pattern.h"
 #include "protos.h"
 #include "tags.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
 #endif
 
+struct Header;
+
 char *SearchBuffers[MENU_MAX];
 
 /* These are used to track the active menus, for redraw operations. */
diff --git a/mutt/file.c b/mutt/file.c
index 1e0a2d1a1da..982a16dd3c9 100644
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -64,6 +64,7 @@
  */
 
 #include "config.h"
+#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -75,7 +76,6 @@
 #include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <utime.h>
 #include "file.h"
diff --git a/mutt/list.h b/mutt/list.h
index 714b0013cf3..32425fbfc49 100644
--- a/mutt/list.h
+++ b/mutt/list.h
@@ -25,7 +25,7 @@
 #define _MUTT_LIST_H
 
 #include <stdbool.h>
-#include "mutt/queue.h"
+#include "queue.h"
 
 /**
  * struct ListNode - A List node for strings
diff --git a/mutt/mbyte.h b/mutt/mbyte.h
index 9fc4e0ff23e..cd097b233cf 100644
--- a/mutt/mbyte.h
+++ b/mutt/mbyte.h
@@ -26,6 +26,7 @@
 #include <stddef.h>
 #include <ctype.h>
 #include <stdbool.h>
+#include <wchar.h>
 #include <wctype.h>
 
 extern bool OPT_LOCALES;
diff --git a/mutt_account.c b/mutt_account.c
index e4075166330..a81dfffe092 100644
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
+#include "conn/conn.h"
 #include "mutt_account.h"
 #include "globals.h"
 #include "options.h"
diff --git a/mutt_account.h b/mutt_account.h
index 8bb64bfd62d..3c6bd0d5993 100644
--- a/mutt_account.h
+++ b/mutt_account.h
@@ -25,8 +25,7 @@
 #ifndef _MUTT_ACCOUNT_H
 #define _MUTT_ACCOUNT_H
 
-#include "conn/conn.h"
-
+struct Account;
 struct Url;
 
 /**
diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index e3d995fadaf..d65a7fb1a3f 100644
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -44,6 +44,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/mutt_socket.c b/mutt_socket.c
index 53b67ce1a65..f9f1c889d8a 100644
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -24,10 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt/queue.h"
 #include "conn/conn.h"
 #include "mutt_socket.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "protos.h"
 #include "url.h"
diff --git a/mutt_socket.h b/mutt_socket.h
index f536554abfd..6db07fb8687 100644
--- a/mutt_socket.h
+++ b/mutt_socket.h
@@ -23,10 +23,11 @@
 #ifndef _MUTT_SOCKET_H
 #define _MUTT_SOCKET_H
 
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 
 struct Account;
+struct Connection;
 
 /* logging levels */
 #define MUTT_SOCK_LOG_CMD  2
diff --git a/muttlib.c b/muttlib.c
index 993f0e27c24..1418ad4d3c2 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -60,9 +60,6 @@
 #include "protos.h"
 #include "tags.h"
 #include "url.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
diff --git a/mx.c b/mx.c
index 3055318d02c..3a2108cd375 100644
--- a/mx.c
+++ b/mx.c
@@ -23,11 +23,9 @@
 
 #include "config.h"
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 2c4d2ab018d..3ea832cb696 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -64,9 +64,6 @@
 #include "protos.h"
 #include "sort.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /* Values used for comparing addresses. */
 #define CRYPT_KV_VALID 1
diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 3765c6f2ae7..549e3cdcee1 100644
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -60,9 +60,6 @@
 #include "pgpmicalg.h"
 #include "protos.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 char PgpPass[LONG_STRING];
 time_t PgpExptime = 0; /* when does the cached passphrase expire? */
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 43f524bb447..58e7b6cd15e 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -53,9 +53,6 @@
 #include "parameter.h"
 #include "protos.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /**
  * struct SmimeCommandContext - Data for a SIME command
diff --git a/nntp.c b/nntp.c
index ff21ed8c640..4541f1f2834 100644
--- a/nntp.c
+++ b/nntp.c
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "conn/conn.h"
diff --git a/nntp.h b/nntp.h
index 6b211ea3b46..d4d95263f61 100644
--- a/nntp.h
+++ b/nntp.h
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <time.h>
 #include "format_flags.h"
-#include "where.h"
 #include "mx.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
diff --git a/pager.c b/pager.c
index 97887a178a3..7dc84e008b6 100644
--- a/pager.c
+++ b/pager.c
@@ -52,7 +52,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "pattern.h"
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_SIDEBAR
@@ -61,9 +60,6 @@
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
 
diff --git a/parameter.c b/parameter.c
index 1f087a91ced..d9f74ee14de 100644
--- a/parameter.c
+++ b/parameter.c
@@ -36,6 +36,8 @@
  */
 
 #include "config.h"
+#include <stddef.h>
+#include "mutt/mutt.h"
 #include "parameter.h"
 
 /**
diff --git a/parameter.h b/parameter.h
index c2e86068c0e..7f1e8ea2de6 100644
--- a/parameter.h
+++ b/parameter.h
@@ -23,8 +23,6 @@
 #ifndef _MUTT_PARAMETER_H
 #define _MUTT_PARAMETER_H
 
-#include "mutt/mutt.h"
-
 /**
  * struct Parameter - Attribute associated with a MIME part
  */
diff --git a/parse.c b/parse.c
index b34f7a5df85..91a1631f9bd 100644
--- a/parse.c
+++ b/parse.c
@@ -45,7 +45,6 @@
 #include "rfc2231.h"
 #include "url.h"
 
-struct Address;
 struct Context;
 
 /**
diff --git a/pattern.c b/pattern.c
index f8ea2530acf..a1a4afb8ff1 100644
--- a/pattern.c
+++ b/pattern.c
@@ -33,9 +33,8 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
-#include <wctype.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "pattern.h"
 #include "address.h"
@@ -57,9 +56,6 @@
 #include "state.h"
 #include "tags.h"
 #include "thread.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
diff --git a/pattern.h b/pattern.h
index 663a43bb53b..38cbdb0b310 100644
--- a/pattern.h
+++ b/pattern.h
@@ -29,7 +29,6 @@
 #include "mutt/mutt.h"
 
 struct Address;
-struct Buffer;
 struct Header;
 struct Context;
 
diff --git a/postpone.c b/postpone.c
index d7251327695..bafd442dee8 100644
--- a/postpone.c
+++ b/postpone.c
@@ -30,6 +30,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "body.h"
 #include "context.h"
diff --git a/protos.h b/protos.h
index 5cbb97ac9d6..fe3b9276abd 100644
--- a/protos.h
+++ b/protos.h
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <wctype.h>
+#include "mutt.h"
 #include "format_flags.h"
 #include "options.h"
 
diff --git a/query.c b/query.c
index 38ea7ba71f4..0b0015ee30f 100644
--- a/query.c
+++ b/query.c
@@ -41,9 +41,6 @@
 #include "mutt_menu.h"
 #include "opcodes.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /**
  * struct Query - An entry from an external address-book
diff --git a/recvattach.c b/recvattach.c
index c9098fad486..77b45debc27 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -50,9 +50,6 @@
 #include "protos.h"
 #include "rfc1524.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 static void mutt_update_recvattach_menu(struct AttachCtx *actx, struct Menu *menu, int init);
 
diff --git a/remailer.c b/remailer.c
index 509bb441249..4ea72304cc2 100644
--- a/remailer.c
+++ b/remailer.c
@@ -27,6 +27,7 @@
 #include "config.h"
 #include <fcntl.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/resize.c b/resize.c
index 08a02d640d4..633554ffc28 100644
--- a/resize.c
+++ b/resize.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include <fcntl.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
diff --git a/rfc1524.c b/rfc1524.c
index af446ab2306..bef66ccf8b9 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -34,7 +34,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "rfc1524.h"
diff --git a/rfc2047.c b/rfc2047.c
index 6d76602cf23..40b350b8af3 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <iconv.h>
+#include <stdbool.h>
 #include <string.h>
 #include "mutt/mutt.h"
 #include "rfc2047.h"
@@ -33,7 +34,6 @@
 #include "mbyte.h"
 #include "mime.h"
 #include "options.h"
-#include "protos.h"
 
 /* If you are debugging this file, comment out the following line. */
 /* #define NDEBUG */
diff --git a/rfc2231.c b/rfc2231.c
index c5c20ac794b..9cbd23f4e02 100644
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,7 +42,6 @@
 #include "mime.h"
 #include "options.h"
 #include "parameter.h"
-#include "protos.h"
 #include "rfc2047.h"
 
 /**
diff --git a/rfc3676.c b/rfc3676.c
index 89a34d32c4b..a261cbf6038 100644
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "body.h"
 #include "globals.h"
 #include "header.h"
diff --git a/safe_asprintf.c b/safe_asprintf.c
index 90a47418d8f..682d1a938ca 100644
--- a/safe_asprintf.c
+++ b/safe_asprintf.c
@@ -21,8 +21,8 @@
  */
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <unistd.h>
 #include "mutt/mutt.h"
 
 /* NOTE: Currently there is no check in configure.ac for vasprintf(3).  the
diff --git a/score.c b/score.c
index 92ccdefcf37..0b24478ad2c 100644
--- a/score.c
+++ b/score.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
diff --git a/send.c b/send.c
index e5e33804a06..da3400ad08c 100644
--- a/send.c
+++ b/send.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>
diff --git a/sendlib.c b/sendlib.c
index 5b38c016177..46aa5890ead 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -21,8 +21,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <iconv.h>
@@ -37,7 +35,6 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
diff --git a/signal.c b/signal.c
index 0e7bbd3ee4e..7e090291e29 100644
--- a/signal.c
+++ b/signal.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #include <errno.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sort.c b/sort.c
index 9beecb26fb1..452abe670fe 100644
--- a/sort.c
+++ b/sort.c
@@ -21,10 +21,10 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "sort.h"
 #include "address.h"
 #include "body.h"
diff --git a/sort.h b/sort.h
index 5da3fab271e..b6023c82037 100644
--- a/sort.h
+++ b/sort.h
@@ -24,7 +24,7 @@
 #define _MUTT_SORT_H
 
 #include "where.h"
-#include "mutt/mapping.h"
+#include "mutt/mutt.h"
 
 struct Address;
 struct Context;
diff --git a/state.c b/state.c
index 36ae3536723..3e837baf104 100644
--- a/state.c
+++ b/state.c
@@ -23,9 +23,10 @@
 #include "config.h"
 #include <limits.h>
 #include <stdarg.h>
+#include <wchar.h>
+#include "mutt/mutt.h"
 #include "state.h"
 #include "globals.h"
-#include "mbyte.h"
 
 void state_mark_attach(struct State *s)
 {
diff --git a/status.c b/status.c
index 5b4194ae1c2..c962db9d884 100644
--- a/status.c
+++ b/status.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "context.h"
diff --git a/system.c b/system.c
index 9d4a2ff719c..b0c2a986238 100644
--- a/system.c
+++ b/system.c
@@ -21,11 +21,8 @@
  */
 
 #include "config.h"
-#include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
diff --git a/tags.c b/tags.c
index 3549eec8896..8c71b2173be 100644
--- a/tags.c
+++ b/tags.c
@@ -45,11 +45,8 @@
 #include "config.h"
 #include <stddef.h>
 #include <string.h>
-#include "mutt/hash.h"
-#include "mutt/queue.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "tags.h"
-#include "globals.h"
 
 char *HiddenTags;           /**< Private tags which should not be displayed */
 struct Hash *TagTransforms; /**< Lookup table of alternative tag names */
diff --git a/tags.h b/tags.h
index 3b5624ed7b5..a73562f758a 100644
--- a/tags.h
+++ b/tags.h
@@ -23,9 +23,8 @@
 #ifndef _MUTT_TAG_H
 #define _MUTT_TAG_H
 
-#include <stddef.h>
 #include <stdbool.h>
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 
 extern char *HiddenTags;
 extern struct Hash *TagTransforms;
diff --git a/thread.c b/thread.c
index 7f5ff5e1c3c..254a62fdc23 100644
--- a/thread.c
+++ b/thread.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/thread.h b/thread.h
index c7b885af7b1..b5f0d676e1c 100644
--- a/thread.h
+++ b/thread.h
@@ -24,6 +24,7 @@
 #define _MUTT_THREAD_H
 
 #include <stdbool.h>
+#include "mutt.h"
 
 struct Context;
 struct Header;
diff --git a/url.h b/url.h
index 7cebe6768da..00c63675d73 100644
--- a/url.h
+++ b/url.h
@@ -22,7 +22,7 @@
 #define _MUTT_URL_H
 
 #include <stddef.h>
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 
 struct Envelope;