iwyu

diff --git a/addrbook.c b/addrbook.c
index 88a0904c6ce861e004ca9278af53181e3408df5e..8c36653276b0a1a36dd2615da5363fb330d45996 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -36,7 +36,6 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "keymap.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "opcodes.h"

diff --git a/alias.c b/alias.c
index d51ee4c40265d27d0f75f8d5ea07d19c7f45ff80..cec7005153e34ebc1e5bf72bdf5d8be2908e8b43 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -24,6 +24,7 @@
 #include <stddef.h>
 #include <errno.h>
 #include <pwd.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/alias.h b/alias.h
index d44bb318f2d57469785119befed761060fd1290a..49f789f4ab2b60813589b8cc6df9f95cdf3da333 100644 (file)
--- a/alias.h
+++ b/alias.h
@@ -26,9 +26,6 @@
 #include <stdbool.h>
 #include "mutt/mutt.h"
 
-struct Envelope;
-struct Address;
-
 /**
  * struct Alias - A shortcut for an email address
  */

diff --git a/bcache.c b/bcache.c
index e6b11c13700208e95ce02eb61843010732e0ccbc..63d3b7a4c93e4ad063def17c20769c06ab676fa8 100644 (file)
--- a/bcache.c
+++ b/bcache.c
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "conn/conn.h"
 #include "bcache.h"
 #include "globals.h"
 #include "mutt_account.h"

diff --git a/browser.c b/browser.c
index a929e5dfda40795933410b8f2b7ef9bc0666011f..c31a5c21bbc645a169a9368e06a4c9eb2950bd87 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -45,7 +45,6 @@
 #include "globals.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_account.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"

diff --git a/buffy.c b/buffy.c
index 9378fd29489ae45509b323683e33826a91802e29..7fa162ae3db961e9a09e82cb680216a4a56d7d74 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -24,18 +24,16 @@
 #include "config.h"
 #include <dirent.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "conn/conn.h"
 #include "buffy.h"
 #include "context.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "mx.h"

diff --git a/commands.c b/commands.c
index 98639cbb50ed9d4e15d13eff773c2a62255c460d..9127fd1dc05ff307bda8cd90adef8aba35025197 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -56,6 +56,9 @@
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 static const char *ExtPagerProgress = "all";
 

diff --git a/complete.c b/complete.c
index 7cfd1d518c84d110eb6af316e9e6f00a2e221801..6e2b44fc26bf15fbdb4d9e448218116c9a9a89a3 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "mutt/mutt.h"
-#include "conn/conn.h"
 #include "globals.h"
 #include "options.h"
 #include "protos.h"

diff --git a/compose.c b/compose.c
index 8126479e82f3f1691f9fb343ccf56ed417feeb71..d7e9a618e9405139f57efb1633abe3b479cf39c7 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -40,6 +40,7 @@
 #include "mailbox.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
+#include "mutt_header.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "mx.h"
@@ -49,6 +50,9 @@
 #include "protos.h"
 #include "recvattach.h"
 #include "sort.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 #ifdef MIXMASTER
 #include "remailer.h"
 #endif

diff --git a/compress.c b/compress.c
index d237d195a02add43d933b0a69148beed5a8b00a3..55462f3cda56398eccc345e77cc1ac6396fc687d 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -29,6 +29,7 @@
 
 #include "config.h"
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -44,8 +45,6 @@
 #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/ssl.h b/conn/ssl.h
index 821e46c2fdfc2fffaea0a58b4d801f1569daa160..11773ec2366f3ef27d97e02839a7ace0a8d66d47 100644 (file)
--- a/conn/ssl.h
+++ b/conn/ssl.h
@@ -23,9 +23,9 @@
 #ifndef _CONN_SSL_H
 #define _CONN_SSL_H
 
-#ifdef USE_SSL
 struct Connection;
 
+#ifdef USE_SSL
 int mutt_ssl_starttls(struct Connection *conn);
 int mutt_ssl_socket_setup(struct Connection *conn);
 #else

diff --git a/copy.c b/copy.c
index b70f00289af7e9b08ecee50f4f11ccace5ae6c31..5374111e0fb5792ebdb5d65b76bd1a4b2a05f9b7 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -38,7 +38,6 @@
 #include "globals.h"
 #include "handler.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"

diff --git a/curs_lib.c b/curs_lib.c
index 2d4a48c20e19ddef4925cbaa7d7dd8b8c9b77a22..f64739c52cee18df566ca8f73ccd0ef2c9e54d8d 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -29,12 +29,10 @@
 #include <langinfo.h>
 #include <limits.h>
 #include <regex.h>
-#include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
 #include <termios.h>
 #include <unistd.h>
 #include <wchar.h>

diff --git a/curs_main.c b/curs_main.c
index e81a15e908a9ffafde630ccc528d16194f825189..07182e53c39ca3276b4e683f77b26fe7ab4242f6 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -23,10 +23,10 @@
 #include "config.h"
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
 #include "conn/conn.h"
@@ -39,6 +39,7 @@
 #include "keymap.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
+#include "mutt_header.h"
 #include "mutt_menu.h"
 #include "mutt_thread.h"
 #include "mutt_window.h"
@@ -67,6 +68,9 @@
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 static const char *No_mailbox_is_open = N_("No mailbox is open.");
 static const char *There_are_no_messages = N_("There are no messages.");

diff --git a/edit.c b/edit.c
index 4f285594756bc5281cadaec8eb05228752d3c192..af7db8ea430ca7a383336931e68f3fc549a239a1 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -35,6 +35,7 @@
 #include "context.h"
 #include "globals.h"
 #include "mutt_curses.h"
+#include "mutt_header.h"
 #include "mutt_window.h"
 #include "options.h"
 #include "protos.h"

diff --git a/enriched.c b/enriched.c
index 3c11d24dae8f4e6e331ee04e1efd1952253c8358..269e5e0f2578ff4dd5d331c3800f35d181db7bc9 100644 (file)
--- a/enriched.c
+++ b/enriched.c
@@ -28,7 +28,6 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 #include <wchar.h>
 #include <wctype.h>
 #include "mutt/mutt.h"

diff --git a/filter.c b/filter.c
index 422b2588a0d7105a633b407f19e806a61f1ead96..697b94dae3c6246a61c1633123d2700837fdaae0 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -33,9 +33,7 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "filter.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
-#include "protos.h"
 
 /**
  * mutt_create_filter_fd - Run a command on a pipe (optionally connect stdin/stdout)

diff --git a/functions.h b/functions.h
index 25d462094f213f3bab9e0c9e3bfe7e78a12a8fac..257a8b76a60bd76ec0d735ebb2f07548cd8bbaf5 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -37,7 +37,6 @@
  */
 
 #ifdef _MAKEDOC
-#include "config.h"
 #include "doc/makedoc_defs.h"
 #else
 #include <stddef.h>

diff --git a/globals.h b/globals.h
index ef60480dc4621927e73e64e13b23987890fb0202..9021c3ed2f5198691fe7f9ed092133d0ab17e8b0 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -24,6 +24,7 @@
 #define _MUTT_GLOBALS_H
 
 #include <signal.h>
