iwyu: optimise #includes

igor47 · Mar 25, 2021 · f0556eb · f0556eb
1 parent 38fb0e2
commit f0556eb
Show file tree

Hide file tree

Showing 72 changed files with 41 additions and 95 deletions.
diff --git a/alias/commands.c b/alias/commands.c
@@ -39,7 +39,6 @@
 #include "command_parse.h"
 #include "init.h"
 #include "mutt_commands.h"
-#include "mutt_logging.h"
 #include "reverse.h"
 
 /**

diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #include <errno.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -37,20 +38,16 @@
 #include "address/lib.h"
 #include "config/lib.h"
 #include "email/lib.h"
-#include "core/mxapi.h"
+#include "core/lib.h"
 #include "gui/lib.h"
 #include "lib.h"
-#include "hcache/lib.h"
 #include "ncrypt/lib.h"
 #include "send/lib.h"
 #include "browser.h"
-#include "mutt_globals.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "options.h"
 
-struct Mailbox;
-
 /**
  * autocrypt_dir_init - Initialise an Autocrypt directory
  * @param can_create If true, the directory may be created

diff --git a/autocrypt/db.c b/autocrypt/db.c
@@ -38,8 +38,6 @@
 #include "core/lib.h"
 #include "lib.h"
 
-struct Mailbox;
-
 /* Prepared statements */
 static sqlite3_stmt *AccountGetStmt;
 static sqlite3_stmt *AccountInsertStmt;

diff --git a/autocrypt/dlgautocrypt.c b/autocrypt/dlgautocrypt.c
@@ -43,8 +43,6 @@
 #include "muttlib.h"
 #include "opcodes.h"
 
-struct Mailbox;
-
 /**
  * struct AccountEntry - An entry in the Autocrypt account Menu
  */

diff --git a/autocrypt/gpgme.c b/autocrypt/gpgme.c
@@ -36,7 +36,6 @@
 #include "config/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
-#include "lib.h"
 #include "ncrypt/lib.h"
 #include "options.h"
 

diff --git a/bcache/bcache.c b/bcache/bcache.c
@@ -30,7 +30,6 @@
 #include "config.h"
 #include <dirent.h>
 #include <errno.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>

diff --git a/bcache/lib.h b/bcache/lib.h
@@ -35,7 +35,6 @@
 #define MUTT_BCACHE_LIB_H
 
 #include <stdio.h>
-#include <stdbool.h>
 
 struct ConnAccount;
 struct BodyCache;

diff --git a/commands.c b/commands.c
@@ -68,7 +68,6 @@
 #include "options.h"
 #include "progress.h"
 #include "protos.h"
-#include "sort.h"
 #ifdef USE_IMAP
 #include "imap/lib.h"
 #endif

diff --git a/complete.c b/complete.c
@@ -34,7 +34,6 @@
 #include "mutt/lib.h"
 #include "config/lib.h"
 #include "core/lib.h"
-#include "mutt_globals.h"
 #include "muttlib.h"
 #include "options.h"
 #include "protos.h" // IWYU pragma: keep

diff --git a/compmbox/compress.c b/compmbox/compress.c
@@ -39,6 +39,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
 #include "lib.h"

diff --git a/conn/lib.h b/conn/lib.h
@@ -45,7 +45,6 @@
 #define MUTT_CONN_LIB_H
 
 #include "config.h"
-#include <stdbool.h>
 // IWYU pragma: begin_exports
 #include "connaccount.h"
 #include "connection.h"

diff --git a/conn/private.h b/conn/private.h
@@ -24,7 +24,6 @@
 #define MUTT_CONN_PRIVATE_H
 
 #include <stddef.h>
-#include <stdbool.h>
 #include <time.h>
 
 struct Connection;

diff --git a/conn/raw.c b/conn/raw.c
@@ -45,6 +45,7 @@
 #include <unistd.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
 #include "lib.h"

diff --git a/context.c b/context.c
@@ -29,14 +29,13 @@
 #include "config.h"
 #include <string.h>
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "context.h"
 #include "imap/lib.h"
-#include "maildir/lib.h"
 #include "ncrypt/lib.h"
 #include "pattern/lib.h"
-#include "mutt_globals.h"
 #include "mutt_header.h"
 #include "mutt_thread.h"
 #include "mx.h"

diff --git a/copy.c b/copy.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include "mutt/lib.h"
 #include "address/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"

diff --git a/editmsg.c b/editmsg.c
@@ -35,13 +35,13 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"
-#include "mutt_globals.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "protos.h"

diff --git a/email/globals.c b/email/globals.c
@@ -27,8 +27,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
-#include <stdbool.h>
 #include "mutt/lib.h"
 
 /* Global variables */

diff --git a/email/rfc2047.c b/email/rfc2047.c
@@ -41,7 +41,6 @@
 #include "core/lib.h"
 #include "rfc2047.h"
 #include "envelope.h"
-#include "globals.h"
 #include "mime.h"
 
 #define ENCWORD_LEN_MAX 75

