iwyu

diff --git a/addrbook.c b/addrbook.c
index 00528123b19e033a10ec68811c31af38121d3ccb..e56722944cf96fa1f9959679396090f1945a29e1 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -42,8 +42,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "options.h"
-#include "protos.h"
 #include "sort.h"
 
 /* These Config Variables are only used in addrbook.c */

diff --git a/alias.c b/alias.c
index 3388efc27b701529d259a9b56e632fa8795a4668..d1d62a88dff33fb604be5d799ff24e506000e002 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -40,8 +40,6 @@
 #include "hdrline.h"
 #include "mutt_curses.h"
 #include "muttlib.h"
-#include "options.h"
-#include "protos.h"
 #include "sendlib.h"
 
 /**

diff --git a/alias.h b/alias.h
index 26114d682a627cd3f9fbde6957edfa1d300f4b8b..a03e4a5a695b874436ad635954ec14af244e14ea 100644 (file)
--- a/alias.h
+++ b/alias.h
@@ -23,9 +23,12 @@
 #ifndef _MUTT_ALIAS_H
 #define _MUTT_ALIAS_H
 
+#include <stddef.h>
 #include <stdbool.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+
+struct Address;
+struct Envelope;
 
 /**
  * struct Alias - A shortcut for an email address

diff --git a/bcache.c b/bcache.c
index 6540d9499dde8c90fd6c2d2bcb3574006062417e..33f07636ce077f37203c31e338387e1c3df0aa58 100644 (file)
--- a/bcache.c
+++ b/bcache.c
@@ -32,10 +32,8 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "bcache.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "muttlib.h"
-#include "protos.h"
 
 /* These Config Variables are only used in bcache.c */
 char *MessageCachedir;

diff --git a/browser.c b/browser.c
index ddd8bee44758c3db443c7a06d36762ebbbda5540..05fc85de1f558eeaa2e4bfe7863fcae637f1043d 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -36,6 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "browser.h"
@@ -49,13 +50,11 @@
 #include "maildir/maildir.h"
 #include "menu.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
 #include "sendlib.h"
 #include "sort.h"
 #ifdef USE_IMAP

diff --git a/buffy.c b/buffy.c
index 810f21adad0b7658c3e77aa43886e2cc86dd2296..07e04f432d2962a772946070ceccc5499e2fd8e4 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -26,6 +26,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <utime.h>
@@ -41,7 +42,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 #ifdef USE_SIDEBAR
 #include "sidebar.h"

diff --git a/buffy.h b/buffy.h
index a47b61a092eb2e5d3e195b1f01e3ce38af7fac23..f86b94c2ad01929247ca76f364322d8592bf0d5c 100644 (file)
--- a/buffy.h
+++ b/buffy.h
@@ -29,6 +29,7 @@
 #include <time.h>
 #include "where.h"
 
+struct Buffer;
 struct stat;
 
 /* These Config Variables are only used in buffy.c */

diff --git a/color.c b/color.c
index 5ddbc03ae3f2d99b7af32e3fed71bd2e82dc893d..6c5e4f22b47909edc617fcfbb32741f95f42bb2f 100644 (file)
--- a/color.c
+++ b/color.c
@@ -37,7 +37,6 @@
 #include "mutt_curses.h"
 #include "options.h"
 #include "pattern.h"
-#include "protos.h"
 
 /* globals */
 int *ColorQuote = NULL;

diff --git a/commands.c b/commands.c
index 715035a655c848d176085f74f7f808efc8e341a6..da36b77305cfaaf6834f7ee163a0f59dc8714736 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -56,7 +56,6 @@
 #include "options.h"
 #include "pager.h"
 #include "protos.h"
-#include "recvattach.h"
 #include "sendlib.h"
 #include "sort.h"
 #ifdef USE_IMAP

diff --git a/complete.c b/complete.c
index 80c262a502fbf3600e2b430ee856e120dc1ada9e..487229b63f501e59dcabe9bf0e075ddd7c67c9e0 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -36,7 +36,6 @@
 #include "globals.h"
 #include "muttlib.h"
 #include "options.h"
-#include "protos.h"
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #include "mailbox.h"

diff --git a/compress.c b/compress.c
index bf6a7b43b34f14875a5e6b6c47b386c1c6582070..8884531af21d57f314fa669ba03157234ff9b07d 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -35,7 +35,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "compress.h"
 #include "context.h"
 #include "curs_lib.h"
@@ -46,9 +45,10 @@
 #include "mutt_curses.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 
+struct Header;
+
 /* Notes:
  * Any references to compressed files also apply to encrypted files.
  * ctx->path     == plaintext file

diff --git a/conn/conn_globals.c b/conn/conn_globals.c
index 3d237881bb7c83e3b13b95685ae932b01ab21af6..ecbeda4befe9bbfa2f4a2496de46f78cb78c77c2 100644 (file)
--- a/conn/conn_globals.c
+++ b/conn/conn_globals.c
@@ -27,7 +27,6 @@
  */
 
 #include "config.h"
-#include <stdbool.h>
 #include <stdio.h>
 
 short ConnectTimeout = 0; /**< Config: Timeout for a network connection (for IMAP, POP or SMTP) */

diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 14d4974442978894fbd204b8599538a5e76cd1dd..13d6fe7bb39e9a120492f57799030efd03238998 100644 (file)
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -35,6 +35,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/select.h>
@@ -42,13 +43,14 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
+#include "mutt/mutt.h"
 #include "email/email.h"
+#include "conn/account.h"
 #include "conn_globals.h"
 #include "connection.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "options.h"
