iwyu: optimise #include usage

diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c
index f47c86aa05dc7712a3320d5c803ce9c944ff0274..6ed3d76383dcc8d6d250dadd2b7380457ad49db8 100644 (file)
--- a/autocrypt/autocrypt.c
+++ b/autocrypt/autocrypt.c
@@ -38,7 +38,6 @@
 #include "autocrypt.h"
 #include "curs_lib.h"
 #include "globals.h"
-#include "mutt_curses.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"

diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 8f28190339573030522086705c52a1bee5d4090a..32d2ef5440d2f774eac9ec21fa956b1d5adbfeb7 100644 (file)
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -40,6 +40,7 @@
 #include <string.h>
 #include <sys/select.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"

diff --git a/conn/ssl.c b/conn/ssl.c
index 872a9b1c975610679c7340e315566ecc749d8ed5..70302f6ccb93351e4fbfab956d9af5f3001e0d16 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -45,7 +45,9 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
+#include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "address/lib.h"

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index 3fbade93c327aa48f8c346163f0df5406593d15a..31ccba7826aa2a10de67532faf3ac09ff4249d54 100644 (file)
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
 #include "conn_globals.h"

diff --git a/context.c b/context.c
index 40738ef9f3591b464f50ccc2f138e03a2e13cf84..421e76efff37eb196633164d36bff118efd2ac99 100644 (file)
--- a/context.c
+++ b/context.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #include <string.h>
 #include "mutt/mutt.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "context.h"

diff --git a/curs_lib.h b/curs_lib.h
index 325880134071d591eaf87f78c0560d92a906ffc9..70c8bc5ce36d7613a346cb5b7c68c3b074da7a6a 100644 (file)
--- a/curs_lib.h
+++ b/curs_lib.h
@@ -25,7 +25,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <stdio.h>
+#include <wchar.h>
 #include "config/lib.h"
 #include "mutt.h"
 #include "browser.h"

diff --git a/email/email.h b/email/email.h
index cfbb6fe266b3600cab0f91eb65aedf894b5d6b93..c763a68c07c6c1b72eea67fada361c07c77ebec1 100644 (file)
--- a/email/email.h
+++ b/email/email.h
@@ -31,8 +31,6 @@
 #include "ncrypt/ncrypt.h"
 #include "tags.h"
 
-struct Notify;
-
 /**
  * struct Email - The envelope/body of an email
  */

diff --git a/enter_state.h b/enter_state.h
index 14586a2da2b455c16dbe2236b53f947b073c08ba..7dad4fd33b946e7268471e022d23943981e4f812 100644 (file)
--- a/enter_state.h
+++ b/enter_state.h
@@ -24,6 +24,7 @@
 #define MUTT_ENTER_STATE_H
 
 #include <stddef.h>