+#include <stdbool.h>
 #include "mutt/mutt.h"
 #include "where.h"
 

diff --git a/group.c b/group.c
index 59f10713274efaeca89fa5195031f5957722d3c6..931285c6aa92e0fdfde56abb8dd2cb37d7fa9252 100644 (file)
--- a/group.c
+++ b/group.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 #include <stdlib.h>
+#include <stdbool.h>
 #include "mutt/mutt.h"
 #include "group.h"
 #include "globals.h"

diff --git a/hcache/bdb.c b/hcache/bdb.c
index c8bcdb15271d225c594421f603006c68bf192cae..105cf129b8d5aaea8898cd74b2fdec0e2c8150d3 100644 (file)
--- a/hcache/bdb.c
+++ b/hcache/bdb.c
@@ -41,7 +41,6 @@
 #include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
-#include "mx.h"
 
 /**
  * struct HcacheDbCtx - Berkeley DB context

diff --git a/hcache/hcache.c b/hcache/hcache.c
index fd237be38a7dbdee237d8104f4ea5e1b854fe276..f55917f9f2eddd8aba4b7bb5dbf2ae922cebd18b 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -42,7 +42,6 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>

diff --git a/hcache/hcache.h b/hcache/hcache.h
index 260950944e8e32e6b76899d0943266cf117b1298..3ddf3956288c86beae613d52282a8a3d7c5bddd6 100644 (file)
--- a/hcache/hcache.h
+++ b/hcache/hcache.h
@@ -46,6 +46,7 @@
 #ifndef _MUTT_HCACHE_H
 #define _MUTT_HCACHE_H
 
+#include <stdbool.h>
 #include <stddef.h>
 
 struct Header;

diff --git a/hcache/qdbm.c b/hcache/qdbm.c
index 95a4ead1b87f08ac32c951d8a87486e7681866ac..462c51a1e041280bb3cfc718db885d7fe158c1ba 100644 (file)
--- a/hcache/qdbm.c
+++ b/hcache/qdbm.c
@@ -32,6 +32,7 @@
 #include "config.h"
 #include <stddef.h>
 #include <depot.h>
+#include <stdbool.h>
 #include <villa.h>
 #include "mutt/mutt.h"
 #include "backend.h"

diff --git a/help.c b/help.c
index 50999495431f0bc59998bc3b0e23af372dcd8369..9c42ed4029c03f0b045374212cb0263cc61987e5 100644 (file)
--- a/help.c
+++ b/help.c
@@ -30,7 +30,6 @@
 #include "mutt/mutt.h"
 #include "globals.h"
 #include "keymap.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "opcodes.h"
 #include "options.h"

diff --git a/history.c b/history.c
index ef1a139fd4c3f71dfec32896061ba616a3a6589f..06e6f02ac4bcf4e08a5ef6b46b96c6dde2f0caaf 100644 (file)
--- a/history.c
+++ b/history.c
@@ -70,19 +70,19 @@
 
 #include "config.h"
 #include <limits.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "mutt.h"
 #include "history.h"
-#include "globals.h"
+#include "format_flags.h"
 #include "keymap.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "opcodes.h"
-#include "options.h"
 #include "protos.h"
 
 #define HC_FIRST HC_CMD

diff --git a/history.h b/history.h
index aa18a63c0b5d5a9e6763173cd9730b8c01228cd9..1ee00440007e876ae30fc57d776cb8398c991622 100644 (file)
--- a/history.h
+++ b/history.h
@@ -24,6 +24,7 @@
 #define _MUTT_HISTORY_H
 
 #include <stdbool.h>
+#include <stdio.h>
 
 extern short History;
 extern char *HistoryFile;

diff --git a/imap/auth.c b/imap/auth.c
index 53f4016e6df539db9c8ef3b16c5ed0ec02c6985e..e690322973a58e67be0b204f4e9dc156c1c719dc 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -33,7 +33,6 @@
 #include "mutt/mutt.h"
 #include "auth.h"
 #include "globals.h"
-#include "protos.h"
 
 /**
  * imap_authenticators - Accepted authentication methods

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index 6fa193547699052b443d4635cbf111f921f83c44..eb9f90f1c4b59cc04ccb58c65f72fa2f27d6f375 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -31,11 +31,9 @@
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
 #include "options.h"
-#include "protos.h"
 
 /**
  * imap_auth_anon - Authenticate anonymously

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index c33b05f8c1a75eacdc557f7715a704761c6a8b26..508d5821dcaa31052b5b190e8db59e9764c1beb3 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -33,11 +33,9 @@
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
 #include "options.h"
-#include "protos.h"
 
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index d5ff2f122b88b40b996b2db9d2bfb0bc62afc934..298e00061afebaa21cce5b454c2fa36e991c6b7b 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -40,14 +40,11 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "conn/conn.h"
-#include "mutt.h"
 #include "auth.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "options.h"
-#include "protos.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 0f4445b4532660e17f18a935fdacd4f492438dcf..0790dd145803812990f54e823b6e945b4e131d3c 100644 (file)
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -31,12 +31,9 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "conn/conn.h"
-#include "mutt.h"
 #include "auth.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
-#include "mutt_socket.h"
 #include "options.h"
 #include "protos.h"
 

diff --git a/imap/auth_plain.c b/imap/auth_plain.c
index da2a9994b10f19e18d26cbbf13dceea178eabd12..6813a1c879edc5ae3d75328701b09c896f1d70fd 100644 (file)
--- a/imap/auth_plain.c
+++ b/imap/auth_plain.c
@@ -32,9 +32,9 @@
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
+#include "options.h"
 #include "protos.h"
 
 /**

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index b300581bd29d08bc1653c4c14310c4b9b125cd1c..2c896f91efc390d22975e11f9a7f38a729d0cf15 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -30,17 +30,16 @@
 #include <stddef.h>
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "mutt_socket.h"
 #include "options.h"
-#include "protos.h"
 
 /**
  * imap_auth_sasl - Default authenticator if available

diff --git a/imap/browse.c b/imap/browse.c
index f0c200abbada52e8ffec9e72d245d00eb42c9f81..e071c765bc93e9fc460b3cba5f06e12cdfdec1c4 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -28,19 +28,20 @@
  */
 
 #include "config.h"
+#include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "browser.h"
 #include "buffy.h"
 #include "context.h"
 #include "globals.h"
 #include "imap/imap.h"
-#include "mutt_account.h"
 #include "options.h"
 #include "protos.h"
 

diff --git a/imap/command.c b/imap/command.c
index 7eb42e2c468f68056e8b38f86151f7bfb6de13ba..26ee5fe4456d4d1c0c8ce5922458aa3da4227481 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/imap/imap.c b/imap/imap.c
index 839583cb4f108edd28f97d8a442a62316049e9f9..ce58cbda23b082e622344ac8eb9f676b7869e350 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -29,7 +29,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -50,7 +49,6 @@
 #include "mailbox.h"
 #include "message.h"
 #include "mutt_account.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "mx.h"
