check includes with iwyu

diff --git a/address/address.c b/address/address.c
index 43ab9216cab56b42addd969d047bad7fcae2eaaa..adbb0de8374756d7d17d6c744f32e1e4ed21990a 100644 (file)
--- a/address/address.c
+++ b/address/address.c
@@ -29,7 +29,6 @@
  */
 
 #include "config.h"
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/address/address.h b/address/address.h
index a9bd31f345036e9202e4b561da147b85ba738805..6c79bd320aecd25f11d723b54c5e31b58ce6f41f 100644 (file)
--- a/address/address.h
+++ b/address/address.h
@@ -26,7 +26,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 
 /**
  * struct Address - An email address

diff --git a/address/group.c b/address/group.c
index 0099f159b4a6b98d1c913ff59511296b3a651877..799373eb5cfaef59b8e4afd9105935cc69509cb9 100644 (file)
--- a/address/group.c
+++ b/address/group.c
@@ -32,8 +32,8 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "address/lib.h"
 #include "group.h"
+#include "address.h"
 
 static struct Hash *Groups = NULL;
 

diff --git a/address/group.h b/address/group.h
index b3fdcb5e1effbf4d1acfce5bd0cd6f71df5a5df4..7a5c27107b75120a220f6f50deda485d44b45098 100644 (file)
--- a/address/group.h
+++ b/address/group.h
@@ -27,8 +27,7 @@
 
 #include <stdbool.h>
 #include "mutt/mutt.h"
-
-struct Address;
+#include "address.h"
 
 #define MUTT_GROUP   0
 #define MUTT_UNGROUP 1

diff --git a/conn/socket.h b/conn/socket.h
index e74cdd9c9e8e761adb271decb866000f166a69dc..cbaf96899a15cee1ff266d129b270a7831b7297a 100644 (file)
--- a/conn/socket.h
+++ b/conn/socket.h
@@ -26,7 +26,6 @@
 
 #include <stddef.h>
 #include <time.h>
-#include "mutt/mutt.h"
 
 /**
  * enum ConnectionType - Type of connection

diff --git a/email/envelope.h b/email/envelope.h
index 2d319c299cc9a901568014f61715b57ee54f4a7c..e2d652d6e0958da1eb0028c433f9eced01c3a895 100644 (file)
--- a/email/envelope.h
+++ b/email/envelope.h
@@ -27,7 +27,7 @@
 #include "config.h"
 #include <stdbool.h>
 #include "mutt/mutt.h"
-#include "address/address.h"
+#include "address/lib.h"
 
 #define MUTT_ENV_CHANGED_IRT     (1<<0)  ///< In-Reply-To changed to link/break threads
 #define MUTT_ENV_CHANGED_REFS    (1<<1)  ///< References changed to break thread

diff --git a/email/parse.c b/email/parse.c
index c5d3bc1d8347f95323244518ee2519ece975b754..55046f0fecf20dc07bd030111be1422e0220b894 100644 (file)
--- a/email/parse.c
+++ b/email/parse.c
@@ -30,8 +30,6 @@
 #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"

diff --git a/email/parse.h b/email/parse.h
index 6c5f1b39a7086b1b080042e298eb149950f886f4..c6ddd4ab169a090b89816ef653193827b1045e56 100644 (file)
--- a/email/parse.h
+++ b/email/parse.h
@@ -26,6 +26,7 @@
 #include "config.h"
 #include <stdbool.h>
 #include <stdio.h>
+#include "mime.h"
 
 struct Body;
 struct Envelope;

diff --git a/email/rfc2231.c b/email/rfc2231.c
index 9dc576ed362e74e68fec758ac22d8c86b7e7e6e5..a409dc5d85b7464de1a076119517011a787ed508 100644 (file)
--- a/email/rfc2231.c
+++ b/email/rfc2231.c
@@ -36,7 +36,6 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"

diff --git a/email/url.c b/email/url.c
index f7ec6709c8dfc4c9c3b977d3f760592141b9559b..042e8c8f8d582722a2f8d91231d39db424eb6f6b 100644 (file)
--- a/email/url.c
+++ b/email/url.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 #include <ctype.h>
-#include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
 #include "url.h"

diff --git a/hcache/serialize.c b/hcache/serialize.c
index cec5f782fe14d21ceae54788c3bdfe2dd28740b7..c90162b5abbf024111b0fa450fcf9fbc7523a30c 100644 (file)
--- a/hcache/serialize.c
+++ b/hcache/serialize.c
@@ -38,7 +38,6 @@
 #include "mutt/mutt.h"
 #include "address/lib.h"
 #include "email/lib.h"
-#include "globals.h"
 #include "hcache.h"
 
 /**

diff --git a/imap/imap.c b/imap/imap.c
index 78e29a9c539e11e6eb00e816a64d85d44031f470..2d8b52d52514e46405daff71011d08ef1dfaa379 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -48,7 +48,6 @@
 #include "commands.h"
 #include "curs_lib.h"
 #include "globals.h"
-#include "hcache/hcache.h"
 #include "hook.h"
 #include "mailbox.h"
 #include "message.h"

diff --git a/imap/imap.h b/imap/imap.h
index 0e730b494bd9dcae958aa48bba38090071acc7e8..7eb183e0e3ab60219d0679eb3fd8cbb53a6f2a07 100644 (file)
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -54,12 +54,12 @@
 #include "mx.h"
 
 struct BrowserState;
+struct Buffer;
 struct ConnAccount;
 struct EmailList;
 struct Mailbox;
-struct Pattern;
-struct stat;
 struct PatternHead;
+struct stat;
 
 /* These Config Variables are only used in imap/auth.c */
 extern char *C_ImapAuthenticators;