+#include <wchar.h>
 
 /**
  * struct EnterState - Keep our place when entering a string

diff --git a/hcache/hcache.h b/hcache/hcache.h
index 8d7857f6b9cadbb57cf6002c9cf22e25109b3236..30835d5889cdfd33134b070c8de2d2542f388d1c 100644 (file)
--- a/hcache/hcache.h
+++ b/hcache/hcache.h
@@ -52,7 +52,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <sys/time.h>
 
 struct Email;
 

diff --git a/hcache/serialize.h b/hcache/serialize.h
index b3e96988a3978911892fafa60fcb80967c671d8b..4c515dadc0fc47759bc3e65541089de4155feebd 100644 (file)
--- a/hcache/serialize.h
+++ b/hcache/serialize.h
@@ -26,6 +26,7 @@
 #ifndef MUTT_HCACHE_SERIALIZE_H
 #define MUTT_HCACHE_SERIALIZE_H
 
+#include <stddef.h>
 #include <stdbool.h>
 #include <sys/types.h>
 #include "hcache.h"

diff --git a/icommands.c b/icommands.c
index c7743e9d57e01c5367af8d2fc247aedc991d863a..a4e898ffe4f67b9b1dcc11e1f3b257c69166e89d 100644 (file)
--- a/icommands.c
+++ b/icommands.c
@@ -35,6 +35,7 @@
 #include "keymap.h"
 #include "muttlib.h"
 #include "opcodes.h"
+#include "pager.h"
 #include "version.h"
 
 /**

diff --git a/imap/browse.c b/imap/browse.c
index 7748882accd38004625b2d7de023427f46fb1b0b..44e6ac3b3a75f325f81891e62b1a68cf5fb59318 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 #include <limits.h>
-#include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/imap/command.c b/imap/command.c
index 8731fd61d2d4497a2d235215ee666a3c2d905d87..cd644205b8778b748e31a156814b463fa565a846 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "email/lib.h"

diff --git a/imap/imap.c b/imap/imap.c
index f843e370114b50a0eb377fc6a093ec95807d31ec..19c414f76d9ffc069e7e69e4d516050500819ed1 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"

diff --git a/init.c b/init.c
index 7ab7da38cec6c8b9ee18f6e85f1f373dbea74d7d..21abc5be5cf81745e6575560a233296755c63c52 100644 (file)
--- a/init.c
+++ b/init.c
@@ -40,9 +40,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
-#include <time.h>
 #include <unistd.h>
-#include <wchar.h>
 #include "mutt/mutt.h"
 #include "address/lib.h"
 #include "email/lib.h"
@@ -55,7 +53,6 @@
 #include "hcache/hcache.h"
 #include "keymap.h"
 #include "monitor.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "mx.h"

diff --git a/keymap.c b/keymap.c
index 745849639be7537f76a3ce1eff9c52ba2b16ebc7..a6b64515a3fb5f00f9ca8dfdc5a5ef8fcfc3266c 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "keymap.h"
@@ -47,6 +46,9 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
+#ifndef USE_SLANG_CURSES
+#include <strings.h>
+#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif

diff --git a/maildir/maildir.c b/maildir/maildir.c
index de47cd18d158f49bcbb1afa1feed7894a871a678..ad6b731adfeaa2897d9b9905b989d0c602f49dff 100644 (file)
--- a/maildir/maildir.c
+++ b/maildir/maildir.c
@@ -40,11 +40,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <time.h>
 #include <unistd.h>
 #include "maildir_private.h"
 #include "mutt/mutt.h"
-#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "globals.h"

diff --git a/maildir/mh.c b/maildir/mh.c
index 10d4a9b8a7b490700c231f1ce38b30f899833274..a5bb65d0d9a45b535f7dfb077f39d60a45864eae 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -42,7 +42,6 @@
 #include <unistd.h>
 #include "maildir_private.h"
 #include "mutt/mutt.h"
-#include "config/lib.h"
 #include "email/lib.h"
 #include "core/lib.h"
 #include "errno.h"

diff --git a/maildir/shared.c b/maildir/shared.c
index c1f0667ec4e94fa368e6bc970f3148d597ec210c..c778446c982149fc89f9f8e4f74551fef076662d 100644 (file)
--- a/maildir/shared.c
+++ b/maildir/shared.c
@@ -40,8 +40,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/time.h>
-#include <time.h>
 #include <unistd.h>
 #include <utime.h>
 #include "maildir_private.h"

diff --git a/menu.c b/menu.c
index 39ff50877d6aa0588db627f6b88d4cbc50b3b4f4..1b15649652b14f05b421f80d405f600966d32a2e 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -37,7 +37,6 @@
 #include "email/lib.h"
 #include "core/lib.h"
 #include "mutt.h"
-#include "color.h"
 #include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
@@ -52,6 +51,9 @@
 #include "options.h"
 #include "pattern.h"
 #include "protos.h"
+#ifndef USE_SLANG_CURSES
+#include "color.h"
+#endif
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
 #endif

diff --git a/monitor.h b/monitor.h
index 348b45c70326634be2caa3c6a8ce25af210e0bd8..d82a29a09338cbe98c0f1bca0a67025351dbdd9f 100644 (file)
--- a/monitor.h
+++ b/monitor.h
@@ -23,11 +23,13 @@
 #ifndef MUTT_MONITOR_H
 #define MUTT_MONITOR_H
 
-extern bool MonitorFilesChanged;   ///< true after a monitored file has changed
-extern bool MonitorContextChanged; ///< true after the current mailbox has changed
+#include <stdbool.h>
 
 struct Mailbox;
 
+extern bool MonitorFilesChanged;   ///< true after a monitored file has changed
+extern bool MonitorContextChanged; ///< true after the current mailbox has changed
+
 int mutt_monitor_add(struct Mailbox *m);
 int mutt_monitor_remove(struct Mailbox *m);
 int mutt_monitor_poll(void);

diff --git a/mutt/file.c b/mutt/file.c
index cdab2b0eec25a9cdc2c5d2e4a87573764d8b834e..10385de112118bc2a7b09d6f32385a73f927bc37 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>
@@ -49,6 +48,9 @@
 #include "message.h"
 #include "path.h"
 #include "string2.h"
+#ifdef USE_FLOCK
+#include <sys/file.h>
+#endif
 
 char *C_Tmpdir; ///< Config: Directory for temporary files
 

diff --git a/mutt/md5.c b/mutt/md5.c
index e596a029a96a58fa000fa3f23a37fec9da4fd95a..2fa2829356676db648970daf7608d3ae0e3c831e 100644 (file)
--- a/mutt/md5.c
+++ b/mutt/md5.c
@@ -30,6 +30,7 @@
 #include "config.h"
 #include <stddef.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
 #include "md5.h"
 

diff --git a/mutt_curses.h b/mutt_curses.h
index 81ecdf8a6094748f007ac0215e334145b7d51942..b65fff553777b0654bb66feea47080ef319c27fb 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -24,9 +24,11 @@
 #ifndef MUTT_MUTT_CURSES_H
 #define MUTT_MUTT_CURSES_H
 
+#include "config.h"
 #include <regex.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include "mutt/mutt.h"
-#include "pattern.h"
 
 #ifdef USE_SLANG_CURSES
 

diff --git a/mutt_logging.c b/mutt_logging.c
index 655c8cd73b1c18c9e52f1360f65dbd7888e5a4cc..6fd6d71afe1482ad42ad77b0cc6e28b81ecbc437 100644 (file)
--- a/mutt_logging.c
+++ b/mutt_logging.c
@@ -34,6 +34,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
 #include "curs_lib.h"

diff --git a/mutt_window.h b/mutt_window.h
index 1056a4b7f6e4e93b89c520a70dc50fb842bf90b1..5668cb25caf3687abc1da105842e3c63126692b5 100644 (file)
--- a/mutt_window.h
+++ b/mutt_window.h
@@ -24,8 +24,6 @@
 #define MUTT_MUTT_WINDOW_H
 
 #include "config.h"
-#include <stdbool.h>
-#include "mutt/mutt.h"
 
 /**
  * struct MuttWindow - A division of the screen

diff --git a/mx.c b/mx.c
index 5ef920822556625001f5cb0ad1e3135528aeea05..feb82c41ced2da61f51cdd519058df32092e03e1 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -35,7 +35,6 @@
 #include <stdbool.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "address/lib.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index ced1162c2eff83a481d007b45e7939a1e7b5abf5..70fb61392d47b4cfe1ce5e41b8be83728ca2f823 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -81,6 +81,8 @@
 #include <libintl.h>
 #endif
 
+struct Mailbox;
+
 // clang-format off
 /* Values used for comparing addresses. */
 #define CRYPT_KV_VALID    (1 << 0)