@@ -63,6 +61,9 @@
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 /**
  * check_capabilities - Make sure we can log in to this server

diff --git a/imap/imap.h b/imap/imap.h
index eb78684d4ed8b0a3df9d029b4821041e6b13cf61..fe58aa8b2b6a321e395fa86c7d5a35aedd2af4d0 100644 (file)
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -47,14 +47,14 @@
 #define _IMAP_IMAP_H
 
 #include "conn/conn.h"
-#include "mutt_account.h"
+#include <stdbool.h>
 #include <stddef.h>
 #include <sys/types.h>
+#include "mx.h"
 
 struct BrowserState;
 struct Context;
 struct Header;
-struct Message;
 struct Pattern;
 
 /**

diff --git a/imap/message.c b/imap/message.c
index 10ce5a837bcd942abf4ece256eba35b30057586f..4b1a55a5b4b82afe8da5d8a4fa5fb09e5b189a7e 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -30,8 +30,8 @@
 #include "config.h"
 #include <ctype.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "imap_private.h"
@@ -54,6 +54,9 @@
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 struct BodyCache;
 

diff --git a/imap/utf7.c b/imap/utf7.c
index 3a38c68e70c3037b54b6a966ececff4baca537de..cb5f04e79a5fb5bc563e1a49212fe6a3b5eb5259 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -27,10 +27,10 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <string.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
-#include "globals.h"
 
 // clang-format off
 /**

diff --git a/imap/util.c b/imap/util.c
index d73ddf757be4b58230273dff848a39b9eba86f95..0bd6d7bba342816aed3b0fbdf47f6811c66df7c5 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -31,12 +31,12 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
+#include <limits.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
 #include <time.h>
@@ -51,7 +51,6 @@
 #include "mailbox.h"
 #include "message.h"
 #include "mutt_account.h"
-#include "mutt_socket.h"
 #include "mx.h"
 #include "options.h"
 #include "protos.h"

diff --git a/init.c b/init.c
index 298113d656ef934c5a9114ae706fc0135975df3d..ede2c24e450787692cd6565deb4124a82aecc8d7 100644 (file)
--- a/init.c
+++ b/init.c
@@ -53,7 +53,6 @@
 #include "myvar.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
-#include "pattern.h"
 #include "protos.h"
 #include "sidebar.h"
 #include "version.h"
@@ -63,6 +62,9 @@
 #ifdef USE_IMAP
 #include "imap/imap.h" /* for imap_subscribe() */
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 #define CHECK_PAGER                                                                  \
   if ((CurrentMenu == MENU_PAGER) && (idx >= 0) && (MuttVars[idx].flags & R_RESORT)) \

diff --git a/init.h b/init.h
index 521ba25575796fec3749c921f668e3bf0922d8ca..9d52b2325c7b0d35be1db446334681fc54229b19 100644 (file)
--- a/init.h
+++ b/init.h
@@ -25,10 +25,10 @@
 #define _MUTT_INIT_H
 
 #ifdef _MAKEDOC
-#include "config.h"
 #include "doc/makedoc_defs.h"
 #else
 #include <stddef.h>
+#include <stdbool.h>
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"

diff --git a/main.c b/main.c
index 410708c856a46a4b0056ff809826b01d9b23d3fc..1e2a7987c537c446ee2dc7aa668b947e2b0b044d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -51,9 +51,8 @@
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
-#include "mutt_menu.h"
 #include "mutt_window.h"
-#include "myvar.h"
+#include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "protos.h"

diff --git a/mbox.c b/mbox.c
index d8ccaa5cbc7efdc2f6e6f1eaa993e4587f928a04..52c44e1c0ed33d7a0a412b39966b5cdd19ae03c7 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -39,7 +39,7 @@
 #include "copy.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
+#include "mutt_header.h"
 #include "mutt_thread.h"
 #include "mx.h"
 #include "options.h"

diff --git a/menu.c b/menu.c
index 6c248b2068bd5033900692df8974ba9a107224bd..8df9329eeedb8fb9e2a08a394299d76407747898 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -43,8 +43,6 @@
 #include "sidebar.h"
 #endif
 
-struct Header;
-
 char *SearchBuffers[MENU_MAX];
 
 /* These are used to track the active menus, for redraw operations. */

diff --git a/mh.c b/mh.c
index 7dca50e21067e3b06a588d17e620d5a73fbf35f7..98a71321b03425dc9ed1da21fc0fd29ec8bd9340 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -45,7 +45,6 @@
 #include "copy.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_thread.h"
 #include "mx.h"
 #include "options.h"

diff --git a/mutt.h b/mutt.h
index d55e9f6582fed7c76fd421345da4482fb760493a..48a74aa469dba44d9f32c2341f36845fabdf2dd6 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -28,7 +28,6 @@
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include "where.h"
 
 struct ListHead;

diff --git a/mutt/address.c b/mutt/address.c
index 12f23e5cbff3a3e6f04212bab1c1b4de1b233b67..140557217fddb93ee17837b7bd19f54c458127ab 100644 (file)
--- a/mutt/address.c
+++ b/mutt/address.c
@@ -28,6 +28,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include "address.h"

diff --git a/mutt/attach.c b/mutt/attach.c
index 5f697e601b6fbf5c749c610058fb4b9b0d533654..722dbc7ee91f6609d7d6828e419827de15c48f60 100644 (file)
--- a/mutt/attach.c
+++ b/mutt/attach.c
@@ -28,12 +28,6 @@
  */
 
 #include "config.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "attach.h"
 #include "body.h"
 #include "file.h"
@@ -59,7 +53,7 @@ void mutt_actx_add_attach(struct AttachCtx *actx, struct AttachPtr *attach)
 }
 
 /**
- * mutt_actx_add_fp - Save a File handle to the Attachment Context 
+ * mutt_actx_add_fp - Save a File handle to the Attachment Context
  * @param actx   Attachment context
  * @param new_fp File handle to save
  */

diff --git a/mutt/attach.h b/mutt/attach.h
index 42c5e04466a6d98dd3b9e6d4e83958bab846bd90..9132ad4f1dc37e943776531fe01b8343e2b0977d 100644 (file)
--- a/mutt/attach.h
+++ b/mutt/attach.h
@@ -26,7 +26,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-struct Header;
 struct Body;
 
 /**

diff --git a/mutt/body.c b/mutt/body.c
index 083266be05fbae2261b3e18cedfbdbaebf142e66..ae7ddcfdb9706e13c2d4004c5941467c59d607e1 100644 (file)
--- a/mutt/body.c
+++ b/mutt/body.c
@@ -27,14 +27,15 @@
  */
 
 #include "config.h"
-#include <limits.h>
-#include <string.h>
+#include <stdbool.h>
 #include <unistd.h>
 #include "body.h"
 #include "header.h"
 #include "logging.h"
 #include "memory.h"
 #include "mime.h"
