tidy #includes

georgalis · Dec 2, 2019 · a6ecad0 · a6ecad0
1 parent ec01ad3
commit a6ecad0
Show file tree

Hide file tree

Showing 66 changed files with 129 additions and 43 deletions.
diff --git a/addrbook.c b/addrbook.c
@@ -35,6 +35,7 @@
 #include "address/lib.h"
 #include "config/lib.h"
 #include "mutt.h"
+#include "addrbook.h"
 #include "alias.h"
 #include "curs_lib.h"
 #include "format_flags.h"

diff --git a/address/idna.c b/address/idna.c
@@ -27,11 +27,13 @@
  */
 
 #include "config.h"
-#include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 #include "mutt/mutt.h"
 #include "idna2.h"
+#ifdef HAVE_LIBIDN
+#include <stdbool.h>
+#include <string.h>
+#endif
 #ifdef HAVE_STRINGPREP_H
 #include <stringprep.h>
 #elif defined(HAVE_IDN_STRINGPREP_H)

diff --git a/autocrypt/autocrypt_gpgme.c b/autocrypt/autocrypt_gpgme.c
@@ -30,6 +30,7 @@
 #include <stddef.h>
 #include <gpgme.h>
 #include <stdbool.h>
+#include "autocrypt_private.h" // IWYU pragma: keep
 #include "mutt/mutt.h"
 #include "address/lib.h"
 #include "config/lib.h"
@@ -110,6 +111,7 @@ static int export_keydata(gpgme_ctx_t ctx, gpgme_key_t key, struct Buffer *keyda
   return rc;
 }
 
+#if 0
 /**
  * mutt_autocrypt_gpgme_export_key - Export a GPGME key
  * @param keyid   GPGME Key id
@@ -138,6 +140,7 @@ int mutt_autocrypt_gpgme_export_key(const char *keyid, struct Buffer *keydata)
   gpgme_release(ctx);
   return rc;
 }
+#endif
 
 /**
  * mutt_autocrypt_gpgme_create_key - Create a GPGME key

diff --git a/commands.c b/commands.c
@@ -43,6 +43,7 @@
 #include "email/lib.h"
 #include "core/lib.h"
 #include "mutt.h"
+#include "commands.h"
 #include "alias.h"
 #include "context.h"
 #include "copy.h"

diff --git a/complete.c b/complete.c
@@ -36,6 +36,7 @@
 #include "globals.h"
 #include "muttlib.h"
 #include "options.h"
+#include "protos.h" // IWYU pragma: keep
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif

diff --git a/config/bool.c b/config/bool.c
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "mutt/mutt.h"
+#include "bool.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/long.c b/config/long.c
@@ -31,6 +31,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include "mutt/mutt.h"
+#include "long.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/number.c b/config/number.c
@@ -31,6 +31,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include "mutt/mutt.h"
+#include "number.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/quad.c b/config/quad.c
@@ -31,6 +31,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include "mutt/mutt.h"
+#include "quad.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/regex.c b/config/regex.c
@@ -33,6 +33,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "mutt/mutt.h"
+#include "regex2.h" // IWYU pragma: keep
 #include "set.h"
 #include "types.h"
 

diff --git a/config/slist.c b/config/slist.c
@@ -31,6 +31,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include "mutt/mutt.h"
+#include "slist.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/string.c b/config/string.c
@@ -32,6 +32,7 @@
 #include <stdint.h>
 #include "mutt/mutt.h"
 #include "set.h"
+#include "string3.h" // IWYU pragma: keep
 #include "types.h"
 
 /**

diff --git a/conn/conn_globals.c b/conn/conn_globals.c
@@ -27,8 +27,10 @@
  */
 
 #include "config.h"
-#include <stdbool.h>
 #include <stdio.h>
+#ifdef USE_SSL
+#include <stdbool.h>
+#endif
 
 short C_ConnectTimeout = 0; ///< Config: Timeout for making network connections (-1 to wait indefinitely)
 

diff --git a/conn/conn_raw.c b/conn/conn_raw.c
@@ -35,7 +35,6 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/select.h>
@@ -44,13 +43,19 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "address/lib.h"
-#include "conn/connaccount.h"
 #include "conn_globals.h"