diff --git a/maildir/shared.c b/maildir/shared.c
index 4c658962d4230411fce40083a2e50e49423b371f..5fff8fe75811f22cdc15eef7e0ca02e6cd7f163e 100644 (file)
--- a/maildir/shared.c
+++ b/maildir/shared.c
@@ -38,7 +38,6 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -53,6 +52,7 @@
 #include "context.h"
 #include "copy.h"
 #include "globals.h"
+#include "hcache/hcache.h"
 #include "lib.h"
 #include "mailbox.h"
 #include "mutt_thread.h"

diff --git a/mutt/buffer.c b/mutt/buffer.c
index 9b19b3f22adb3cb5c15dab105c6a81bf21c64ce6..33f90eb980b484113e38a7081fc6fa9c3466692b 100644 (file)
--- a/mutt/buffer.c
+++ b/mutt/buffer.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "buffer.h"
-#include "logging.h"
 #include "memory.h"
 #include "string2.h"
 

diff --git a/mutt/file.c b/mutt/file.c
index 26270b4519a59cde49705450a5a4870d517eae7a..76bd9fe25862d4f91877b7b321b3862846fda35c 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -47,7 +47,6 @@
 #include "memory.h"
 #include "message.h"
 #include "path.h"
-#include "pool.h"
 #include "string2.h"
 
 char *C_Tmpdir; ///< Config: Directory for temporary files

diff --git a/mutt/memory.c b/mutt/memory.c
index b8ee0448c6cafcae617027e1cd911cffd710ace2..d8fcbd8c85902b32a8e88ff4c9ff2318cc7a2cba 100644 (file)
--- a/mutt/memory.c
+++ b/mutt/memory.c
@@ -30,7 +30,6 @@
  */
 
 #include "config.h"
-#include <stdint.h>
 #include <stdlib.h>
 #include "memory.h"
 #include "exit.h"

diff --git a/mutt/notify.c b/mutt/notify.c
index 777a5b837467f2d6aae43c018ac75fc975b5a3ac..7667f7c15d5e7c02aab1d7b50a04e21844e58f27 100644 (file)
--- a/mutt/notify.c
+++ b/mutt/notify.c
@@ -27,9 +27,12 @@
  */
 
 #include "config.h"
+#include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include "notify.h"
+#include "memory.h"
+#include "queue.h"
 
 /**
  * struct Notify - Notification API

diff --git a/mutt/notify.h b/mutt/notify.h
index 30e10307b55fcac6ed4be5bda65157e3d27c87d7..f57f3a6ea1c9953df42f978481ccbf1be51cc25c 100644 (file)
--- a/mutt/notify.h
+++ b/mutt/notify.h
@@ -24,8 +24,9 @@
 #define MUTT_LIB_NOTIFY_H
 
 #include <stdbool.h>
-#include "observer.h"
+#include <stdint.h>
 #include "notify_type.h"
+#include "observer.h"
 
 struct Notify;
 

diff --git a/mutt/observer.h b/mutt/observer.h
index 8b3f66f3a06e2a10071107a5a20e407bc48ad30d..00b6b98b8d7938770ff08526848c47dbfb1945d5 100644 (file)
--- a/mutt/observer.h
+++ b/mutt/observer.h
@@ -31,10 +31,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "mutt/mutt.h"
 #include "notify_type.h"
-
-struct Notify;
+#include "queue.h"
 
 /**
  * struct NotifyCallback - Data passed to a notification function

diff --git a/mutt/pool.c b/mutt/pool.c
index ed4dd89cbfaf617247719f19a61104778a4bf98f..de6baae238982e736905a7ca706180f8dd2e20f0 100644 (file)
--- a/mutt/pool.c
+++ b/mutt/pool.c
@@ -27,14 +27,10 @@
  */
 
 #include "config.h"