-#include "protos.h"
 
 /**
  * socket_connect - set up to connect to a socket fd

diff --git a/conn/connection.h b/conn/connection.h
index dec678c82c6ace4a46838abe4854a354d1daeb77..1f4f7d2a2dc4b733725b20a5c56edb3d25394423 100644 (file)
--- a/conn/connection.h
+++ b/conn/connection.h
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 #include "account.h"
 
 #define LONG_STRING 1024

diff --git a/conn/getdomain.c b/conn/getdomain.c
index 40f416c9b49baa1ca41f2f397728d0104e546f9c..0428b81938e348fedac17f2a8b6bfd5214c9c8e2 100644 (file)
--- a/conn/getdomain.c
+++ b/conn/getdomain.c
@@ -32,9 +32,7 @@
 #include <sys/socket.h>
 #include <time.h>
 #include <unistd.h>
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 
 /**
  * getdnsdomainname - Lookup the host's name using DNS

diff --git a/conn/sasl.c b/conn/sasl.c
index 643acf7b9cc12473f4620ecef004f76fdf1032a9..21508dca182b6d2ecdd3d9f5d537a97d64cb62f4 100644 (file)
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -46,17 +46,13 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <time.h>
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "sasl.h"
 #include "account.h"
 #include "connection.h"
 #include "curs_lib.h"
 #include "mutt_account.h"
 #include "options.h"
-#include "protos.h"
 
 /* arbitrary. SASL will probably use a smaller buffer anyway. OTOH it's
  * been a while since I've had access to an SASL server which negotiated

diff --git a/conn/socket.h b/conn/socket.h
index d7b07c2c91987dc3ca026358e6b221065af2d33a..8ff679561f067290368101ebc4e1480f1fec3564 100644 (file)
--- a/conn/socket.h
+++ b/conn/socket.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <time.h>
 
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 
 enum ConnectionType
 {

diff --git a/conn/ssl.c b/conn/ssl.c
index d79223238c080ce01d31bd694d79407a9ca7b582..fcab31401aa64d2368b76685f3d9cfd9d100f58b 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -47,11 +47,8 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "mutt/file.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/string2.h"
-#include "email/idna2.h"
+#include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "ssl.h"
 #include "account.h"

diff --git a/conn/tunnel.c b/conn/tunnel.c
index 4f73d77e3039ca1f2da0e3e65efa8945d862fef2..e1140a080463d1706148f2cb686f4398c65e834a 100644 (file)
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -40,7 +40,6 @@
 #include "account.h"
 #include "conn_globals.h"
 #include "connection.h"
-#include "protos.h"
 #include "socket.h"
 
 /**

diff --git a/copy.c b/copy.c
index b1db0c856f9996aac1aa7102102ad20b0ee3aef9..8e5bd9e93fb22008d638e78d4a4aaab952f2b491 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -44,8 +44,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
-#include "protos.h"
 #include "sendlib.h"
 #include "state.h"
 #ifdef USE_NOTMUCH

diff --git a/curs_lib.c b/curs_lib.c
index f4fb47e5fc8e1318a5ec36af406bd29c6aa2a632..a8062d2f70a219356fb28ba901bfcb2d8cc17127 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -42,7 +42,6 @@
 #include "curs_lib.h"
 #include "browser.h"
 #include "context.h"
-#include "curs_lib.h"
 #include "enter_state.h"
 #include "globals.h"
 #include "menu.h"

diff --git a/curs_lib.h b/curs_lib.h
index d5e204ddbd1edd0e83c02ad22126bb7a96e48925..edab4cfd88dfb34069038938568a5124e4c040db 100644 (file)
--- a/curs_lib.h
+++ b/curs_lib.h
@@ -23,10 +23,11 @@
 #ifndef MUTT_CURS_LIB_H
 #define MUTT_CURS_LIB_H
 
+#include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <wchar.h>
 #include "mutt.h"
+#include "browser.h"
 
 struct Context;
 struct Pager;

diff --git a/edit.c b/edit.c
index 05aeceb5e57add484134515db0cce0c650fe1a80..ffade7c81db7bc599ba33d053fb69cfca9545235 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -41,7 +41,6 @@
 #include "mutt_header.h"
 #include "mutt_window.h"
 #include "muttlib.h"
-#include "options.h"
 #include "protos.h"
 
 /* These Config Variables are only used in edit.c */

diff --git a/editmsg.c b/editmsg.c
index 722e4d7745a419985531140b19b819d641768285..a1b21604f4aaa61d7feb99fa7f520cd04ed20b61 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -45,7 +45,6 @@
 #include "mailbox.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 
 /**

diff --git a/email/body.c b/email/body.c
index 3fdb2ad06d917768207872727d2abeae1c811f91..a37b67a87dde4bc7d3f5f7c4803d62e44c4d0520 100644 (file)
--- a/email/body.c
+++ b/email/body.c
@@ -33,6 +33,7 @@
 #include "body.h"
 #include "header.h"
 #include "mime.h"
+#include "parameter.h"
 
 /**
  * mutt_body_new - Create a new Body

diff --git a/email/from.c b/email/from.c
index 73e924bb5b43ca894a3e21ff0ac058f235b6c9ec..f20e8f9366f076cf1f22e856619ee4368d5fcc64 100644 (file)
--- a/email/from.c
+++ b/email/from.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>

diff --git a/email/from.h b/email/from.h
index c9f8db2f377468a1d85181b98c46ea77f8b68944..adc4b9b1f333867de94643eb6002d9584fefc2e2 100644 (file)
--- a/email/from.h
+++ b/email/from.h
@@ -24,6 +24,7 @@
 #define _EMAIL_FROM_H
 
 #include <stdio.h>
+#include <stdbool.h>
 #include <time.h>
 
 bool is_from(const char *s, char *path, size_t pathlen, time_t *tp);

diff --git a/email/header.h b/email/header.h
index 9999faa83a6e5ad0eb72d3f3a8f08b254e1b7d8f..948ca859a1992a8936b52766f9d3090e6e8bec54 100644 (file)
--- a/email/header.h
+++ b/email/header.h
@@ -25,7 +25,6 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <time.h>
 #include "mutt/mutt.h"
 #include "tags.h"

diff --git a/email/parse.c b/email/parse.c
index 0f627915267687fc7b4832bcb92678a3c84b5703..bbd16a90213a2104d1bd182cc780391502aaaf68 100644 (file)
--- a/email/parse.c
+++ b/email/parse.c
@@ -27,9 +27,12 @@
  */
 
 #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"
 #include "parse.h"
 #include "address.h"