diff --git a/email/rfc2231.c b/email/rfc2231.c
@@ -41,7 +41,6 @@
 #include "config/lib.h"
 #include "core/lib.h"
 #include "rfc2231.h"
-#include "globals.h"
 #include "mime.h"
 #include "parameter.h"
 #include "rfc2047.h"

diff --git a/email/rfc2231.h b/email/rfc2231.h
@@ -24,7 +24,6 @@
 #define MUTT_EMAIL_RFC2231_H
 
 #include <stddef.h>
-#include <stdbool.h>
 
 struct ParameterList;
 

diff --git a/enter.c b/enter.c
@@ -34,6 +34,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "alias/lib.h"
 #include "gui/lib.h"

diff --git a/flags.c b/flags.c
@@ -37,9 +37,7 @@
 #include "mutt.h"
 #include "index/lib.h"
 #include "keymap.h"
-#include "mutt_globals.h"
 #include "protos.h"
-#include "sort.h"
 
 /**
  * mutt_set_flag_update - Set a flag on an email

diff --git a/gui/mutt_window.c b/gui/mutt_window.c
@@ -37,7 +37,6 @@
 #include "helpbar/lib.h"
 #include "keymap.h"
 #include "mutt_curses.h"
-#include "mutt_globals.h"
 #include "mutt_menu.h"
 #include "opcodes.h"
 #include "options.h"

diff --git a/help.c b/help.c
@@ -34,12 +34,12 @@
 #include <string.h>
 #include <wchar.h>
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
 #include "pager/lib.h"
 #include "functions.h"
 #include "keymap.h"
-#include "mutt_globals.h"
 #include "muttlib.h"
 #include "opcodes.h"
 #include "protos.h" // IWYU pragma: keep

diff --git a/hook.c b/hook.c
@@ -35,7 +35,9 @@
 #include <unistd.h>
 #include "mutt/lib.h"
 #include "address/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
+#include "core/lib.h"
 #include "alias/lib.h"
 #include "mutt.h"
 #include "hook.h"

diff --git a/hook.h b/hook.h
@@ -24,7 +24,6 @@
 #define MUTT_HOOK_H
 
 #include "config.h"
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt_commands.h"

diff --git a/imap/adata.c b/imap/adata.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "conn/lib.h"
 #include "adata.h"

diff --git a/imap/auth.c b/imap/auth.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "auth.h"
 

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
@@ -39,11 +39,11 @@
 #include <string.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "conn/lib.h"
 #include "adata.h"
 #include "auth.h"
-#include "mutt_logging.h"
 #include "mutt_socket.h"
 #ifdef HAVE_HEIMDAL
 #include <gssapi/gssapi.h>

diff --git a/imap/auth_login.c b/imap/auth_login.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "conn/lib.h"
 #include "adata.h"

diff --git a/imap/auth_oauth.c b/imap/auth_oauth.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 #include "conn/lib.h"
 #include "auth.h"

diff --git a/imap/browse.c b/imap/browse.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "conn/lib.h"
@@ -43,7 +44,6 @@
 #include "adata.h"
 #include "browser.h"
 #include "mdata.h"
-#include "mutt_globals.h"
 #include "mutt_logging.h"
 #include "muttlib.h"
 

diff --git a/imap/command.c b/imap/command.c
@@ -40,6 +40,7 @@
 #include <string.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "conn/lib.h"
@@ -49,7 +50,6 @@
 #include "mdata.h"
 #include "msn.h"
 #include "mutt_account.h"
-#include "mutt_globals.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "mx.h"

diff --git a/imap/imap.c b/imap/imap.c
@@ -45,7 +45,6 @@
 #include "gui/lib.h"
 #include "mutt.h"
 #include "lib.h"
-#include "bcache/lib.h"
 #include "adata.h"
 #include "auth.h"
 #include "command_parse.h"
@@ -56,7 +55,6 @@
 #include "mdata.h"
 #include "msn.h"
 #include "mutt_commands.h"
-#include "mutt_globals.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "muttlib.h"

diff --git a/imap/message.c b/imap/message.c
@@ -66,9 +66,6 @@
 #ifdef USE_HCACHE
 #include "hcache/lib.h"
 #endif
-#ifdef USE_AUTOCRYPT
-#include "autocrypt/lib.h"
-#endif
 
 struct BodyCache;
 

diff --git a/imap/utf7.c b/imap/utf7.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "core/lib.h"
 
 // clang-format off

diff --git a/mailcap.c b/mailcap.c
@@ -42,7 +42,6 @@
 #include "core/lib.h"
 #include "mailcap.h"
 #include "mutt_attach.h"
-#include "mutt_globals.h"
 #include "muttlib.h"
 #include "protos.h"
 

diff --git a/maildir/maildir.c b/maildir/maildir.c
@@ -45,6 +45,7 @@
 #include <utime.h>
 #include "private.h"
 #include "mutt/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "lib.h"

diff --git a/maildir/mh.c b/maildir/mh.c
@@ -58,7 +58,6 @@
 #include "mx.h"
 #include "progress.h"
 #include "sequence.h"
-#include "sort.h"
 #ifdef USE_HCACHE
 #include "hcache/lib.h"
 #endif