+#include "connaccount.h"
 #include "connection.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "options.h"
+#include "socket.h" // IWYU pragma: keep
+#ifdef HAVE_LIBIDN
+#include "address/lib.h"
+#endif
+#ifdef HAVE_GETADDRINFO
+#include <stdbool.h>
+#endif
 
 /* These Config Variables are only used in conn/conn_raw.c */
 #ifdef HAVE_GETADDRINFO

diff --git a/conn/getdomain.c b/conn/getdomain.c
@@ -33,6 +33,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h" // IWYU pragma: keep
 
 /**
  * getdnsdomainname - Lookup the host's name using DNS

diff --git a/conn/sasl_plain.c b/conn/sasl_plain.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #include <stdio.h>
 #include "mutt/mutt.h"
+#include "sasl_plain.h"
 
 /**
  * mutt_sasl_plain_msg - Construct a base64 encoded SASL PLAIN message

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
@@ -49,6 +49,7 @@
 #include "options.h"
 #include "protos.h"
 #include "socket.h"
+#include "ssl.h" // IWYU pragma: keep
 
 /* certificate error bitmap values */
 #define CERTERR_VALID 0

diff --git a/copy.c b/copy.c
@@ -43,12 +43,12 @@
 #include "handler.h"
 #include "hdrline.h"
 #include "mutt_window.h"
-#include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "sendlib.h"
 #include "state.h"
 #ifdef USE_NOTMUCH
+#include "muttlib.h"
 #include "notmuch/mutt_notmuch.h"
 #endif
 #ifdef ENABLE_NLS

diff --git a/edit.c b/edit.c
@@ -42,6 +42,7 @@
 #include "email/lib.h"
 #include "core/lib.h"
 #include "mutt.h"
+#include "edit.h"
 #include "alias.h"
 #include "context.h"
 #include "curs_lib.h"

diff --git a/email/from.c b/email/from.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "from.h"
 
 /**
  * is_from - Is a string a 'From' header line?

diff --git a/email/parse.c b/email/parse.c
@@ -41,13 +41,15 @@
 #include "email_globals.h"
 #include "envelope.h"
 #include "from.h"
-#include "globals.h"
 #include "mime.h"
 #include "parameter.h"
 #include "rfc2047.h"
 #include "rfc2231.h"
 #include "url.h"
 #ifdef USE_AUTOCRYPT
+#include "globals.h"
+#endif
+#ifdef USE_AUTOCRYPT
 #include "autocrypt/autocrypt.h"
 #endif
 

diff --git a/enriched.c b/enriched.c
@@ -38,6 +38,7 @@
 #include <wctype.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
+#include "enriched.h"
 #include "state.h"
 
 #define INDENT_SIZE 4

diff --git a/hcache/serialize.c b/hcache/serialize.c
@@ -31,12 +31,12 @@
 
 #include "config.h"
 #include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include "mutt/mutt.h"
 #include "address/lib.h"
 #include "email/lib.h"
+#include "serialize.h"
 #include "hcache.h"
 
 /**

diff --git a/help.c b/help.c
@@ -40,6 +40,7 @@
 #include "muttlib.h"
 #include "opcodes.h"
 #include "pager.h"
+#include "protos.h" // IWYU pragma: keep
 
 static const char *HelpStrings[] = {
 #define DEFINE_HELP_MESSAGE(opcode, help_string) help_string,

diff --git a/imap/auth.c b/imap/auth.c
@@ -30,6 +30,7 @@
 
 #include "config.h"
 #include <string.h>
+#include "imap_private.h" // IWYU pragma: keep
 #include "mutt/mutt.h"
 #include "auth.h"
 

diff --git a/imap/message.c b/imap/message.c
@@ -46,7 +46,6 @@
 #include "bcache.h"
 #include "curs_lib.h"
 #include "globals.h"
-#include "hcache/hcache.h"
 #include "imap/imap.h"
 #include "mutt_account.h"
 #include "mutt_curses.h"
@@ -59,6 +58,9 @@
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #endif
+#ifdef USE_HCACHE
+#include "hcache/hcache.h"
+#endif
 
 struct BodyCache;
 

diff --git a/imap/utf7.c b/imap/utf7.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #include <stdbool.h>
 #include <string.h>
+#include "imap_private.h" // IWYU pragma: keep
 #include "mutt/mutt.h"
 
 // clang-format off

diff --git a/imap/util.c b/imap/util.c
@@ -50,11 +50,13 @@
 #include "bcache.h"
 #include "curs_lib.h"
 #include "globals.h"
-#include "hcache/hcache.h"
 #include "imap/imap.h"
-#include "message.h"
 #include "mutt_account.h"
 #include "options.h"
+#ifdef USE_HCACHE
+#include "hcache/hcache.h"
+#include "message.h"
+#endif
 
 /* These Config Variables are only used in imap/util.c */
 char *C_ImapDelimChars; ///< Config: (imap) Characters that denote separators in IMAP folders