diff --git a/ncrypt/crypt_mod.h b/ncrypt/crypt_mod.h
index 11fc34f0b96f76ef7f7dd6701b792c8b117adab2..694d74aa978c3d5d2ad6c535026e4426d1541837 100644 (file)
--- a/ncrypt/crypt_mod.h
+++ b/ncrypt/crypt_mod.h
@@ -31,8 +31,9 @@
 struct Address;
 struct AddressList;
 struct Body;
-struct Envelope;
 struct Email;
+struct Envelope;
+struct Mailbox;
 struct State;
 
 /**

diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index 10bd46da315e19bb621e2a896b63735037b50fba..bb7e5dcfa03a3cd64cf71e0de10bdc108f5883c1 100644 (file)
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -40,19 +40,20 @@
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "crypt_mod.h"
-#include "curs_lib.h"
-#include "globals.h"
 #include "ncrypt.h"
-#include "options.h"
+#ifndef CRYPT_BACKEND_GPGME
+#include "curs_lib.h"
+#endif
 #ifdef USE_AUTOCRYPT
 #include "autocrypt/autocrypt.h"
+#include "globals.h"
+#include "options.h"
+#include "email/lib.h"
 #endif
 
 struct Address;
 struct AddressList;
-struct Body;
-struct Envelope;
-struct Email;
+struct Mailbox;
 struct State;
 
 /* These Config Variables are only used in ncrypt/cryptglue.c */