@@ -39,6 +42,7 @@
 #include "from.h"
 #include "header.h"
 #include "mime.h"
+#include "parameter.h"
 #include "rfc2047.h"
 #include "rfc2231.h"
 #include "url.h"

diff --git a/email/parse.h b/email/parse.h
index 4015f89e51dd368dc4e2c6e3263547f204fc1691..b027ef468bb71182149c800bff3c1d8d362d3986 100644 (file)
--- a/email/parse.h
+++ b/email/parse.h
@@ -23,6 +23,7 @@
 #ifndef _EMAIL_PARSE_H
 #define _EMAIL_PARSE_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
 struct Body;

diff --git a/email/rfc2231.c b/email/rfc2231.c
index 87b3fda3a420714555aff3271543f0f4218548e7..a02678ae6236f2d52fe7eb36236b84d99d9bba47 100644 (file)
--- a/email/rfc2231.c
+++ b/email/rfc2231.c
@@ -39,10 +39,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
 #include "rfc2231.h"
-#include "globals.h"
-#include "options.h"
+#include "email_globals.h"
+#include "mime.h"
+#include "parameter.h"
+#include "rfc2047.h"
 
 /* These Config Variables are only used in rfc2231.c */
 bool Rfc2047Parameters;

diff --git a/email/rfc2231.h b/email/rfc2231.h
index e63e674cc39322c9893ed3238072c81ea869588f..3a0ad12b3a57b76e77209f1dc6bc53ca0eb62005 100644 (file)
--- a/email/rfc2231.h
+++ b/email/rfc2231.h
@@ -23,6 +23,8 @@
 #ifndef _EMAIL_RFC2231_H
 #define _EMAIL_RFC2231_H
 
+#include <stdbool.h>
+
 struct ParameterList;
 
 /* These Config Variables are only used in rfc2231.c */

diff --git a/flags.c b/flags.c
index 1f4419c2fcf46bdf9068672381951d8f74899493..4852bf5ce0ced2dddd3e2951e40f761f8b4a0e26 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -40,7 +40,6 @@
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "mx.h"
-#include "options.h"
 #include "protos.h"
 #include "sort.h"
 

diff --git a/group.c b/group.c
index c1e4142c3e09543040a578a8ec45877dc204fe5e..103cf489595528d4c99a6a1b4c234892eaaa6121 100644 (file)
--- a/group.c
+++ b/group.c
@@ -28,7 +28,6 @@
 #include "email/email.h"
 #include "group.h"
 #include "globals.h"
-#include "protos.h"
 #include "send.h"
 
 struct Group *mutt_pattern_group(const char *k)

diff --git a/handler.c b/handler.c
index aeb7a36f7a9b2a70a648bc4c920862e0a03885e5..49fdb0853d617642a5042c1c1dee44741e16fab6 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -43,13 +43,10 @@
 #include "keymap.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
-#include "recvattach.h"
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "state.h"

diff --git a/hcache/hcache.c b/hcache/hcache.c
index 98187937dc77ccab9fcb5739e9e3ae3f712dc3f7..21d018296898e9e58c5cc5f15f8d89d8bc0296dd 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -45,16 +45,14 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "backend.h"
-#include "globals.h"
 #include "hcache.h"
 #include "hcache/hcversion.h"
-#include "protos.h"
 
 /* These Config Variables are only used in hcache/hcache.c */
 char *HeaderCacheBackend;

diff --git a/hcache/hcache.h b/hcache/hcache.h
index bfa730c864da7634e8f2745dbed46b1f0f5c6c46..55258d2efc0b31f24b5f14f17213b06a255fc211 100644 (file)
--- a/hcache/hcache.h
+++ b/hcache/hcache.h
@@ -50,7 +50,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <time.h>
+#include <sys/time.h>
 
 struct Header;
 

diff --git a/hcache/kc.c b/hcache/kc.c
index 1678d9efac3ba2d88a08dcc56fa0221ab66556f6..0ac280dcf5fff35c997dd94ff16eddbf14649f9a 100644 (file)
--- a/hcache/kc.c
+++ b/hcache/kc.c
@@ -36,7 +36,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
-#include "options.h"
 
 /**
  * hcache_kyotocabinet_open - Implements HcacheOps::open()

diff --git a/hcache/qdbm.c b/hcache/qdbm.c
index 6c052f19ebadfa95fd106ada362ee75efdc6981d..2f059871ffa006bc79ab263a92691230e5b80c42 100644 (file)
--- a/hcache/qdbm.c
+++ b/hcache/qdbm.c
@@ -37,7 +37,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
-#include "options.h"
 
 /**
  * hcache_qdbm_open - Implements HcacheOps::open()

diff --git a/hcache/serialize.c b/hcache/serialize.c
index 82fe9aa965009a7d806dc2e6dec53f6605f2f009..dfa93a41ba55d87191919493c28802eb17b64dd1 100644 (file)
--- a/hcache/serialize.c
+++ b/hcache/serialize.c
@@ -30,11 +30,14 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include "mutt/mutt.h"
 #include "email/email.h"
 #include "hcache.h"
-#include "muttlib.h"
 
 /**
  * lazy_malloc - Allocate some memory

diff --git a/hcache/serialize.h b/hcache/serialize.h
index ddf3c18684f27c54d105555dd7a442612deba925..5fd9b442926b11b1f71f9dc388a62b6df94fd90f 100644 (file)
--- a/hcache/serialize.h
+++ b/hcache/serialize.h
@@ -26,6 +26,8 @@
 #ifndef _MUTT_HCACHE_SERIALIZE_H
 #define _MUTT_HCACHE_SERIALIZE_H
 
+#include <stdbool.h>
+#include <sys/types.h>
 #include "hcache.h"
 
 struct Address;

diff --git a/hcache/tc.c b/hcache/tc.c
index 1c788300e0329eb6cd06c3314c2ce33d1331b9af..4aee20400a34b1f240debe7dbd251fb8a33aff10 100644 (file)
--- a/hcache/tc.c
+++ b/hcache/tc.c
@@ -36,7 +36,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
-#include "options.h"
 
 /**
  * hcache_tokyocabinet_open - Implements HcacheOps::open()

diff --git a/hdrline.c b/hdrline.c
index f5aa346ae7f4954bc5374ef2fbe863f3fe044b38..e0836415989c0e7fcb4c67031c4ee6d24dea198f 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -45,8 +45,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
-#include "protos.h"
 #include "sort.h"
 
 /* These Config Variables are only used in hdrline.c */