diff --git a/init.c b/init.c
@@ -50,7 +50,6 @@
 #include "alias.h"
 #include "context.h"
 #include "filter.h"
-#include "hcache/hcache.h"
 #include "keymap.h"
 #include "monitor.h"
 #include "mutt_menu.h"
@@ -62,6 +61,9 @@
 #include "protos.h"
 #include "sidebar.h"
 #include "version.h"
+#ifdef USE_HCACHE
+#include "hcache/hcache.h"
+#endif
 #ifdef USE_NOTMUCH
 #include "notmuch/mutt_notmuch.h"
 #endif

diff --git a/init.h b/init.h
@@ -49,7 +49,6 @@
 #include "edit.h"
 #include "globals.h"
 #include "handler.h"
-#include "hcache/hcache.h"
 #include "hdrline.h"
 #include "hook.h"
 #include "imap/imap.h"
@@ -67,7 +66,6 @@
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "nntp/nntp.h"
-#include "notmuch/mutt_notmuch.h"
 #include "pager.h"
 #include "pattern.h"
 #include "pop/pop.h"
@@ -84,6 +82,12 @@
 #include "smtp.h"
 #include "sort.h"
 #include "status.h"
+#ifdef USE_NOTMUCH
+#include "notmuch/mutt_notmuch.h"
+#endif
+#ifdef USE_HCACHE
+#include "hcache/hcache.h"
+#endif
 #ifdef MIXMASTER
 #include "remailer.h"
 #endif
@@ -120,7 +124,9 @@ enum MuttSetCommand
 bool C_IgnoreLinearWhiteSpace = false;
 
 int charset_validator    (const struct ConfigSet *cs, const struct ConfigDef *cdef, intptr_t value, struct Buffer *err);
+#ifdef USE_HCACHE
 int hcache_validator     (const struct ConfigSet *cs, const struct ConfigDef *cdef, intptr_t value, struct Buffer *err);
+#endif
 int multipart_validator  (const struct ConfigSet *cs, const struct ConfigDef *cdef, intptr_t value, struct Buffer *err);
 int pager_validator      (const struct ConfigSet *cs, const struct ConfigDef *cdef, intptr_t value, struct Buffer *err);
 int reply_validator      (const struct ConfigSet *cs, const struct ConfigDef *cdef, intptr_t value, struct Buffer *err);

diff --git a/maildir/maildir.c b/maildir/maildir.c
@@ -46,11 +46,13 @@
 #include "email/lib.h"
 #include "core/lib.h"
 #include "globals.h"
-#include "hcache/hcache.h"
 #include "maildir/lib.h"
 #include "monitor.h"
 #include "muttlib.h"
 #include "mx.h"
+#ifdef USE_HCACHE
+#include "hcache/hcache.h"
+#endif
 
 // Flags for maildir_mbox_check()
 #define MMC_NO_DIRS 0        ///< No directories changed

diff --git a/maildir/maildir_private.h b/maildir/maildir_private.h
@@ -28,10 +28,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
-#include "core/lib.h"
 
+struct Account;
 struct Buffer;
 struct Email;
+struct Mailbox;
 struct Message;
 struct Progress;