+#include "parameter.h"
+#include "queue.h"
 #include "string2.h"
 
 /**

diff --git a/mutt/body.h b/mutt/body.h
index b46c1ca6c2981b33d47ebb1dadf9c4d869b10d94..994b1e23e5bdd0a57919a2c027c6ac0e7e1f3957 100644 (file)
--- a/mutt/body.h
+++ b/mutt/body.h
@@ -24,7 +24,6 @@
 #define _MUTT_BODY_H
 
 #include <stdbool.h>
-#include <stdio.h>
 #include <time.h>
 #include "parameter.h"
 

diff --git a/mutt/buffer.c b/mutt/buffer.c
index 51ca49e64aedc27a28e56f262446d818ad367ec5..aca89616197e1621afa7a8c044e71a1c54a851c7 100644 (file)
--- a/mutt/buffer.c
+++ b/mutt/buffer.c
@@ -29,6 +29,7 @@
 
 #include "config.h"
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include "buffer.h"

diff --git a/mutt/date.c b/mutt/date.c
index f6ab10834952678b371515f6e55d6c3ab55b0fbe..002f5200e676e5b93a5055b0182ce669400174d2 100644 (file)
--- a/mutt/date.c
+++ b/mutt/date.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/mutt/file.h b/mutt/file.h
index 1bb6589d18afe99724c06a67f86fde3beefc07db..12e27d15889db5212dda155247411ee995e04e16 100644 (file)
--- a/mutt/file.h
+++ b/mutt/file.h
@@ -23,6 +23,7 @@
 #ifndef _MUTT_FILE_H
 #define _MUTT_FILE_H
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>

diff --git a/mutt/hash.c b/mutt/hash.c
index 19a99cb6070c1a1802183f70ad74e243f3240aed..2fc43b266e017a1687c11f3b7c07c18c26244cbb 100644 (file)
--- a/mutt/hash.c
+++ b/mutt/hash.c
@@ -28,6 +28,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <ctype.h>
 #include <stdio.h>
 #include "hash.h"

diff --git a/mutt/hash.h b/mutt/hash.h
index 4c50af2dc33ec38a561aebba89614a71507ae74e..28d8bfd96c18a599aef47de41ca91b02bbfcda38 100644 (file)
--- a/mutt/hash.h
+++ b/mutt/hash.h
@@ -26,6 +26,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 
 /**
  * union HashKey - The data item stored in a HashElem

diff --git a/mutt/header.c b/mutt/header.c
index 8cd047367dc73c1657c9fe28a2f8e3106c8fb133..e9423516a441b7609abf82ca70c3928557225f87 100644 (file)
--- a/mutt/header.c
+++ b/mutt/header.c
@@ -27,20 +27,14 @@
  */
 
 #include "config.h"
-#include <limits.h>
 #include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <time.h>
 #include "header.h"
 #include "body.h"
 #include "envelope.h"
-#include "file.h"
-#include "hash.h"
-#include "logging.h"
+#include "list.h"
 #include "memory.h"
-#include "string2.h"
+#include "queue.h"
+#include "tags.h"
 
 /**
  * mutt_header_free - Free an email Header

diff --git a/mutt/header.h b/mutt/header.h
index 31029c156840354d7c3e134a5fbe28819d35ae91..3f6515d3b0d7a38e551342a1b5f0a36d3f030b4a 100644 (file)
--- a/mutt/header.h
+++ b/mutt/header.h
@@ -25,6 +25,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <time.h>
 #include "list.h"
 #include "tags.h"

diff --git a/mutt/list.c b/mutt/list.c
index 569cc8a8544408468727875bed24300be02b40bd..090f6d0d3731a4c35667cc9fa91174b0813f05e3 100644 (file)
--- a/mutt/list.c
+++ b/mutt/list.c
@@ -28,9 +28,11 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <string.h>
 #include "list.h"
 #include "memory.h"
+#include "queue.h"
 #include "string2.h"
 
 /**

diff --git a/mutt/logging.c b/mutt/logging.c
index a9f390839af31145da481592a665ca1c0ec9a6a3..600365729f5dee4a4ec40e5c251d40a127ed3e1b 100644 (file)
--- a/mutt/logging.c
+++ b/mutt/logging.c
@@ -28,10 +28,9 @@
 
 #include "config.h"
 #include <errno.h>
-#include <limits.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>

diff --git a/mutt/md5.c b/mutt/md5.c
index 9b9d2f1d583feebb7df77e9dbcd923372d31ed77..313e018999a7ae2d1cdf436caf2bb601218f252c 100644 (file)
--- a/mutt/md5.c
+++ b/mutt/md5.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 #include <stddef.h>
-#include <stdbool.h>
 #include <string.h>
 #include "md5.h"
 

diff --git a/mutt/memory.c b/mutt/memory.c
index e82a59f586803997fdf98f05426d218e48766b2e..fdec09d78eaeed66ea73fa0e159488b42d711250 100644 (file)
--- a/mutt/memory.c
+++ b/mutt/memory.c
@@ -32,7 +32,6 @@
 #include "config.h"
 #include <stdint.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include "memory.h"
 #include "exit.h"
 #include "logging.h"

diff --git a/mutt/mime.c b/mutt/mime.c
index 9bb5f3b40cb6e794a1bd5d7595ab952f8cf8d8c0..fb99cb7ce879be0668b8324de09f2e2afd7bffc0 100644 (file)
--- a/mutt/mime.c
+++ b/mutt/mime.c
@@ -27,10 +27,7 @@
  */
 
 #include "config.h"
-#include <stdbool.h>
 #include "mime.h"
-#include "memory.h"
-#include "string2.h"
 
 // clang-format off
 /**

diff --git a/mutt/mime.h b/mutt/mime.h
index b72d030fd2d6658c547416d2475a6204abb4c8f8..12e2aa1bda5cacf5dc6392ac7cfdbc386e3e20fe 100644 (file)
--- a/mutt/mime.h
+++ b/mutt/mime.h
@@ -23,8 +23,6 @@
 #ifndef _MUTT_MIME_H
 #define _MUTT_MIME_H
 
-#include <stdbool.h>
-
 /**
  * enum ContentType - Content-Type
  */

diff --git a/mutt/parameter.c b/mutt/parameter.c
index 4f7d6419e0ef1696e61a37d142d70d1a97d9435f..37466673eafb1276b30a584fb32ff8c48ed52437 100644 (file)
--- a/mutt/parameter.c
+++ b/mutt/parameter.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include <stddef.h>
+#include <stdbool.h>
 #include "parameter.h"
 #include "memory.h"
 #include "queue.h"

diff --git a/mutt/regex3.h b/mutt/regex3.h
index 43ad33591735aa29b7212093a6a6dfa11f642569..e244ece87c62f9ec67fb5572c722de44000de88f 100644 (file)
--- a/mutt/regex3.h
+++ b/mutt/regex3.h
@@ -25,6 +25,7 @@
 
 #include <regex.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 struct Buffer;
 

diff --git a/mutt/rfc2047.c b/mutt/rfc2047.c
index 550823a01980fbe8d8b6a5224bae643d775206ce..97c52168607b272411fc43f551912597d06fc78d 100644 (file)
--- a/mutt/rfc2047.c
+++ b/mutt/rfc2047.c
@@ -31,6 +31,8 @@
 #include "config.h"
 #include <assert.h>
 #include <errno.h>