-#include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 #include "buffer.h"
 #include "logging.h"
 #include "memory.h"
-#include "string2.h"
 
 static size_t BufferPoolCount = 0;
 static size_t BufferPoolLen = 0;

diff --git a/mutt/signal.c b/mutt/signal.c
index f7bdf38b3cb5e4e8858be59b3d1cb8ab794bb253..4ce5b8aeff005982d1de708ff98c5833a2d6bb67 100644 (file)
--- a/mutt/signal.c
+++ b/mutt/signal.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "curs_lib.h"
 #include "message.h"
 #include "signal2.h"
 #ifdef HAVE_LIBUNWIND

diff --git a/mutt/string.c b/mutt/string.c
index e322daf14ea62ca7c4377536ec7a2334f76127df..e841df7b420b853108deaba152621733f5c5b439 100644 (file)
--- a/mutt/string.c
+++ b/mutt/string.c
@@ -42,6 +42,7 @@
 #include "logging.h"
 #include "memory.h"
 #include "message.h"
+#include "queue.h"
 #include "string2.h"
 #ifdef HAVE_SYSEXITS_H
 #include <sysexits.h>

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index e5ec97a925a92e91ec5f1eb683e87ae11031c8f7..cbc7061fb42f3deac035935537e56910dd498efb 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -38,7 +38,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
 #include "mutt/mutt.h"
 #include "address/lib.h"
 #include "config/lib.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 2d45f040e5b6bd4d7629d27d1539fdacc564a372..29f324ca5c43a901360114cccaeb27b3ca66657e 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -71,6 +71,7 @@
 #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/crypt_mod_pgp_gpgme.c b/ncrypt/crypt_mod_pgp_gpgme.c
index 3521d01595497b6d4ab3ba18179261823325e13a..308890a5fcfa6531b564948ea221aa7aed11201e 100644 (file)
--- a/ncrypt/crypt_mod_pgp_gpgme.c
+++ b/ncrypt/crypt_mod_pgp_gpgme.c
@@ -27,6 +27,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include "crypt_gpgme.h"
 #include "crypt_mod.h"

diff --git a/ncrypt/crypt_mod_smime_gpgme.c b/ncrypt/crypt_mod_smime_gpgme.c
index afd7b73423d4ec781d99e3c1d75187099682472e..89907e266ebf44edda7eb8a9446814191e87e11c 100644 (file)
--- a/ncrypt/crypt_mod_smime_gpgme.c
+++ b/ncrypt/crypt_mod_smime_gpgme.c
@@ -27,6 +27,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include "crypt_gpgme.h"
 #include "crypt_mod.h"

diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index d36ab42c64a53f7a4f7fb3d8148454a526efe9e2..6b4d00af83de63f9d1944f9d6a01f13949236967 100644 (file)
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -44,6 +44,7 @@
 #include "ncrypt.h"
 
 struct Address;
+struct AddressList;
 struct Body;
 struct Envelope;
 struct Email;

diff --git a/ncrypt/ncrypt.h b/ncrypt/ncrypt.h
index 779a6cc24ba83c91cf1cc3f4bd2b7fdb73f1c369..f39a429fe629a4988882eb1f03bdba6c63da607a 100644 (file)
--- a/ncrypt/ncrypt.h
+++ b/ncrypt/ncrypt.h
@@ -55,7 +55,6 @@
 #include <stdio.h>
 
 struct Address;
-struct AddressList;
 struct Body;
 struct Envelope;
 struct Email;

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 0779cf8eb99e32c0684748096d646fbac9458cf1..30aebae93fd22e534677b6a99466b498344a46f5 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -31,13 +31,11 @@
 
 #include "config.h"
 #include <fcntl.h>
-#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "address/lib.h"
-#include "email/lib.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index f5222b4aab2dae2f4be10c160837e6d60f162aad..4767f73fa99534bc973eadb35333e621da52d159 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "address/lib.h"
@@ -59,6 +58,7 @@
 #include "ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#include "pager.h"
 #include "pgpinvoke.h"
 #include "protos.h"
 #include "recvattach.h"

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index f0fd962604d81533b4f7898338f732780394a330..8114278f9dffd452183198523ff660c517baa4d6 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -34,7 +34,6 @@
 #include "pop_private.h"
 #include "mutt/mutt.h"
 #include "address/lib.h"
-#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"