From: Richard Russon Date: Thu, 5 Jul 2018 19:21:46 +0000 (+0100) Subject: iwyu X-Git-Tag: 2019-10-25~760 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fb132eafc3a31d5e107cf159bc017d3adc77f84;p=neomutt iwyu --- diff --git a/addrbook.c b/addrbook.c index 88a0904c6..8c3665327 100644 --- 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 d51ee4c40..cec700515 100644 --- a/alias.c +++ b/alias.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/alias.h b/alias.h index d44bb318f..49f789f4a 100644 --- a/alias.h +++ b/alias.h @@ -26,9 +26,6 @@ #include #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 e6b11c137..63d3b7a4c 100644 --- a/bcache.c +++ b/bcache.c @@ -30,7 +30,6 @@ #include #include #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 a929e5dfd..c31a5c21b 100644 --- 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 9378fd294..7fa162ae3 100644 --- a/buffy.c +++ b/buffy.c @@ -24,18 +24,16 @@ #include "config.h" #include #include +#include #include -#include #include #include #include #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 98639cbb5..9127fd1dc 100644 --- a/commands.c +++ b/commands.c @@ -56,6 +56,9 @@ #ifdef USE_NOTMUCH #include "mutt_notmuch.h" #endif +#ifdef ENABLE_NLS +#include +#endif static const char *ExtPagerProgress = "all"; diff --git a/complete.c b/complete.c index 7cfd1d518..6e2b44fc2 100644 --- a/complete.c +++ b/complete.c @@ -33,7 +33,6 @@ #include #include #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 8126479e8..d7e9a618e 100644 --- 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 +#endif #ifdef MIXMASTER #include "remailer.h" #endif diff --git a/compress.c b/compress.c index d237d195a..55462f3cd 100644 --- a/compress.c +++ b/compress.c @@ -29,6 +29,7 @@ #include "config.h" #include +#include #include #include #include @@ -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 821e46c2f..11773ec23 100644 --- 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 b70f00289..5374111e0 100644 --- 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 2d4a48c20..f64739c52 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -29,12 +29,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include diff --git a/curs_main.c b/curs_main.c index e81a15e90..07182e53c 100644 --- a/curs_main.c +++ b/curs_main.c @@ -23,10 +23,10 @@ #include "config.h" #include #include +#include #include #include #include -#include #include #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 +#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 4f2855947..af7db8ea4 100644 --- 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 3c11d24da..269e5e0f2 100644 --- a/enriched.c +++ b/enriched.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include "mutt/mutt.h" diff --git a/filter.c b/filter.c index 422b2588a..697b94dae 100644 --- 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 25d462094..257a8b76a 100644 --- a/functions.h +++ b/functions.h @@ -37,7 +37,6 @@ */ #ifdef _MAKEDOC -#include "config.h" #include "doc/makedoc_defs.h" #else #include diff --git a/globals.h b/globals.h index ef60480dc..9021c3ed2 100644 --- a/globals.h +++ b/globals.h @@ -24,6 +24,7 @@ #define _MUTT_GLOBALS_H #include +#include #include "mutt/mutt.h" #include "where.h" diff --git a/group.c b/group.c index 59f107132..931285c6a 100644 --- a/group.c +++ b/group.c @@ -23,6 +23,7 @@ #include "config.h" #include +#include #include "mutt/mutt.h" #include "group.h" #include "globals.h" diff --git a/hcache/bdb.c b/hcache/bdb.c index c8bcdb152..105cf129b 100644 --- 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 fd237be38..f55917f9f 100644 --- a/hcache/hcache.c +++ b/hcache/hcache.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/hcache/hcache.h b/hcache/hcache.h index 260950944..3ddf39562 100644 --- a/hcache/hcache.h +++ b/hcache/hcache.h @@ -46,6 +46,7 @@ #ifndef _MUTT_HCACHE_H #define _MUTT_HCACHE_H +#include #include struct Header; diff --git a/hcache/qdbm.c b/hcache/qdbm.c index 95a4ead1b..462c51a1e 100644 --- a/hcache/qdbm.c +++ b/hcache/qdbm.c @@ -32,6 +32,7 @@ #include "config.h" #include #include +#include #include #include "mutt/mutt.h" #include "backend.h" diff --git a/help.c b/help.c index 509994954..9c42ed402 100644 --- 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 ef1a139fd..06e6f02ac 100644 --- a/history.c +++ b/history.c @@ -70,19 +70,19 @@ #include "config.h" #include +#include #include #include #include #include #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 aa18a63c0..1ee004400 100644 --- a/history.h +++ b/history.h @@ -24,6 +24,7 @@ #define _MUTT_HISTORY_H #include +#include extern short History; extern char *HistoryFile; diff --git a/imap/auth.c b/imap/auth.c index 53f4016e6..e69032297 100644 --- 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 6fa193547..eb9f90f1c 100644 --- 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 c33b05f8c..508d5821d 100644 --- 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 d5ff2f122..298e00061 100644 --- 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 #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE diff --git a/imap/auth_login.c b/imap/auth_login.c index 0f4445b45..0790dd145 100644 --- 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 da2a9994b..6813a1c87 100644 --- 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 b300581bd..2c896f91e 100644 --- a/imap/auth_sasl.c +++ b/imap/auth_sasl.c @@ -30,17 +30,16 @@ #include #include #include +#include #include #include #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 f0c200abb..e071c765b 100644 --- a/imap/browse.c +++ b/imap/browse.c @@ -28,19 +28,20 @@ */ #include "config.h" +#include #include #include #include #include #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 7eb42e2c4..26ee5fe44 100644 --- a/imap/command.c +++ b/imap/command.c @@ -31,6 +31,7 @@ #include "config.h" #include #include +#include #include #include #include diff --git a/imap/imap.c b/imap/imap.c index 839583cb4..ce58cbda2 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -29,7 +29,6 @@ */ #include "config.h" -#include #include #include #include @@ -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 +#endif /** * check_capabilities - Make sure we can log in to this server diff --git a/imap/imap.h b/imap/imap.h index eb78684d4..fe58aa8b2 100644 --- 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 #include #include +#include "mx.h" struct BrowserState; struct Context; struct Header; -struct Message; struct Pattern; /** diff --git a/imap/message.c b/imap/message.c index 10ce5a837..4b1a55a5b 100644 --- a/imap/message.c +++ b/imap/message.c @@ -30,8 +30,8 @@ #include "config.h" #include #include +#include #include -#include #include #include #include "imap_private.h" @@ -54,6 +54,9 @@ #ifdef USE_HCACHE #include "hcache/hcache.h" #endif +#ifdef ENABLE_NLS +#include +#endif struct BodyCache; diff --git a/imap/utf7.c b/imap/utf7.c index 3a38c68e7..cb5f04e79 100644 --- a/imap/utf7.c +++ b/imap/utf7.c @@ -27,10 +27,10 @@ */ #include "config.h" +#include #include #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 d73ddf757..0bd6d7bba 100644 --- a/imap/util.c +++ b/imap/util.c @@ -31,12 +31,12 @@ #include "config.h" #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -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 298113d65..ede2c24e4 100644 --- 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 +#endif #define CHECK_PAGER \ if ((CurrentMenu == MENU_PAGER) && (idx >= 0) && (MuttVars[idx].flags & R_RESORT)) \ diff --git a/init.h b/init.h index 521ba2557..9d52b2325 100644 --- 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 +#include #include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" diff --git a/main.c b/main.c index 410708c85..1e2a7987c 100644 --- 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 d8ccaa5cb..52c44e1c0 100644 --- 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 6c248b206..8df9329ee 100644 --- 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 7dca50e21..98a71321b 100644 --- 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 d55e9f658..48a74aa46 100644 --- a/mutt.h +++ b/mutt.h @@ -28,7 +28,6 @@ #include #include #include -#include #include "where.h" struct ListHead; diff --git a/mutt/address.c b/mutt/address.c index 12f23e5cb..140557217 100644 --- a/mutt/address.c +++ b/mutt/address.c @@ -28,6 +28,7 @@ */ #include "config.h" +#include #include #include #include "address.h" diff --git a/mutt/attach.c b/mutt/attach.c index 5f697e601..722dbc7ee 100644 --- a/mutt/attach.c +++ b/mutt/attach.c @@ -28,12 +28,6 @@ */ #include "config.h" -#include -#include -#include -#include -#include -#include #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 42c5e0446..9132ad4f1 100644 --- a/mutt/attach.h +++ b/mutt/attach.h @@ -26,7 +26,6 @@ #include #include -struct Header; struct Body; /** diff --git a/mutt/body.c b/mutt/body.c index 083266be0..ae7ddcfdb 100644 --- a/mutt/body.c +++ b/mutt/body.c @@ -27,14 +27,15 @@ */ #include "config.h" -#include -#include +#include #include #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 b46c1ca6c..994b1e23e 100644 --- a/mutt/body.h +++ b/mutt/body.h @@ -24,7 +24,6 @@ #define _MUTT_BODY_H #include -#include #include #include "parameter.h" diff --git a/mutt/buffer.c b/mutt/buffer.c index 51ca49e64..aca896161 100644 --- a/mutt/buffer.c +++ b/mutt/buffer.c @@ -29,6 +29,7 @@ #include "config.h" #include +#include #include #include #include "buffer.h" diff --git a/mutt/date.c b/mutt/date.c index f6ab10834..002f5200e 100644 --- a/mutt/date.c +++ b/mutt/date.c @@ -28,6 +28,7 @@ #include "config.h" #include +#include #include #include #include diff --git a/mutt/file.h b/mutt/file.h index 1bb6589d1..12e27d158 100644 --- a/mutt/file.h +++ b/mutt/file.h @@ -23,6 +23,7 @@ #ifndef _MUTT_FILE_H #define _MUTT_FILE_H +#include #include #include #include diff --git a/mutt/hash.c b/mutt/hash.c index 19a99cb60..2fc43b266 100644 --- a/mutt/hash.c +++ b/mutt/hash.c @@ -28,6 +28,7 @@ */ #include "config.h" +#include #include #include #include "hash.h" diff --git a/mutt/hash.h b/mutt/hash.h index 4c50af2dc..28d8bfd96 100644 --- a/mutt/hash.h +++ b/mutt/hash.h @@ -26,6 +26,7 @@ #include #include +#include /** * union HashKey - The data item stored in a HashElem diff --git a/mutt/header.c b/mutt/header.c index 8cd047367..e9423516a 100644 --- a/mutt/header.c +++ b/mutt/header.c @@ -27,20 +27,14 @@ */ #include "config.h" -#include #include -#include -#include -#include -#include #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 31029c156..3f6515d3b 100644 --- a/mutt/header.h +++ b/mutt/header.h @@ -25,6 +25,7 @@ #include #include +#include #include #include "list.h" #include "tags.h" diff --git a/mutt/list.c b/mutt/list.c index 569cc8a85..090f6d0d3 100644 --- a/mutt/list.c +++ b/mutt/list.c @@ -28,9 +28,11 @@ */ #include "config.h" +#include #include #include "list.h" #include "memory.h" +#include "queue.h" #include "string2.h" /** diff --git a/mutt/logging.c b/mutt/logging.c index a9f390839..600365729 100644 --- a/mutt/logging.c +++ b/mutt/logging.c @@ -28,10 +28,9 @@ #include "config.h" #include -#include #include +#include #include -#include #include #include #include diff --git a/mutt/md5.c b/mutt/md5.c index 9b9d2f1d5..313e01899 100644 --- a/mutt/md5.c +++ b/mutt/md5.c @@ -29,7 +29,6 @@ #include "config.h" #include -#include #include #include "md5.h" diff --git a/mutt/memory.c b/mutt/memory.c index e82a59f58..fdec09d78 100644 --- a/mutt/memory.c +++ b/mutt/memory.c @@ -32,7 +32,6 @@ #include "config.h" #include #include -#include #include "memory.h" #include "exit.h" #include "logging.h" diff --git a/mutt/mime.c b/mutt/mime.c index 9bb5f3b40..fb99cb7ce 100644 --- a/mutt/mime.c +++ b/mutt/mime.c @@ -27,10 +27,7 @@ */ #include "config.h" -#include #include "mime.h" -#include "memory.h" -#include "string2.h" // clang-format off /** diff --git a/mutt/mime.h b/mutt/mime.h index b72d030fd..12e2aa1bd 100644 --- a/mutt/mime.h +++ b/mutt/mime.h @@ -23,8 +23,6 @@ #ifndef _MUTT_MIME_H #define _MUTT_MIME_H -#include - /** * enum ContentType - Content-Type */ diff --git a/mutt/parameter.c b/mutt/parameter.c index 4f7d6419e..37466673e 100644 --- a/mutt/parameter.c +++ b/mutt/parameter.c @@ -28,6 +28,7 @@ #include "config.h" #include +#include #include "parameter.h" #include "memory.h" #include "queue.h" diff --git a/mutt/regex3.h b/mutt/regex3.h index 43ad33591..e244ece87 100644 --- a/mutt/regex3.h +++ b/mutt/regex3.h @@ -25,6 +25,7 @@ #include #include +#include struct Buffer; diff --git a/mutt/rfc2047.c b/mutt/rfc2047.c index 550823a01..97c521686 100644 --- a/mutt/rfc2047.c +++ b/mutt/rfc2047.c @@ -31,6 +31,8 @@ #include "config.h" #include #include +#include +#include #include #include #include "rfc2047.h" diff --git a/mutt/thread.c b/mutt/thread.c index 9caeb2529..7d6d12b4f 100644 --- a/mutt/thread.c +++ b/mutt/thread.c @@ -27,12 +27,16 @@ */ #include "config.h" -#include +#include #include #include -#include -#include #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 80122493a..f69e988f2 100644 --- a/mutt/thread.h +++ b/mutt/thread.h @@ -24,9 +24,8 @@ #define _MUTT_THREAD_H #include -#include "mutt.h" +#include -struct Context; struct Header; /** diff --git a/mutt_attach.c b/mutt_attach.c index 0991ad471..57f8e36cc 100644 --- a/mutt_attach.c +++ b/mutt_attach.c @@ -25,9 +25,14 @@ #include #include #include +#include +#include #include +#include #include #include +#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 6910582c5..24f4ccbdf 100644 --- a/mutt_attach.h +++ b/mutt_attach.h @@ -25,11 +25,10 @@ #ifndef _MUTT_ATTACH2_H #define _MUTT_ATTACH2_H -#include "config.h" #include #include -#include "mutt/mutt.h" +struct AttachCtx; struct Menu; struct Header; struct Body; diff --git a/mutt_body.c b/mutt_body.c index 58d6a14cc..f3a5cd7b5 100644 --- a/mutt_body.c +++ b/mutt_body.c @@ -28,8 +28,10 @@ #include "config.h" #include +#include +#include #include -#include +#include "mutt/mutt.h" #include "protos.h" /** diff --git a/mutt_curses.h b/mutt_curses.h index 6e9f96047..edec65212 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -67,9 +67,9 @@ #ifdef HAVE_NCURSESW_NCURSES_H #include -#elif HAVE_NCURSES_NCURSES_H +#elif defined(HAVE_NCURSES_NCURSES_H) #include -#elif HAVE_NCURSES_H +#elif defined(HAVE_NCURSES_H) #include #else #include diff --git a/mutt_header.c b/mutt_header.c index 2910efe65..06b9bc989 100644 --- a/mutt_header.c +++ b/mutt_header.c @@ -28,10 +28,12 @@ #include #include #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 ab2173552..58e61059d 100644 --- a/mutt_header.h +++ b/mutt_header.h @@ -20,11 +20,18 @@ * this program. If not, see . */ -#ifndef _MUTT_HEADER_H -#define _MUTT_HEADER_H +#ifndef _MUTT_HEADER2_H +#define _MUTT_HEADER2_H #include -#include -#include -#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 d31fa5711..7e1b8f20f 100644 --- a/mutt_logging.c +++ b/mutt_logging.c @@ -28,15 +28,19 @@ #include "config.h" #include +#include #include +#include #include #include #include #include #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 a59fff3b9..e8901647a 100644 --- a/mutt_logging.h +++ b/mutt_logging.h @@ -23,6 +23,7 @@ #ifndef _LOGGING2_H #define _LOGGING2_H +#include #include extern short DebugLevel; diff --git a/mutt_lua.c b/mutt_lua.c index a40d84c3d..a551145c6 100644 --- a/mutt_lua.c +++ b/mutt_lua.c @@ -28,16 +28,13 @@ #include #include #include -#include #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 6075bbc0c..c3cd90dd8 100644 --- a/mutt_notmuch.c +++ b/mutt_notmuch.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #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 05209caf2..8268650ed 100644 --- a/mutt_options.h +++ b/mutt_options.h @@ -25,6 +25,7 @@ #include #include +#include struct Buffer; diff --git a/mutt_socket.h b/mutt_socket.h index 7adfd3541..42d110156 100644 --- 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 97827e1d5..8f0039300 100644 --- a/mutt_thread.c +++ b/mutt_thread.c @@ -22,6 +22,7 @@ #include "config.h" #include +#include #include #include #include @@ -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 8e982fb88..a032a9ae7 100644 --- a/mutt_thread.h +++ b/mutt_thread.h @@ -23,9 +23,12 @@ #ifndef _MUTT_THREAD2_H #define _MUTT_THREAD2_H -#include #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 5d3e439a6..39cbcd167 100644 --- a/muttlib.c +++ b/muttlib.c @@ -29,18 +29,14 @@ #include #include #include -#include #include #include #include -#include #include #include -#include #include -#include -#include #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 b0fcfc00a..8986fbc13 100644 --- a/mx.c +++ b/mx.c @@ -30,6 +30,7 @@ #include "config.h" #include #include +#include #include #include #include @@ -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 +#endif /** * mx_get_ops - Get mailbox operations diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index 3f89cf49f..29c107f55 100644 --- 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 +#endif /* Values used for comparing addresses. */ #define CRYPT_KV_VALID 1 diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c index 3a8f839c7..195b1fa6a 100644 --- a/ncrypt/cryptglue.c +++ b/ncrypt/cryptglue.c @@ -35,18 +35,14 @@ */ #include "config.h" +#include #include #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 f44cb4f11..611263eea 100644 --- a/ncrypt/cryptglue.h +++ b/ncrypt/cryptglue.h @@ -23,6 +23,8 @@ #ifndef _NCRYPT_CRYPTGLUE_H #define _NCRYPT_CRYPTGLUE_H +#include + struct Address; struct Body; struct State; diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c index e87b1d8c3..d00d3c687 100644 --- a/ncrypt/gnupgparse.c +++ b/ncrypt/gnupgparse.c @@ -36,20 +36,18 @@ #include #include #include +#include #include #include #include #include #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 6829f1e15..e141941b8 100644 --- a/ncrypt/pgp.h +++ b/ncrypt/pgp.h @@ -29,8 +29,6 @@ #include #include -#include -#include "ncrypt.h" struct Address; struct Body; diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c index 4f73290c5..23fbc02f0 100644 --- a/ncrypt/pgpinvoke.c +++ b/ncrypt/pgpinvoke.c @@ -31,6 +31,7 @@ #include "config.h" #include #include +#include #include #include #include diff --git a/ncrypt/pgpinvoke.h b/ncrypt/pgpinvoke.h index 2b3a6e461..cfde0477f 100644 --- a/ncrypt/pgpinvoke.h +++ b/ncrypt/pgpinvoke.h @@ -23,6 +23,7 @@ #ifndef _NCRYPT_PGPINVOKE_H #define _NCRYPT_PGPINVOKE_H +#include #include #include #include "pgpkey.h" diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c index 4841417e1..65445f002 100644 --- 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 bcdcfa8f9..ee50180cd 100644 --- a/ncrypt/pgpkey.h +++ b/ncrypt/pgpkey.h @@ -23,9 +23,9 @@ #ifndef _NCRYPT_PGPKEY_H #define _NCRYPT_PGPKEY_H +#include + struct Address; -struct Body; -struct PgpKeyInfo; /** * enum PgpRing - PGP ring type diff --git a/ncrypt/pgpmicalg.c b/ncrypt/pgpmicalg.c index a1dbfb6e9..978c68d74 100644 --- a/ncrypt/pgpmicalg.c +++ b/ncrypt/pgpmicalg.c @@ -29,15 +29,12 @@ #include "config.h" #include #include -#include +#include #include #include -#include #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 ac48863e8..e3d53ac29 100644 --- a/ncrypt/smime.h +++ b/ncrypt/smime.h @@ -26,6 +26,7 @@ #ifdef CRYPT_BACKEND_CLASSIC_SMIME +#include #include struct Address; diff --git a/newsrc.c b/newsrc.c index a4e9e3f90..8c4393fea 100644 --- 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 c0df76533..d76bd1265 100644 --- a/nntp.c +++ b/nntp.c @@ -31,6 +31,7 @@ #include "config.h" #include #include +#include #include #include #include @@ -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 cf54cd840..b54af5854 100644 --- 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 8ed1dc8da..caea8024b 100644 --- a/pager.c +++ b/pager.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include #include #include #include @@ -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 +#endif #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) diff --git a/pattern.c b/pattern.c index 75bbf3ae6..08b5100d1 100644 --- a/pattern.c +++ b/pattern.c @@ -23,7 +23,6 @@ #include "config.h" #include #include -#include #include #include #include @@ -32,7 +31,6 @@ #include #include #include -#include #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 ac87aa7d7..74d16f601 100644 --- a/pop.c +++ b/pop.c @@ -30,6 +30,7 @@ #include "config.h" #include #include +#include #include #include #include @@ -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 +#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 4f4a5e93c..7f79543e0 100644 --- a/pop_auth.c +++ b/pop_auth.c @@ -32,14 +32,12 @@ #include #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 #include diff --git a/protos.h b/protos.h index bab600610..346d318f2 100644 --- a/protos.h +++ b/protos.h @@ -33,24 +33,19 @@ #include #include #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 4699ae32b..d874ff0fe 100644 --- a/query.c +++ b/query.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include #include #include #include @@ -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 ef1f424b3..5e0087872 100644 --- a/recvattach.c +++ b/recvattach.c @@ -49,6 +49,9 @@ #include "recvcmd.h" #include "rfc1524.h" #include "state.h" +#ifdef ENABLE_NLS +#include +#endif static void mutt_update_recvattach_menu(struct AttachCtx *actx, struct Menu *menu, bool init); diff --git a/recvattach.h b/recvattach.h index 62a84c036..7317d29ec 100644 --- 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 5d1d65004..f7d114853 100644 --- 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 +#endif /** * check_msg - Are we working with an RFC822 message diff --git a/recvcmd.h b/recvcmd.h index 55e459ee4..bb846222c 100644 --- a/recvcmd.h +++ b/recvcmd.h @@ -23,6 +23,12 @@ #ifndef _MUTT_RECVCMD_H #define _MUTT_RECVCMD_H +#include + +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 dbae0c4e1..a03d26b8b 100644 --- a/remailer.c +++ b/remailer.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include #include @@ -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 48b782834..005fbe3aa 100644 --- a/resize.c +++ b/resize.c @@ -29,7 +29,6 @@ #include "config.h" #include -#include #include #include #include "mutt/mutt.h" diff --git a/rfc1524.c b/rfc1524.c index 551d6e518..20b977b76 100644 --- a/rfc1524.c +++ b/rfc1524.c @@ -34,6 +34,7 @@ #include "config.h" #include +#include #include #include #include "mutt/mutt.h" diff --git a/rfc2047.c b/rfc2047.c index 3ba9200d9..1cb2c7866 100644 --- 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 diff --git a/rfc2047.h b/rfc2047.h index 0dc8506f3..c396f8284 100644 --- a/rfc2047.h +++ b/rfc2047.h @@ -23,8 +23,6 @@ #ifndef _MUTT_RFC2047_2_H #define _MUTT_RFC2047_2_H -#include - struct Address; void rfc2047_encode_addrlist(struct Address *addr, const char *tag); diff --git a/rfc3676.c b/rfc3676.c index 47f724317..36cad7371 100644 --- a/rfc3676.c +++ b/rfc3676.c @@ -31,7 +31,6 @@ #include #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 608c1ffc2..ee5bcbb9b 100644 --- a/safe_asprintf.c +++ b/safe_asprintf.c @@ -31,8 +31,6 @@ */ #include -#include -#include #include "config.h" #include "mutt/mutt.h" diff --git a/score.c b/score.c index 007872cc5..3072a1e2f 100644 --- a/score.c +++ b/score.c @@ -23,7 +23,6 @@ #include "config.h" #include #include -#include #include "mutt/mutt.h" #include "mutt.h" #include "context.h" diff --git a/send.c b/send.c index 880f4868e..a7b0693aa 100644 --- 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 03566ad5d..db484cd85 100644 --- 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 b6023c820..d2c4b9094 100644 --- 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 87c48e66f..aae64b38d 100644 --- a/state.h +++ b/state.h @@ -24,7 +24,6 @@ #define _MUTT_STATE_H #include -#include /** * struct State - Keep track when processing files diff --git a/status.c b/status.c index bc55cd775..6fb2f8a1e 100644 --- a/status.c +++ b/status.c @@ -27,14 +27,12 @@ */ #include "config.h" -#include #include #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 5ebb71f81..3c43bcd5a 100644 --- a/url.h +++ b/url.h @@ -24,8 +24,6 @@ #include #include "mutt/mutt.h" -struct Envelope; - /** * enum UrlScheme - All recognised Url types */