diff --git a/ncrypt/cryptglue.h b/ncrypt/cryptglue.h
index b4c6e419ab4de2d31c7340f61de28b934898075a..b22c7f12531c8ec9ab4082cb8a678d8045073959 100644 (file)
--- a/ncrypt/cryptglue.h
+++ b/ncrypt/cryptglue.h
@@ -28,6 +28,7 @@
 
 struct AddressList;
 struct Body;
+struct Email;
 struct State;
 
 struct Body *crypt_pgp_encrypt_message(struct Email *e, struct Body *a, char *keylist, int sign);

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 9218c36fc6ea378eabf52c0ee6672cda6bf9ef7c..dceeecdee56b55bd9dac2070f16f55e3ecdca70f 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -34,7 +34,6 @@
 
 #include "config.h"
 #include <limits.h>
-#include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 6015ea60cf9b3fd710e9fc1ee496739eabb11a13..224b5abc16966c2a89fefc0e05dbff8040142196 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -41,7 +41,6 @@
 #include "globals.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
-#include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "pgpkey.h"

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 0f55e5447d5b8538af7b64b47de82f7487e1248c..9f2cbc130de69dbb359cb68d39023e23be9e9597 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -54,7 +54,6 @@
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_menu.h"
-#include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "opcodes.h"

diff --git a/ncrypt/smime.h b/ncrypt/smime.h
index 24eab8a9b661f688de9a1e8c24d7659c70caad61..86e3b9d5ac357c2c5e22a23189420bad724a9763 100644 (file)
--- a/ncrypt/smime.h
+++ b/ncrypt/smime.h
@@ -25,9 +25,14 @@
 #ifndef MUTT_NCRYPT_SMIME_H
 #define MUTT_NCRYPT_SMIME_H
 
-#include <stdbool.h>
+#include "config.h"
 #include <stdio.h>
 #include "ncrypt.h"
+#ifdef USE_SLANG_CURSES
+#include "mutt_curses.h"
+#else
+#include <stdbool.h>
+#endif
 
 struct AddressList;
 struct Body;

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 806a3cb711fde64f94906842a62f60ef8db5e947..4b31a5519ed54489b45de21a1ea6c3788c0d49a8 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -52,7 +52,6 @@
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
-#include "mutt_window.h"
 #include "muttlib.h"
 #include "nntp.h"
 #include "protos.h"

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 31e8e01d924f5e800251b54c1d20d613ae6ef0d2..7bcfd862332dff0bee3df5ff7a62bed736a7b17e 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -49,6 +49,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 #include "notmuch_private.h"
 #include "mutt/mutt.h"