+#include <iconv.h>
+#include <regex.h>
 #include <stdbool.h>
 #include <string.h>
 #include "rfc2047.h"

diff --git a/mutt/thread.c b/mutt/thread.c
index 9caeb25294c57ed06eb19c2e99d5ef7c21fbc38f..7d6d12b4f239dc43a81cbba19dab8d87277d99f1 100644 (file)
--- a/mutt/thread.c
+++ b/mutt/thread.c
@@ -27,12 +27,16 @@
  */
 
 #include "config.h"
-#include <limits.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include "thread.h"
+#include "envelope.h"
+#include "header.h"
+#include "list.h"
+#include "memory.h"
+#include "queue.h"
+#include "string2.h"
 
 /**
  * is_descendant - Is one thread a descendant of another

diff --git a/mutt/thread.h b/mutt/thread.h
index 80122493adc09f9717c52559e8e0bee64a988dfe..f69e988f2c0e54b2fe73ba5332f54f7b57bf6cf9 100644 (file)
--- a/mutt/thread.h
+++ b/mutt/thread.h
@@ -24,9 +24,8 @@
 #define _MUTT_THREAD_H
 
 #include <stdbool.h>
-#include "mutt.h"
+#include <stdint.h>
 
-struct Context;
 struct Header;
 
 /**

diff --git a/mutt_attach.c b/mutt_attach.c
index 0991ad471abca457c5419f8741dcdc6ab4e2caf3..57f8e36cc7a7317afd9e4908f45b3a07250d491c 100644 (file)
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -25,9 +25,14 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "mutt/mutt.h"
+#include "mutt.h"
 #include "context.h"
 #include "copy.h"
 #include "filter.h"
@@ -37,6 +42,7 @@
 #include "mutt_curses.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
+#include "options.h"
 #include "pager.h"
 #include "protos.h"
 #include "rfc1524.h"

diff --git a/mutt_attach.h b/mutt_attach.h
index 6910582c5bcfa3198d779f92ed76bca43e810684..24f4ccbdfae95d4fdbfc3900a1fedc13d06702d8 100644 (file)
--- a/mutt_attach.h
+++ b/mutt_attach.h
@@ -25,11 +25,10 @@
 #ifndef _MUTT_ATTACH2_H
 #define _MUTT_ATTACH2_H
 
-#include "config.h"
 #include <stdbool.h>
 #include <stdio.h>
-#include "mutt/mutt.h"
 
+struct AttachCtx;
 struct Menu;
 struct Header;
 struct Body;

diff --git a/mutt_body.c b/mutt_body.c
index 58d6a14cc350c4c502a08b969f17a070bd09a67c..f3a5cd7b5e3ae6f5d8a8f0c2a57f6046441d5d82 100644 (file)
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -28,8 +28,10 @@
 
 #include "config.h"
 #include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include "mutt/mutt.h"
 #include "protos.h"
 
 /**

diff --git a/mutt_curses.h b/mutt_curses.h
index 6e9f96047e5f9a357f525e47de071b01321c6e83..edec65212b37f9df24b4cdbcbda776ea7a1c86eb 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -67,9 +67,9 @@
 
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif HAVE_NCURSES_NCURSES_H
+#elif defined(HAVE_NCURSES_NCURSES_H)
 #include <ncurses/ncurses.h>
-#elif HAVE_NCURSES_H
+#elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
 #else
 #include <curses.h>

diff --git a/mutt_header.c b/mutt_header.c
index 2910efe6507f89341a4820b01c4a7633bbedc866..06b9bc989672c3520bc29db4b42f3560968ccb8d 100644 (file)
--- a/mutt_header.c
+++ b/mutt_header.c
@@ -28,10 +28,12 @@
 #include <sys/stat.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "mutt.h"
 #include "alias.h"
 #include "context.h"
 #include "globals.h"
 #include "ncrypt/ncrypt.h"
+#include "options.h"
 #include "protos.h"
 
 static void label_ref_dec(struct Context *ctx, char *label)

diff --git a/mutt_header.h b/mutt_header.h
index ab2173552f16e951cb010707daa7a4815894bf3e..58e61059dc14627fb34dfffe315eb86be657eb41 100644 (file)
--- a/mutt_header.h
+++ b/mutt_header.h
@@ -20,11 +20,18 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_HEADER_H
-#define _MUTT_HEADER_H
+#ifndef _MUTT_HEADER2_H
+#define _MUTT_HEADER2_H
 
 #include <stddef.h>
-#include <stdbool.h>
-#include <time.h>
 
-#endif /* _MUTT_HEADER_H */
+struct Context;
+struct Header;
+
+void mutt_edit_headers(const char *editor, const char *body, struct Header *msg, char *fcc, size_t fcclen);
+void mutt_label_hash_add(struct Context *ctx, struct Header *hdr);
+void mutt_label_hash_remove(struct Context *ctx, struct Header *hdr);
+int  mutt_label_message(struct Header *hdr);
+void mutt_make_label_hash(struct Context *ctx);
+
+#endif /* _MUTT_HEADER2_H */

diff --git a/mutt_logging.c b/mutt_logging.c
index d31fa5711076c3d0ff33904a9cdccee36df820bc..7e1b8f20fcbd42d9f4b770e185d070040d5cb2b4 100644 (file)
--- a/mutt_logging.c
+++ b/mutt_logging.c
@@ -28,15 +28,19 @@
 
 #include "config.h"
 #include <errno.h>
+#include <limits.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "mutt.h"
 #include "globals.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
+#include "options.h"
 #include "protos.h"
 
 struct timeval LastError = { 0 };

diff --git a/mutt_logging.h b/mutt_logging.h
index a59fff3b98d2938a3ae4b00462180ac9288e20c1..e8901647a4e535742f64549bbd4815ec0553933f 100644 (file)
--- a/mutt_logging.h
+++ b/mutt_logging.h
@@ -23,6 +23,7 @@
 #ifndef _LOGGING2_H
 #define _LOGGING2_H
 
+#include <stdbool.h>
 #include <time.h>
 
 extern short DebugLevel;

diff --git a/mutt_lua.c b/mutt_lua.c
index a40d84c3de384191b29353fbd8ab5b8ece425e0f..a551145c666f35c91c320980e0dd8929f72b1a15 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -28,16 +28,13 @@
 #include <lualib.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "mutt_lua.h"
-#include "globals.h"
 #include "mailbox.h"
 #include "mbtable.h"
 #include "mutt_commands.h"
 #include "mutt_options.h"
-#include "options.h"
 #include "protos.h"
 
 static int handle_panic(lua_State *l)

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index 6075bbc0c3846be981101da9b44ec2db97efdd68..c3cd90dd8b93af8b3752d47af31ebcad479bae58 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -44,7 +44,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
@@ -54,7 +53,6 @@
 #include "context.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_thread.h"
 #include "mx.h"
 #include "progress.h"