diff --git a/hdrline.h b/hdrline.h
index 1023383e93f3e93480fdc5ca0d18062f34fc7aeb..3b7c70d2f54841961a3eba47196879f89ea54d91 100644 (file)
--- a/hdrline.h
+++ b/hdrline.h
@@ -30,7 +30,6 @@
 struct Address;
 struct Context;
 struct Header;
-struct HdrFormatInfo;
 
 /* These Config Variables are only used in hdrline.c */
 extern struct MbTable *FlagChars;

diff --git a/help.c b/help.c
index bed865064d622ee9ce177004fbf6c3f0ebc8ef42..8b8dc4c2b40684a8157bcd9888b15031b48db2e9 100644 (file)
--- a/help.c
+++ b/help.c
@@ -34,9 +34,7 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "options.h"
 #include "pager.h"
-#include "protos.h"
 
 static const char *HelpStrings[] = {
 #define DEFINE_HELP_MESSAGE(opcode, help_string) help_string,

diff --git a/hook.c b/hook.c
index dc65fa9379d2bd916f1eb30b8e3d763bb2b28abb..acb1327a50ba7e25f963f6706b63d8d32068a595 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -43,9 +43,7 @@
 #include "mailbox.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "pattern.h"
-#include "protos.h"
 #ifdef USE_COMPRESSED
 #include "compress.h"
 #endif

diff --git a/imap/auth.c b/imap/auth.c
index 7e5baab0e33045f81087239ee43afe9566c55ee7..77b6646faf5e34f65772608f442b96e9bf81671c 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "auth.h"
-#include "globals.h"
 
 /* These Config Variables are only used in imap/auth.c */
 char *ImapAuthenticators;

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index eb9f90f1c4b59cc04ccb58c65f72fa2f27d6f375..0265504c054d30380e29d259ffc9d7dba313d607 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -33,7 +33,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
-#include "options.h"
 
 /**
  * imap_auth_anon - Authenticate anonymously

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 508d5821dcaa31052b5b190e8db59e9764c1beb3..d2be14ce41a1b9a4e84d4192db4035b7b9f2ce62 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -35,7 +35,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
-#include "options.h"
 
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 298e00061afebaa21cce5b454c2fa36e991c6b7b..00174e4a5e8b95f14b2c84bdeab3b1dca68fbb31 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -44,7 +44,6 @@
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
-#include "options.h"
 #ifdef HAVE_HEIMDAL
 #include <gssapi/gssapi.h>
 #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE

diff --git a/imap/auth_login.c b/imap/auth_login.c
index 0790dd145803812990f54e823b6e945b4e131d3c..d6b5f01804d11c77ec38abe1589b3d6cbcb032dc 100644 (file)
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -27,6 +27,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
@@ -34,8 +35,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
-#include "options.h"
-#include "protos.h"
 
 /**
  * imap_auth_login - Plain LOGIN support

diff --git a/imap/auth_plain.c b/imap/auth_plain.c
index 3b96158aca7d3f0a512e919812773010601b1320..4523dfa5b57bbd17be74215fe7d72531949e4e43 100644 (file)
--- a/imap/auth_plain.c
+++ b/imap/auth_plain.c
@@ -35,8 +35,6 @@
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
-#include "options.h"
-#include "protos.h"
 
 /**
  * imap_auth_plain - SASL PLAIN support

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 2c896f91efc390d22975e11f9a7f38a729d0cf15..d054d176a076e3516a8b192a60460e8c8859d49e 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -39,7 +39,6 @@
 #include "auth.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
-#include "options.h"
 
 /**
  * imap_auth_sasl - Default authenticator if available

diff --git a/imap/browse.c b/imap/browse.c
index bd06165b72640bdb527edd0be50c76922eb79056..163e0dbcf84d0ec639e75b6789a838949dd6582c 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -45,8 +45,6 @@
 #include "imap/imap.h"
 #include "mutt_logging.h"
 #include "muttlib.h"
-#include "options.h"
-#include "protos.h"
 
 /**
  * add_folder - Format and add an IMAP folder to the browser

diff --git a/imap/command.c b/imap/command.c
index 79612ce7ba4a59225d500a207c96d80459c22877..e4e00927daef0cb2c715b36a92cdcb88a86c2689 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -53,8 +53,6 @@
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "mx.h"
-#include "options.h"
-#include "protos.h"
 
 /* These Config Variables are only used in imap/command.c */
 bool ImapServernoise;

diff --git a/imap/imap.c b/imap/imap.c
index d7e12a251eb589d20a6821a0646821ee6ec27937..98cf4b5bcf520cdc79671dc32cc5e54ca8fb0396 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -56,10 +56,8 @@
 #include "mutt_socket.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "pattern.h"
 #include "progress.h"
-#include "protos.h"
 #include "sort.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 278d4a2b13793faf7af21ea24ea6262dab32939e..2d9d1b52062d0cbd040e1ac3fc84c344ae987cee 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -27,13 +27,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
-#include "mutt/list.h"
+#include "mutt/mutt.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
 
 struct Account;
-struct Buffer;
 struct Context;
 struct Header;
 struct ImapHeaderData;

diff --git a/imap/message.c b/imap/message.c
index 027ed2920c0dae243a8af101050cb164a6c2d714..f81083d78a722d4fee65c3f7ff5932d0af2eb649 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -52,7 +52,6 @@
 #include "mutt_socket.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #ifdef USE_HCACHE

diff --git a/imap/util.c b/imap/util.c
index 2a3827bcafe1b332a9fc7042b97869f7c12a65aa..3c1482d10fd6f3731764e46f0c30efec5d966fe7 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -55,7 +55,6 @@
 #include "mutt_account.h"
 #include "mx.h"
 #include "options.h"
-#include "protos.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif

diff --git a/init.c b/init.c
index 8e98a5e1185c7c59000f856faf8154139b4cfe7b..f16accd7cb416e39c7e157d422b29819da043f71 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2203,7 +2203,8 @@ static int parse_set(struct Buffer *buf, struct Buffer *s, unsigned long data,
             *((char **) MuttVars[idx].var) = mutt_str_strdup(scratch);
           }
         }