diff --git a/notmuch/nm_db.c b/notmuch/nm_db.c
index 46a00983c18ee76e48ae5c9162905c5cbdc3819e..0832791f64751122bc904e2d863cdd5400d43b6a 100644 (file)
--- a/notmuch/nm_db.c
+++ b/notmuch/nm_db.c
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#include <time.h>
 #include "notmuch_private.h"
 #include "mutt/mutt.h"
 #include "email/lib.h"

diff --git a/pop/pop.c b/pop/pop.c
index e5ceefab1a39a1f70e7cab85c88b69f8d98e586e..584f88d8b6faaa87062383f5fb9b73613623ebfe 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 #include "pop_private.h"
 #include "mutt/mutt.h"

diff --git a/pop/pop_private.h b/pop/pop_private.h
index 81ac671b375359dfb227a43cb9b642e724273e1a..966389a316526f2a443219efab066e70d447bf8c 100644 (file)
--- a/pop/pop_private.h
+++ b/pop/pop_private.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <time.h>
 #include "conn/conn.h"
-#include "mutt/buffer.h"
+#include "mutt/mutt.h"
 
 struct Mailbox;
 struct Progress;

diff --git a/progress.c b/progress.c
index bb10d7093072fb62cb933d67f6901f3896239612..af405b23d78fbeae3d544abb578fc2632e548e18 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -28,11 +28,9 @@
  */
 
 #include "config.h"
-#include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <string.h>
-#include <sys/time.h>
 #include "mutt/mutt.h"
 #include "progress.h"
 #include "curs_lib.h"

diff --git a/progress.h b/progress.h
index 5af067256d97222b8d673f6872ccee427078368e..8f086d8c09cb1afc96d5604442e50f0f7f1c9ba1 100644 (file)
--- a/progress.h
+++ b/progress.h
@@ -24,6 +24,7 @@
 #ifndef MUTT_PROGRESS_H
 #define MUTT_PROGRESS_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
 /* These Config Variables are only used in progress.c */

diff --git a/recvattach.c b/recvattach.c
index 7212d36fc895d9da199d195515a23b95c7749862..f5254cf36b71e474df63be516502b266a7c05f59 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -31,7 +31,6 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"

diff --git a/resize.c b/resize.c
index 746c3b014b7be5020262567e31f342f4b2e32bc0..1d403e76f721b4fb30a90b119393527e4cb590d9 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -29,11 +29,13 @@
 
 #include "config.h"
 #include <fcntl.h>
-#include <termios.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
+#ifdef USE_SLANG_CURSES
+#include <stdbool.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #else

diff --git a/send.c b/send.c
index 59292c1a56146ac817b68abe94ffe6e8283d9f65..9d8c9458b6e1366cf8fc52d3255ae1798323909a 100644 (file)
--- a/send.c
+++ b/send.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>
-#include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/send.h b/send.h
index 35b95df0e13e992a9c638ee882882db491ad7199..9e9c993c487a00592a8a5c61b5f8e7a8f08d34ea 100644 (file)
--- a/send.h
+++ b/send.h
@@ -28,6 +28,7 @@
 #include <stdio.h>
 
 struct Address;
+struct AddressList;
 struct Body;
 struct Context;
 struct Email;

diff --git a/system.c b/system.c
index 1332c36a55a01c864da76d3b31aadf738273e3f6..eee2f80bc6731128583eb4c2646d8a561c72dd7e 100644 (file)
--- a/system.c
+++ b/system.c
@@ -30,7 +30,6 @@
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"

diff --git a/wcscasecmp.c b/wcscasecmp.c
index 612cfbfed79e446c1cc997e51c53858b1ffc7043..51b1928e73ea77555c847160a6223548a5bb8297 100644 (file)
--- a/wcscasecmp.c
+++ b/wcscasecmp.c
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include <stddef.h>
+#include <wchar.h>
 #include <wctype.h>
 
 /**