diff --git a/mutt_options.h b/mutt_options.h
index 05209caf2328cf6de9990b68f88e61ca76b48f94..8268650ed8fd19ce6d4ca4c01e09ff5a5343dc75 100644 (file)
--- a/mutt_options.h
+++ b/mutt_options.h
@@ -25,6 +25,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 struct Buffer;
 

diff --git a/mutt_socket.h b/mutt_socket.h
index 7adfd3541779978266ea0f463265c9b813ed7c72..42d11015660369a71e7305948980d1b259bc28df 100644 (file)
--- a/mutt_socket.h
+++ b/mutt_socket.h
@@ -23,9 +23,6 @@
 #ifndef _MUTT_SOCKET_H
 #define _MUTT_SOCKET_H
 
-#include "mutt/mutt.h"
-#include "conn/conn.h"
-
 struct Account;
 struct Connection;
 

diff --git a/mutt_thread.c b/mutt_thread.c
index 97827e1d56ea98ac1e0ede35040c3d583150e429..8f00393006326f178a4b7d6b91232399c7219e49 100644 (file)
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include <limits.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,7 +31,6 @@
 #include "mutt.h"
 #include "mutt_thread.h"
 #include "context.h"
-#include "globals.h"
 #include "options.h"
 #include "protos.h"
 #include "sort.h"

diff --git a/mutt_thread.h b/mutt_thread.h
index 8e982fb8829bbb3fd46ffd8452d8550cf6384e84..a032a9ae77a91ccf01155b696238d995386422ae 100644 (file)
--- a/mutt_thread.h
+++ b/mutt_thread.h
@@ -23,9 +23,12 @@
 #ifndef _MUTT_THREAD2_H
 #define _MUTT_THREAD2_H
 
-#include <stdbool.h>
 #include "mutt.h"
 
+struct Context;
+struct Header;
+struct MuttThread;
+
 int mutt_aside_thread(struct Header *hdr, short dir, short subthreads);
 #define mutt_next_thread(x)        mutt_aside_thread(x, 1, 0)
 #define mutt_previous_thread(x)    mutt_aside_thread(x, 0, 0)

diff --git a/muttlib.c b/muttlib.c
index 5d3e439a627074a0b9afd8848b812ed0e32c1211..39cbcd167f22bc12c33f373402459ed34831bd56 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -29,18 +29,14 @@
 #include <limits.h>
 #include <pwd.h>
 #include <regex.h>
-#include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <time.h>
 #include <unistd.h>
-#include <utime.h>
-#include <wchar.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"
 #include "filter.h"

diff --git a/mx.c b/mx.c
index b0fcfc00a2191084debcb36d2fb9fad64ad5fc3e..8986fbc139463cc934ec26cd8f281fd689f04657 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -30,6 +30,7 @@
 #include "config.h"
 #include <errno.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -45,6 +46,7 @@
 #include "globals.h"
 #include "keymap.h"
 #include "mailbox.h"
+#include "mutt_header.h"
 #include "mutt_thread.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
@@ -71,6 +73,9 @@
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 /**
  * mx_get_ops - Get mailbox operations

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 3f89cf49f288a08c85aa593ac28861e659a8d255..29c107f55a99881baa985b504d148dded3ec75cb 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -66,6 +66,9 @@
 #include "protos.h"
 #include "sort.h"
 #include "state.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 /* Values used for comparing addresses. */
 #define CRYPT_KV_VALID 1

diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index 3a8f839c7037d43c11cca66d9f845459ecb4b3e6..195b1fa6addf7b2850cedf3abcaf32563d65c445 100644 (file)
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -35,18 +35,14 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "crypt_mod.h"
-#include "globals.h"
 #include "ncrypt.h"
 #include "options.h"
 #include "protos.h"
 
-struct Address;
-struct Body;
-struct Envelope;
-struct Header;
 struct State;
 
 #ifdef CRYPT_BACKEND_CLASSIC_PGP

diff --git a/ncrypt/cryptglue.h b/ncrypt/cryptglue.h
index f44cb4f11be29e637f6e9b0dcde9763927779d1d..611263eeac11fe602f4ca74c28f4e198e0907862 100644 (file)
--- a/ncrypt/cryptglue.h
+++ b/ncrypt/cryptglue.h
@@ -23,6 +23,8 @@
 #ifndef _NCRYPT_CRYPTGLUE_H
 #define _NCRYPT_CRYPTGLUE_H
 
+#include <stdbool.h>
+
 struct Address;
 struct Body;
 struct State;

diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index e87b1d8c396f520fe99b260b99d43a936f5a306a..d00d3c687385ed36d1a478a3fb1c92c59dc1033d 100644 (file)
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -36,20 +36,18 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <iconv.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "filter.h"
-#include "globals.h"
 #include "ncrypt.h"
 #include "options.h"
 #include "pgpinvoke.h"
 #include "pgpkey.h"
 #include "pgplib.h"