-        else if ((idx >= 0) && ((DTYPE(MuttVars[idx].type) == DT_STRING) || (DTYPE(MuttVars[idx].type) == DT_COMMAND)))
+        else if ((idx >= 0) && ((DTYPE(MuttVars[idx].type) == DT_STRING) ||
+                                (DTYPE(MuttVars[idx].type) == DT_COMMAND)))
         {
           if ((strstr(MuttVars[idx].name, "charset") &&
                check_charset(&MuttVars[idx], buf->data) < 0) |

diff --git a/keymap.c b/keymap.c
index 06ae54feed338c920d199536984b2d762d39baa6..d6000b2bde7b1f7f1f7d6fe99701d8bf15d6bdf0 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -40,7 +40,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif

diff --git a/maildir/mh.c b/maildir/mh.c
index a8b0785440ba07a1f54632a4fe178ade38bd62f7..db12db8123c14ed3a3e083221eba44b8f824a074 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -56,7 +56,6 @@
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 3581c179f4b6caa6cc2338e4e9cb462a6ebeac31..3f925c844daf25c124c56c9d4c3863bfca4acd39 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -50,7 +50,6 @@
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"

diff --git a/menu.c b/menu.c
index dc28fdbad8d398573a6cf101ac3fe3edf23ae89d..d9f4d2994a8aecc8f30c6756cf72fc8c1ee6e4cc 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/mutt/mbyte.c b/mutt/mbyte.c
index cb7ddf1477f8c947960141033688060e2c5c7292..174e93841b2a464e0cd9071c026e078056507cf2 100644 (file)
--- a/mutt/mbyte.c
+++ b/mutt/mbyte.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#include <wctype.h>
 #include "mbyte.h"
 #include "buffer.h"
 #include "charset.h"

diff --git a/mutt_account.c b/mutt_account.c
index 9aad748e84910ba90f66bda7df1d912d3ee962cd..9b0ac6583b71b67ff4372f9637031c0d58f6f7e5 100644 (file)
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -36,7 +36,6 @@
 #include "curs_lib.h"
 #include "globals.h"
 #include "options.h"
-#include "protos.h"
 
 /* These Config Variables are only used in mutt_account.c */
 char *ImapLogin;

diff --git a/mutt_attach.c b/mutt_attach.c
index 5b92c5ab3d8121ca9ef09efed403eea94811cc91..2915da0f5383d1b17cbf0866260cf198f7c7fa8c 100644 (file)
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
@@ -42,14 +41,12 @@
 #include "globals.h"
 #include "handler.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
 #include "protos.h"
-#include "recvattach.h"
 #include "rfc1524.h"
 #include "sendlib.h"
 #include "state.h"

diff --git a/mutt_body.c b/mutt_body.c
index 61a597bc6b620619a37d0f87b744fa0a6d018d70..0ca37d02f79c3e552b8a07355e1b38780647daf1 100644 (file)
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -29,7 +29,6 @@
 #include "email/email.h"
 #include "mutt_attach.h"
 #include "muttlib.h"
-#include "protos.h"
 #include "sendlib.h"
 
 /**

diff --git a/mutt_curses.h b/mutt_curses.h
index 6523c8e9a656cd6372b6d12a51048105ccd47ccf..f5df34fd0e68236a32dfd974a4b7a607bad3a774 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -26,7 +26,6 @@
 
 #include <regex.h>
 #include "mutt/mutt.h"
-#include "options.h"
 
 #ifdef USE_SLANG_CURSES
 

diff --git a/mutt_logging.c b/mutt_logging.c
index d0dfe22ea56f96f53ef8876add69e572ef851fb8..21f52f4648064304b8e78eb2a34d05bb5f444c48 100644 (file)
--- a/mutt_logging.c
+++ b/mutt_logging.c
@@ -36,14 +36,12 @@
 #include <sys/time.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "options.h"
-#include "protos.h"
 
 struct timeval LastError = { 0 };
 

diff --git a/mutt_lua.c b/mutt_lua.c
index 115dfc50c0a445a7b1500600ef591b83ce450209..bdcff4343a2fdd3a949fafa94ddeae0864f667b6 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -37,7 +37,6 @@
 #include "mutt_commands.h"
 #include "mutt_options.h"
 #include "muttlib.h"
-#include "protos.h"
 
 static int handle_panic(lua_State *l)
 {

diff --git a/mutt_parse.c b/mutt_parse.c
index acfc36cf3c0c6e4ba828c77a72531a0660c8b91d..3301e63b75b643b993e8086bda0bd1e3a0fcffdb 100644 (file)
--- a/mutt_parse.c
+++ b/mutt_parse.c
@@ -21,24 +21,16 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt.h"
 #include "mutt_parse.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "muttlib.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
-#include "protos.h"
-#include "recvattach.h"
 
 struct Context;
 

diff --git a/mutt_signal.c b/mutt_signal.c
index 6703a82f283722614e6b909298527b8645387d70..b36bc57dcacd5442dd83c6c34591823847cae4d4 100644 (file)
--- a/mutt_signal.c
+++ b/mutt_signal.c
@@ -32,7 +32,6 @@
 #include "mutt/mutt.h"
 #include "globals.h"
 #include "mutt_curses.h"
-#include "options.h"
 
 static int IsEndwin = 0;
 

diff --git a/mutt_socket.c b/mutt_socket.c
index 7d1b571491daaf924389776e7c789fef96b1f34b..446a363b468d210fe101739814f2cf2cf4757384 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -35,7 +35,6 @@
 #include "mutt_socket.h"
 #include "hook.h"
 #include "mutt_account.h"
-#include "protos.h"
 
 /**
  * mutt_conn_find - Find a connection from a list

diff --git a/mutt_thread.c b/mutt_thread.c
index 628e71185ed50347dd468497ff4b9fd1b511624c..68eaaec8bab5d78f38bb4acfe0a051f2dac0dbdd 100644 (file)
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include <limits.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -33,7 +32,6 @@
 #include "mutt_thread.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "options.h"
 #include "protos.h"
 #include "sort.h"
 

diff --git a/mutt_thread.h b/mutt_thread.h
index 6aa34312ba08a17e12b6c0cd1bbedf3211fa1847..0248852acda423532bfc17d1f8374aa1af3c88bc 100644 (file)
--- a/mutt_thread.h
+++ b/mutt_thread.h
@@ -23,7 +23,7 @@
 #ifndef _MUTT_THREAD2_H
 #define _MUTT_THREAD2_H
 
-#include "mutt.h"
+#include <stdbool.h>
 
 struct Context;
 struct Header;

diff --git a/mutt_url.c b/mutt_url.c
index e29c14ac07c3664d15306be494db2b50ce3c49e4..4d53f92538acdccce1a4a72369be7f62ca7c5146 100644 (file)
--- a/mutt_url.c
+++ b/mutt_url.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"

diff --git a/muttlib.c b/muttlib.c
index f6321d24cd26fd329bb9baa17e1e401bc071f51d..b7504dc792594ef4a5905c218cf9b161d5e1465b 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -32,6 +31,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -47,11 +47,9 @@
 #include "globals.h"
 #include "hook.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "protos.h"
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 64615c96612ac02226a7455ae90c95767ba800c0..faba921debe39231f6fe3cd47f80a35242548204 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -53,7 +53,6 @@
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "options.h"
-#include "protos.h"
 #include "send.h"
 #include "sendlib.h"
 #include "state.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index d64c528787cc5338778f5c0d241b2cd4ff886b3d..c2f868e9b37eaa2f3eac6867f5e1ce9265a83f5e 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
@@ -61,15 +62,12 @@
 #include "keymap.h"
 #include "menu.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #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/cryptglue.c b/ncrypt/cryptglue.c
index aabdca0504ee33d52b9ebf7a7219bb6bf0ebd03e..e8f1ae0bc5f5ea5dea525b9663f117b69add03ca 100644 (file)
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -41,9 +41,11 @@
 #include "crypt_mod.h"
 #include "curs_lib.h"
 #include "ncrypt.h"
-#include "options.h"
-#include "protos.h"
 
+struct Address;
+struct Body;
+struct Envelope;
+struct Header;
 struct State;
 
 /* These Config Variables are only used in ncrypt/cryptglue.c */

diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index f9ef8b5378efc2851eb73b885d94d253eb019479..9f632267f18e3758435a421c4ff772168d0622f4 100644 (file)
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -46,7 +46,6 @@
 #include "filter.h"
 #include "globals.h"
 #include "ncrypt.h"
-#include "options.h"
 #include "pgpinvoke.h"
 #include "pgpkey.h"
 #include "pgplib.h"

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 889bb85726e62c5ebb12a895b73561e228aa6509..accb5897f22838a36dc749fb71fff1b0cfc4e3f5 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -53,15 +53,13 @@
 #include "handler.h"
 #include "hook.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
-#include "mutt_parse.h"
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "options.h"
 #include "pgpinvoke.h"
+#include "pgpkey.h"
 #include "pgplib.h"
 #include "pgpmicalg.h"
-#include "protos.h"
 #include "sendlib.h"
 #include "state.h"
 

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 8d4ef936bb8089efd074cd66c34fd542af17ce34..dd68765f8d89dd209814d856def99fa72afa85f3 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -56,7 +56,6 @@
 #include "ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "pager.h"
 #include "pgp.h"
 #include "pgpinvoke.h"
 #include "pgplib.h"

diff --git a/ncrypt/pgpmicalg.c b/ncrypt/pgpmicalg.c
index 978c68d7461ad02411209f3ed7b69614d556d663..28244979845fd7a12f3158fb5613ea4c9e60779b 100644 (file)
--- a/ncrypt/pgpmicalg.c
+++ b/ncrypt/pgpmicalg.c
@@ -27,7 +27,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <iconv.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index e881b5f08cb2c8de3fce77aff2283464976bead3..5fdd65f1a9a21c6ed568013e26d34597399fbaa0 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -52,12 +52,10 @@
 #include "menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
 #include "opcodes.h"
-#include "options.h"
 #include "protos.h"
 #include "send.h"
 #include "sendlib.h"

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 314292a6bd977adf7168e71a6a5535c9948d20c1..7eca0ad167ce48b531d97f577131f6f151ab7a34 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -54,7 +54,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "nntp.h"
-#include "options.h"
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_HCACHE

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 1890b8f685fc61c1d976f8e5b0ac52e3e305fda1..96898fc71e09e01e8a6601abbce51b5394083c6d 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -54,7 +54,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"

diff --git a/nntp/nntp.h b/nntp/nntp.h
index 3673c9d84ed7ce667b4c1306d94aae4ba6694083..e06152f324dfc75ba37cdf52191603ed05439e22 100644 (file)
--- a/nntp/nntp.h
+++ b/nntp/nntp.h
@@ -41,12 +41,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
-#include "email/email.h"
 #include "format_flags.h"
 #include "mx.h"
-#ifdef USE_HCACHE
-#include "hcache/hcache.h"
-#endif
 
 struct Account;
 struct Header;

diff --git a/nntp/nntp_private.h b/nntp/nntp_private.h
index feb946e2428e95f9b17597491759d31e3b685954..26f3cbf6579b6d6797ef00e2dab89a899b2a1458 100644 (file)
--- a/nntp/nntp_private.h
+++ b/nntp/nntp_private.h
@@ -28,7 +28,6 @@
 #endif
 
 struct Context;
-struct Header;
 struct NntpData;
 struct NntpServer;
 

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 3b8e9cf020182b14b5e066683b590f427c05a504..d6bf7b85ac5eed833dc7ca505eb4777a7810d909 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -50,6 +50,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"

diff --git a/pager.c b/pager.c
index bc5b88bcf7e40bb00330ebad0d84a772b18fdf81..65013475a962025894c86f994cc7065610a0f30f 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -62,7 +62,6 @@
 #include "recvattach.h"
 #include "recvcmd.h"
 #include "send.h"
-#include "sort.h"
 #include "status.h"
 #include "terminal.h"
 #ifdef USE_SIDEBAR

diff --git a/pager.h b/pager.h
index b3d74c8f17811d608f661336d3ec1601393cd2ee..2179db8001f649cd255d566978796f099a1be036 100644 (file)
--- a/pager.h
+++ b/pager.h
@@ -23,11 +23,9 @@
 #ifndef _MUTT_PAGER_H
 #define _MUTT_PAGER_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
-struct Context;
-struct Menu;
-
 /* These Config Variables are only used in pager.c */
 extern bool          AllowAnsi;
 extern bool          HeaderColorPartial;

diff --git a/pop/pop.c b/pop/pop.c
index a2d7993ed05df5507f2918e64e27587a3c48e854..db46ce200db1edc9e321e732e485da52649bb996 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 #include "pop_private.h"
 #include "mutt/mutt.h"
@@ -52,9 +53,7 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
-#include "options.h"
 #include "progress.h"
-#include "protos.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
@@ -62,6 +61,8 @@
 #include <libintl.h>
 #endif
 
+struct BodyCache;
+
 /* These Config Variables are only used in pop/pop.c */
 short PopCheckinterval;
 unsigned char PopDelete;

diff --git a/pop/pop.h b/pop/pop.h
index d5e5e829df9a1641f1894ef91a379a1258988282..2cb6ac654abd3944ee301e6be2b7388fc7827655 100644 (file)
--- a/pop/pop.h
+++ b/pop/pop.h
@@ -23,6 +23,7 @@
 #ifndef _POP_POP_H
 #define _POP_POP_H
 
+#include <stdbool.h>
 #include "mx.h"
 
 /**

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index a089256ca74fb189187bc29301493849472c462e..2ba239781b965767f21d3255eb036661e09c03f8 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -34,12 +34,9 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "conn/conn.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
-#include "options.h"
-#include "pop.h"
 #ifdef USE_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 0b722ace836f583ca9df5cd56a4266d3d4fe71f2..1533395d82903545f3cefffb570cadc85c30ea62 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -42,14 +42,10 @@
 #include "context.h"
 #include "globals.h"
 #include "mutt_account.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "muttlib.h"
-#include "options.h"
-#include "pop.h"
 #include "progress.h"
-#include "protos.h"
 
 /* These Config Variables are only used in pop/pop_lib.c */
 unsigned char PopReconnect;

diff --git a/postpone.c b/postpone.c
index 7b0fdf2d4efee5ea861c99320275632469a5bf54..731e703513d959662d8401ac53009fd7272a8ede 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -48,7 +48,6 @@
 #include "mailbox.h"
 #include "menu.h"
 #include "mutt_logging.h"
-#include "mutt_parse.h"
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"

diff --git a/progress.c b/progress.c
index 51c8fb7f0071c5eda78adb2bcb5d937afd9f0b8c..a36cd404ff02497c304e2551e7d3cba429731aa6 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -33,14 +33,11 @@
 #include <string.h>
 #include <sys/time.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "progress.h"
 #include "curs_lib.h"
-#include "globals.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "options.h"
-#include "protos.h"
 
 /* These Config Variables are only used in progress.c */
 short TimeInc;

diff --git a/protos.h b/protos.h
index f9bfedeaca8aa1e90ce3dafe4f3c42e195534ba7..4d9f0d586cad8e4be5ea34bd53e52e98da50b731 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -27,7 +27,6 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <time.h>
 
 struct Context;
 struct EnterState;

diff --git a/query.c b/query.c
index 0aa9e8cc940c08c8af3f96b773414244f971c38d..6d1007d52d30b04666faf487c2ebc895266b4d6c 100644 (file)
--- a/query.c
+++ b/query.c
@@ -40,7 +40,6 @@
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "protos.h"
 #include "send.h"
 
 /* These Config Variables are only used in query.c */

diff --git a/recvattach.c b/recvattach.c
index 51cdb21834947098162dc4a4e67af2e741874923..065a91dab65809c7a896cb776caef48cf433bf22 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -45,7 +45,6 @@
 #include "mailbox.h"
 #include "menu.h"
 #include "mutt_attach.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_parse.h"
 #include "mutt_window.h"
@@ -54,7 +53,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "protos.h"
 #include "recvcmd.h"
 #include "rfc1524.h"
 #include "send.h"

diff --git a/recvattach.h b/recvattach.h
index d29cbbd3c2cdca7feda79b908dee0cc28668aa2c..e9254d05d2bd6f894fe6a559c8a3c1c4f3d5fde0 100644 (file)
--- a/recvattach.h
+++ b/recvattach.h
@@ -24,9 +24,12 @@
 #ifndef _MUTT_RECVATTACH_H
 #define _MUTT_RECVATTACH_H
 
+#include <stddef.h>
+#include <stdbool.h>
 #include "format_flags.h"
 
 struct AttachCtx;
+struct Header;
 
 /* These Config Variables are only used in recvattach.c */
 extern char *AttachSep;

diff --git a/recvcmd.c b/recvcmd.c
index 5203dd49a44722b6cf428693a7f93e48674b5298..3836ae5c99c5250b54eac6c1dc63efeca6560d5e 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -40,7 +40,6 @@
 #include "muttlib.h"
 #include "options.h"
 #include "protos.h"
-#include "recvattach.h"
 #include "send.h"
 #include "sendlib.h"
 #include "state.h"

diff --git a/remailer.c b/remailer.c
index a304fa1c219b06be7dfa33457e11ac4c939e299b..e230ac2ac7519a0f9fe9e88049d8fa258e8c79a5 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -33,7 +33,6 @@
 #include "curs_lib.h"
 #include "filter.h"
 #include "format_flags.h"
-#include "globals.h"
 #include "keymap.h"
 #include "menu.h"
 #include "mutt_curses.h"

diff --git a/rfc1524.c b/rfc1524.c
index 095606e558822ae76d80b0cc05787e0d7da42bd1..69802096dda1fd2ca76aa7198c7c6c7c077ff770 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -44,7 +44,6 @@
 #include "globals.h"
 #include "mutt_attach.h"
 #include "muttlib.h"
-#include "options.h"
 #include "protos.h"
 
 /* These Config Variables are only used in rfc1524.c */

diff --git a/rfc3676.c b/rfc3676.c
index 31b4b86dd858ea87fc549a73c4095e92271cd6bb..6d4e22a9cf07186cd5041652b45e59e2b8e5fff0 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -35,8 +35,6 @@
 #include "globals.h"
 #include "mutt_window.h"
 #include "muttlib.h"
-#include "options.h"
-#include "protos.h"
 #include "state.h"
 
 /* These Config Variables are only used in rfc3676.c */

diff --git a/rfc3676.h b/rfc3676.h
index 4ef411bd2d3801818e332d5d5a79cd51d2883fd8..89b9440c8e792279f1a5818736eb11f8d4912325 100644 (file)
--- a/rfc3676.h
+++ b/rfc3676.h
@@ -25,6 +25,8 @@
 #ifndef _MUTT_RFC3676_H
 #define _MUTT_RFC3676_H
 
+#include <stdbool.h>
+
 struct Body;
 struct Header;
 struct State;

diff --git a/safe_asprintf.c b/safe_asprintf.c
index b5acb8754b175a4bd7566a487509a6e23e2c1ad9..6b5985c102f67e3aecabe1fb979c6f23cfb431fc 100644 (file)
--- a/safe_asprintf.c
+++ b/safe_asprintf.c
@@ -32,6 +32,7 @@
 
 #include "config.h"
 #include <stdarg.h>
+#include <stdio.h>
 #include "mutt/mutt.h"
 
 #ifdef HAVE_VASPRINTF

diff --git a/sendlib.c b/sendlib.c
index 6d66cff8b94e4df0def2ad76032013cea1031925..9e91470bbf63b58122fd189fe5b4077cc82fa81d 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -44,20 +44,15 @@
 #include "copy.h"
 #include "curs_lib.h"
 #include "filter.h"
-#include "format_flags.h"
 #include "globals.h"
 #include "handler.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
-#include "pager.h"
-#include "protos.h"
-#include "recvattach.h"
 #include "send.h"
 #include "smtp.h"
 #include "state.h"

diff --git a/sidebar.c b/sidebar.c
index a038ba18e74b19dced8e124e7c3780850cd674e8..44943be6a2bc50f3b60f2564507a71ac095d6429 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "sidebar.h"
 #include "buffy.h"
 #include "context.h"
@@ -48,8 +47,6 @@
 #include "muttlib.h"
 #include "mx.h"
 #include "opcodes.h"
-#include "options.h"
-#include "protos.h"
 #include "sort.h"
 #ifdef USE_NOTMUCH
 #include "notmuch/mutt_notmuch.h"

diff --git a/sidebar.h b/sidebar.h
index ae1e4c2e5f93d7432704080c839aa6f0db32561a..a681dd2481f4e519c0711c214ceaf80ca69f215c 100644 (file)
--- a/sidebar.h
+++ b/sidebar.h
@@ -25,6 +25,8 @@
 #ifndef _MUTT_SIDEBAR_H
 #define _MUTT_SIDEBAR_H
 
+#include <stdbool.h>
+
 struct Buffy;
 struct Context;
 

diff --git a/smtp.c b/smtp.c
index 494245a420b555842bdb54c48759997a2858cda5..9e1a866a0290621a62d4ccdb1c0b5178ca7eba74 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -40,7 +40,6 @@
 #include "mutt_socket.h"
 #include "options.h"
 #include "progress.h"
-#include "protos.h"
 #include "sendlib.h"
 #ifdef USE_SASL
 #include <sasl/sasl.h>

diff --git a/sort.c b/sort.c
index c51fef0c0444d1d81143a2064c44b97eb4b05a60..8fca09933b515ea5956ced9566891c373137c9f8 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -33,7 +33,6 @@
 #include "mutt_logging.h"
 #include "mutt_thread.h"
 #include "options.h"
-#include "protos.h"
 #include "score.h"
 #ifdef USE_NNTP
 #include "mx.h"

diff --git a/sort.h b/sort.h
index 9b3548953e306db9c1ece3d738ff2de999d8470b..dbb9265497810ad77c3b25a6e777cea74f1e0259 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -23,10 +23,11 @@
 #ifndef _MUTT_SORT_H
 #define _MUTT_SORT_H
 
+#include <stdbool.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
 #include "where.h"
 
+struct Address;
 struct Context;
 
 /* These Config Variables are only used in sort.c */

diff --git a/system.c b/system.c
index d7df68ec1f84e6b35758561673a4e4951391843b..285800ce1a3c081a067a17ebea9ff2a7366084e7 100644 (file)
--- a/system.c
+++ b/system.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
-#include "protos.h"
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif