iwyu: remove unnecessary headers

royger · Jan 17, 2018 · b1fafbd · b1fafbd
1 parent 835bb31
commit b1fafbd
Show file tree

Hide file tree

Showing 90 changed files with 61 additions and 168 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -53,18 +53,13 @@
 #include "options.h"
 #include "protos.h"
 #include "sort.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef MIXMASTER
 #include "remailer.h"
 #endif
 #ifdef USE_NNTP
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 
-struct Body;
 struct Header;
 struct Context;
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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