-#include "protos.h"
 
 /****************
  * Read the GNUPG keys.  For now we read the complete keyring by

diff --git a/ncrypt/pgp.h b/ncrypt/pgp.h
index 6829f1e15565d97e2331fc4a30d80d17e469dc0e..e141941b87034dee42e93b2b4f1321199aacea54 100644 (file)
--- a/ncrypt/pgp.h
+++ b/ncrypt/pgp.h
@@ -29,8 +29,6 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <unistd.h>
-#include "ncrypt.h"
 
 struct Address;
 struct Body;

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 4f73290c5d4cbfe036424e0eaac8f34b42e0243d..23fbc02f0adc368b06f8fa9e6de6def4df79cad6 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #include <fcntl.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/ncrypt/pgpinvoke.h b/ncrypt/pgpinvoke.h
index 2b3a6e46157bbf403967e14fce3c17024f52df36..cfde0477f28035bdbaaaf6a45ba31e7bca0fe844 100644 (file)
--- a/ncrypt/pgpinvoke.h
+++ b/ncrypt/pgpinvoke.h
@@ -23,6 +23,7 @@
 #ifndef _NCRYPT_PGPINVOKE_H
 #define _NCRYPT_PGPINVOKE_H
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <unistd.h>
 #include "pgpkey.h"

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 4841417e19a488972a4e3ff5ff45885e69550d11..65445f00215edcdbf5732264d74ee7ed8f6b2c06 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -47,7 +47,6 @@
 #include "globals.h"
 #include "gnupgparse.h"
 #include "keymap.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "ncrypt.h"

diff --git a/ncrypt/pgpkey.h b/ncrypt/pgpkey.h
index bcdcfa8f9a1643fa620bacb3d6e2a152f68fd569..ee50180cde1b359bc82893ccff68658da827bc3e 100644 (file)
--- a/ncrypt/pgpkey.h
+++ b/ncrypt/pgpkey.h
@@ -23,9 +23,9 @@
 #ifndef _NCRYPT_PGPKEY_H
 #define _NCRYPT_PGPKEY_H
 
+#include <stdbool.h>
+
 struct Address;
-struct Body;
-struct PgpKeyInfo;
 
 /**
  * enum PgpRing - PGP ring type

diff --git a/ncrypt/pgpmicalg.c b/ncrypt/pgpmicalg.c
index a1dbfb6e961ea0d84c3ccfa087065192dfaa6c8b..978c68d7461ad02411209f3ed7b69614d556d663 100644 (file)
--- a/ncrypt/pgpmicalg.c
+++ b/ncrypt/pgpmicalg.c
@@ -29,15 +29,12 @@
 #include "config.h"
 #include <ctype.h>
 #include <iconv.h>
-#include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "handler.h"
 #include "pgppacket.h"
-#include "protos.h"
 #include "state.h"
 
 static const struct

diff --git a/ncrypt/smime.h b/ncrypt/smime.h
index ac48863e80b363a41b20ee3187ee120869cb55f9..e3d53ac299365dcc0bd2c49c8b5abea64ba45af4 100644 (file)
--- a/ncrypt/smime.h
+++ b/ncrypt/smime.h
@@ -26,6 +26,7 @@
 
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
 
+#include <stdbool.h>
 #include <stdio.h>
 
 struct Address;

diff --git a/newsrc.c b/newsrc.c
index a4e9e3f908e3405702534a6b9fc5725f11c08666..8c4393feaf67a1d958ead920ead1347edbaad263 100644 (file)
--- a/newsrc.c
+++ b/newsrc.c
@@ -46,7 +46,6 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "mutt_account.h"
-#include "mutt_curses.h"
 #include "mutt_socket.h"
 #include "mutt_window.h"
 #include "mx.h"

diff --git a/nntp.c b/nntp.c
index c0df76533fa428aeaa3357228f8ff7d584e8a7a9..d76bd126584678631347c816e7176c0a9d7e2c74 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #include <ctype.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
@@ -43,7 +44,6 @@
 #include "globals.h"
 #include "mailbox.h"
 #include "mutt_account.h"
-#include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "mutt_thread.h"

diff --git a/opcodes.h b/opcodes.h
index cf54cd8401c5c33f906db29c2eab18d50d046edc..b54af585446c95a5b152db32de1fc18067b0d4fc 100644 (file)
--- a/opcodes.h
+++ b/opcodes.h
@@ -23,8 +23,6 @@
 #ifndef _MUTT_OPCODES_H
 #define _MUTT_OPCODES_H
 
-#include "config.h"
-
 // clang-format off
 #define OPS_CORE(_fmt) \
   _fmt(OP_NULL,                           N_("null operation")) \

diff --git a/pager.c b/pager.c
index 8ed1dc8dae457864f1d8af6cc355b9baa1d71aae..caea8024be81345414b29fbda9611f8afa8034d4 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -43,6 +42,7 @@
 #include "mailbox.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
+#include "mutt_header.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "mx.h"
@@ -59,6 +59,9 @@
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
 

diff --git a/pattern.c b/pattern.c
index 75bbf3ae69d642967a04f2683a7d41ca77df99ec..08b5100d1264016289c84c36a89fde06d28b4168 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include <stddef.h>
 #include <ctype.h>
-#include <limits.h>
 #include <regex.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -32,7 +31,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
-#include <unistd.h>
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
@@ -43,7 +41,6 @@
 #include "group.h"
 #include "handler.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
@@ -55,9 +52,6 @@
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
-#ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
-#endif
 
 // clang-format off
 /* The regexes in a modern format */

diff --git a/pop.c b/pop.c
index ac87aa7d7ee7271f3b39ba807f5ab3532f3d453a..74d16f601f56a22f315c2192d4e6bc1c9b10d106 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -30,6 +30,7 @@
 #include "config.h"
 #include <errno.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -43,7 +44,7 @@
 #include "globals.h"
 #include "mailbox.h"
 #include "mutt_account.h"
-#include "mutt_curses.h"
+#include "mutt_header.h"
 #include "mutt_socket.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
@@ -54,6 +55,9 @@
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 #ifdef USE_HCACHE
 #define HC_FNAME "neomutt" /* filename for hcache as POP lacks paths */

diff --git a/pop_auth.c b/pop_auth.c
index 4f4a5e93c4e232fc2d6bfc3b9dade5cf6061fbb0..7f79543e01a5ca0d02c5e298781542ede3a3315a 100644 (file)
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -32,14 +32,12 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "conn/conn.h"
-#include "mutt.h"
 #include "globals.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "mutt_socket.h"
 #include "options.h"
 #include "pop.h"
-#include "protos.h"
 #ifdef USE_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>

diff --git a/protos.h b/protos.h
index bab60061015f0e19ab7fc73fd7eae2168eca62dd..346d318f2bb0dadb5118427e94d20b657ddeb396 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -33,24 +33,19 @@
 #include <time.h>
 #include <wctype.h>
 #include "mutt.h"
-#include "mutt/mutt.h"
 #include "format_flags.h"
-#include "options.h"
 
 struct Address;
 struct Alias;
 struct AliasList;
 struct Body;
 struct Buffer;
-struct ColorLineHead;
 struct Context;
 struct EnterState;
 struct Envelope;
 struct Header;
 struct ListHead;
-struct Parameter;
-struct RegexList;
-struct State;
+struct ParameterList;
 
 struct stat;
 struct passwd;
@@ -155,12 +150,6 @@ void mutt_display_address(struct Envelope *env);
 void mutt_draw_statusline(int cols, const char *buf, size_t buflen);
 int mutt_edit_content_type (struct Header *h, struct Body *b, FILE *fp);
 void mutt_edit_file(const char *editor, const char *data);
-void mutt_edit_headers(const char *editor, const char *body, struct Header *msg,
-                       char *fcc, size_t fcclen);
-int mutt_label_message(struct Header *hdr);
-void mutt_make_label_hash(struct Context *ctx);
-void mutt_label_hash_add(struct Context *ctx, struct Header *hdr);
-void mutt_label_hash_remove(struct Context *ctx, struct Header *hdr);
 int mutt_label_complete(char *buf, size_t buflen, int numtabs);
 void mutt_encode_descriptions(struct Body *b, short recurse);
 void mutt_encode_path(char *dest, size_t dlen, const char *src);

diff --git a/query.c b/query.c
index 4699ae32bd0315240892de1702b937ed41059471..d874ff0fe96d4ce2f76b3d5ac9f875b213dc8b8c 100644 (file)
--- a/query.c
+++ b/query.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -34,7 +33,6 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "keymap.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "opcodes.h"

diff --git a/recvattach.c b/recvattach.c
index ef1f424b3f539f9de80063d5f110652de25d2b65..5e0087872eb9a73bcfc1229361f6ef9710a8d495 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -49,6 +49,9 @@
 #include "recvcmd.h"
 #include "rfc1524.h"
 #include "state.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 static void mutt_update_recvattach_menu(struct AttachCtx *actx, struct Menu *menu, bool init);
 

diff --git a/recvattach.h b/recvattach.h
index 62a84c03637d1eca45c96b24303d2dbcdf63b36f..7317d29ece85b28c29a5a2b47ca1aa545627e7a0 100644 (file)
--- a/recvattach.h
+++ b/recvattach.h
@@ -24,6 +24,8 @@
 #ifndef _MUTT_RECVATTACH_H
 #define _MUTT_RECVATTACH_H
 
+struct AttachCtx;
+
 void mutt_attach_init(struct AttachCtx *actx);
 void mutt_update_tree(struct AttachCtx *actx);
 

diff --git a/recvcmd.c b/recvcmd.c
index 5d1d6500456a3279e785b55c5f8da48837c043ff..f7d11485393cb6552de88e1f1161af6f1a849838 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -32,11 +32,13 @@
 #include "globals.h"
 #include "handler.h"
 #include "mutt_body.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "options.h"
 #include "protos.h"
 #include "state.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 /**
  * check_msg - Are we working with an RFC822 message

diff --git a/recvcmd.h b/recvcmd.h
index 55e459ee4d39b4c02e06203fcf275f225077fe78..bb846222cc1e93f55d9eccea38131c6f963963a2 100644 (file)
--- a/recvcmd.h
+++ b/recvcmd.h
@@ -23,6 +23,12 @@
 #ifndef _MUTT_RECVCMD_H
 #define _MUTT_RECVCMD_H
 
+#include <stdio.h>
+
+struct AttachCtx;
+struct Body;
+struct Header;
+
 void mutt_attach_bounce(FILE *fp, struct AttachCtx *actx, struct Body *cur);
 void mutt_attach_resend(FILE *fp, struct AttachCtx *actx, struct Body *cur);
 void mutt_attach_forward(FILE *fp, struct Header *hdr, struct AttachCtx *actx, struct Body *cur, int flags);

diff --git a/remailer.c b/remailer.c
index dbae0c4e19e0c3efafb494ffd31f3aa35e8e8a4c..a03d26b8bb27cdabbe8e390c97ed84a14807d57f 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include <fcntl.h>
-#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +32,6 @@
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"
-#include "handler.h"
 #include "keymap.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"

diff --git a/resize.c b/resize.c
index 48b782834e23f528842d43a4d0bdd9eceab0e9d5..005fbe3aa209ada70cc884ca9c4fc0a44d2772e7 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 #include <fcntl.h>
-#include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
 #include "mutt/mutt.h"

diff --git a/rfc1524.c b/rfc1524.c
index 551d6e518cf282304a0bd46f94fad694484eeedb..20b977b76fdeb918e45161539299f8a425592663 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -34,6 +34,7 @@
 
 #include "config.h"
 #include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"

diff --git a/rfc2047.c b/rfc2047.c
index 3ba9200d9c7dd6591dd89e4d5b6900cce653de72..1cb2c7866266aea907d0cb8a1fc1672a23ab6b19 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -22,9 +22,7 @@
  */
 
 #include "config.h"
-#include "mutt/address.h"
-#include "mutt/charset.h"
-#include "mutt/rfc2047.h"
+#include "mutt/mutt.h"
 #include "globals.h"
 
 #include <string.h>

diff --git a/rfc2047.h b/rfc2047.h
index 0dc8506f34d2fc69825db6a8cd9c9937c98d4258..c396f8284621f3ba3b2786a4b2109b3ce1f2968e 100644 (file)
--- a/rfc2047.h
+++ b/rfc2047.h
@@ -23,8 +23,6 @@
 #ifndef _MUTT_RFC2047_2_H
 #define _MUTT_RFC2047_2_H
 
-#include <stddef.h>
-
 struct Address;
 
 void rfc2047_encode_addrlist(struct Address *addr, const char *tag);

diff --git a/rfc3676.c b/rfc3676.c
index 47f7243179936ad3f446b4a215397c746192ab1d..36cad7371fcbd7d054fe37c3b40be74d220cd74a 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "globals.h"
-#include "mutt_curses.h"
 #include "mutt_window.h"
 #include "options.h"
 #include "protos.h"

diff --git a/safe_asprintf.c b/safe_asprintf.c
index 608c1ffc23eaf016dbd2fe8768b7ed00b873ec2d..ee5bcbb9b53e4d6862105e6b6851bf3b07cccf90 100644 (file)
--- a/safe_asprintf.c
+++ b/safe_asprintf.c
@@ -31,8 +31,6 @@
  */
 
 #include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include "config.h"
 #include "mutt/mutt.h"
 

diff --git a/score.c b/score.c
index 007872cc5a787705318b5bd636639579e4494314..3072a1e2f3abfbb9bb2d3cd71ee45f937bab87ea 100644 (file)
--- a/score.c
+++ b/score.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "context.h"

diff --git a/send.c b/send.c
index 880f4868e55ad507c8db119f655fe3c50a7dce86..a7b0693aa752983651a66b28c4315dc480e6c24f 100644 (file)
--- a/send.c
+++ b/send.c
@@ -39,12 +39,11 @@
 #include "filter.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "mutt_curses.h"
+#include "mutt_header.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pattern.h"
 #include "protos.h"
-#include "rfc2047.h"
 #include "rfc3676.h"
 #include "sort.h"
 #include "url.h"

diff --git a/smtp.c b/smtp.c
index 03566ad5d0aa04ea402c88a8d1d80143e6f7ed68..db484cd85dd827338f51ce75431b974d5bca9347 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -36,7 +36,6 @@
 #include "mutt.h"
 #include "globals.h"
 #include "mutt_account.h"
-#include "mutt_curses.h"
 #include "mutt_socket.h"
 #include "options.h"
 #include "progress.h"

diff --git a/sort.h b/sort.h
index b6023c820371fd2b565742e13669463bcabf6f3a..d2c4b9094bf6cbab60f9a3f3874a4fe73d04f1f4 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -26,7 +26,6 @@
 #include "where.h"
 #include "mutt/mutt.h"
 
-struct Address;
 struct Context;
 
 #define SORT_DATE     1 /**< the date the mail was sent. */

diff --git a/state.h b/state.h
index 87c48e66fb053f4c2ce1c1c0aee9c5f7ee66a3a7..aae64b38d062d6da9fafd568f2e0c51ee52b156d 100644 (file)
--- a/state.h
+++ b/state.h
@@ -24,7 +24,6 @@
 #define _MUTT_STATE_H
 
 #include <stdio.h>
-#include <stddef.h>
 
 /**
  * struct State - Keep track when processing files

diff --git a/status.c b/status.c
index bc55cd775d6395c2f69c1f8c34a72245d66af630..6fb2f8a1e9296493f4784f7840f99cef890b849a 100644 (file)
--- a/status.c
+++ b/status.c
@@ -27,14 +27,12 @@
  */
 
 #include "config.h"
-#include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "context.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "mbtable.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "mx.h"

diff --git a/url.h b/url.h
index 5ebb71f81806c8f87ced3ea2cc6bcfc2666d9470..3c43bcd5a38d18cb1762143413e99e177adf021f 100644 (file)
--- a/url.h
+++ b/url.h
@@ -24,8 +24,6 @@
 #include <stddef.h>
 #include "mutt/mutt.h"
 
-struct Envelope;
-
 /**
  * enum UrlScheme - All recognised Url types
  */