iwyu: remove unnecessary headers

diff --git a/alias.c b/alias.c
index 00ef08ac2768c7f4dbee84d69d3065124f6750bb..61fb75a6c23b755d219bfe2c29f7e2fc5fad4d66 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -38,9 +38,6 @@
 #include "mutt_curses.h"
 #include "options.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 struct Address *mutt_lookup_alias(const char *s)
 {

diff --git a/attach.c b/attach.c
index 191f1d5d6c5c644c5d916bc6b5fb158438abb429..69515289a95e5f221cec2ae17c74e30fd398a1c2 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -40,7 +40,6 @@
 #include "mailbox.h"
 #include "mime.h"
 #include "mutt_curses.h"
-#include "mutt_menu.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"

diff --git a/bcache.c b/bcache.c
index 3eb1bd10dcfc61ce2438e2e4d81fa39108bbddef..719415389ad6a673a8e61c706a7fbfbdc620b009 100644 (file)
--- a/bcache.c
+++ b/bcache.c
@@ -30,6 +30,7 @@
 #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/bcache.h b/bcache.h
index 9913d5a66405bb042b7933e3b67323b94792d565..6626e263f89b633548763e9506177cd9fbe6fc33 100644 (file)
--- a/bcache.h
+++ b/bcache.h
@@ -24,7 +24,6 @@
 #ifndef _MUTT_BCACHE_H
 #define _MUTT_BCACHE_H
 
-#include <stdbool.h>
 #include <stdio.h>
 
 struct Account;

diff --git a/body.c b/body.c
index 7acc19ceb0d238327da94a001316539ab9099335..b25e6421b491d62b526396633e33ca6cd94a8ccd 100644 (file)
--- a/body.c
+++ b/body.c
@@ -24,9 +24,7 @@
 #include <limits.h>
 #include <string.h>
 #include <unistd.h>
-#include "mutt/debug.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "body.h"
 #include "header.h"
 #include "mime.h"

diff --git a/browser.c b/browser.c
index 0aa21a7b21a81eb639c37791adaf078957809684..8b6a3275f4e76bf642010f4f2212ea3290ca6491 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
@@ -49,7 +48,6 @@
 #include "keymap.h"
 #include "mailbox.h"
 #include "mbyte.h"
-#include "mutt_account.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mx.h"
@@ -58,9 +56,6 @@
 #include "protos.h"
 #include "sort.h"
 #include "url.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif

diff --git a/buffy.c b/buffy.c
index c0555837942eab63a0b2c41a810fff8af39257a2..79dfa0fd47b7827e06a276c235da933fd070de73 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
+#include "conn/conn.h"
 #include "buffy.h"
 #include "context.h"
 #include "envelope.h"

diff --git a/commands.c b/commands.c
index b01d92c021abd45231d47772bce78a27d984514e..526bd1d2f7d23ee0754992c62f5533b7a43a5323 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -23,15 +23,14 @@
 
 #include "config.h"
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"
@@ -56,9 +55,6 @@
 #include "parameter.h"
 #include "protos.h"
 #include "sort.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif

diff --git a/complete.c b/complete.c
index 47cda133e5cddbf26c7accb7db2a7325516f7b9f..c9988e4077fa25bd9af79acf235753d196682eb6 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -27,6 +27,7 @@
 #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 c0c85ec5d07990e585c688618533116d710508fb..f68a3f0f8d6fc071ae04d643d1d632c905e8a304 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -53,9 +53,6 @@
 #include "options.h"
 #include "protos.h"
 #include "sort.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef MIXMASTER
 #include "remailer.h"
 #endif
@@ -63,8 +60,6 @@
 #include "nntp.h"
 #endif
 
-struct Address;
-
 static const char *There_are_no_attachments = N_("There are no attachments.");
 
 #define CHECK_COUNT                                                            \

diff --git a/compress.c b/compress.c
index b9a02778045428f0c066c668d6f9ba401b694f52..d96fb7f41b626b4306de38f5551472b7b14b9c5b 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -32,7 +32,6 @@
 #include "compress.h"
 #include "context.h"
 #include "format_flags.h"
-#include "globals.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mx.h"

diff --git a/conn/sasl_plain.c b/conn/sasl_plain.c
index a50d7bf6cdf953580929a14407adc6d2686fc603..e349eb4cfc07f1465a2d027feb69caeed54b354e 100644 (file)
--- a/conn/sasl_plain.c
+++ b/conn/sasl_plain.c
@@ -32,8 +32,7 @@
 
 #include "config.h"
 #include <stdio.h>
-#include "mutt/base64.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 
 /**
  * mutt_sasl_plain_msg - Create an SASL command

diff --git a/conn/socket.c b/conn/socket.c
index ca65bfeaac3cf85091528ca05050022422e7335e..9b0e7c5892f8f262ba5370a3eddc0f51e981c0b8 100644 (file)
--- a/conn/socket.c
+++ b/conn/socket.c
@@ -57,10 +57,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
-#include "mutt/debug.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "account.h"
 #include "conn_globals.h"
 #include "connection.h"

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index c242df8cb199440a4687c491366be6741893f332..b9c8b7dc8016987488cbd5b6d9bfa013bdf4fb41 100644 (file)
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -38,17 +38,10 @@
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
-#include "mutt/date.h"
-#include "mutt/debug.h"
-#include "mutt/file.h"
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/regex3.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "account.h"
 #include "conn_globals.h"

diff --git a/conn/tunnel.c b/conn/tunnel.c
index c99a210ccf44959238b1c7ebc1f2788ef43cda0b..0d89d13214a0587af4918fc43381ae991776d86d 100644 (file)
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -34,17 +34,11 @@
 #include "config.h"
 #include <errno.h>
 #include <fcntl.h>
-#include <netinet/in.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include "mutt/memory.h"
-#include "mutt/message.h"
-#include "mutt/signal2.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "tunnel.h"
 #include "account.h"

diff --git a/copy.h b/copy.h
index 98ed22c20bdbaad1866af3ac95409243a2878e8e..4a57ba88348b6db51c92791abd921baca56056f9 100644 (file)
--- a/copy.h
+++ b/copy.h
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 
-struct Body;
 struct Header;
 struct Context;
 

diff --git a/curs_lib.c b/curs_lib.c
index 6280451b127288644f47349def46bebe52eb35ae..65042a9e387e1ac3fa6a2b12a8629dd473d57c67 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -44,16 +44,12 @@
 #include "enter_state.h"
 #include "globals.h"
 #include "header.h"
-#include "mbyte.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "opcodes.h"
 #include "options.h"
 #include "pager.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef HAVE_ISWBLANK
 #include <wctype.h>
 #endif

diff --git a/curs_main.c b/curs_main.c
index af2d0006588e59d40234201ed48d21c867cf8d9f..4655a1d6b504c50c03d4d07fe493b89333b5c6bb 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -52,9 +52,6 @@
 #include "sort.h"
 #include "tags.h"
 #include "thread.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/term.h>
 #elif defined(HAVE_NCURSES_NCURSES_H)

diff --git a/edit.c b/edit.c
index 42fdf945315fa1a6ee15eaeb272a19a6beb0f332..bde30283eddeec32ac56486652fc4a2efde6265a 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "address.h"
 #include "alias.h"
 #include "body.h"
@@ -42,9 +41,6 @@
 #include "mutt_curses.h"
 #include "options.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /*
  * SLcurses_waddnstr() can't take a "const char *", so this is only

diff --git a/enter.c b/enter.c
index 827105d88ce5f2779f70f85cb3c1e2601dc45169..11ae63b489e4dca7c26908a814ff0ac2ba51ce50 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include <stddef.h>
-#include <limits.h>
+#include <stdbool.h>
 #include <string.h>
 #include <wchar.h>
 #include <wctype.h>
@@ -33,10 +33,8 @@
 #include "globals.h"
 #include "history.h"
 #include "keymap.h"
-#include "mbyte.h"
 #include "mutt_curses.h"
 #include "opcodes.h"
-#include "options.h"
 #include "protos.h"
 
 /**

diff --git a/envelope.c b/envelope.c
index f8e7925d7967b2c4b6c28c181998716e5233713b..c59f8dd835fdfc551faec22ba2cb3aaba5805680 100644 (file)
--- a/envelope.c
+++ b/envelope.c
@@ -37,10 +37,7 @@
 
 #include "config.h"
 #include <stddef.h>
-#include "mutt/buffer.h"
-#include "mutt/memory.h"
-#include "mutt/queue.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "envelope.h"
 #include "address.h"
 #include "protos.h"

diff --git a/envelope.h b/envelope.h
index 4e4df32cbb705ea4eb157db9395854f2effc7cc0..07fde699907a7ae81d60200052d356afe1b1f5f3 100644 (file)
--- a/envelope.h
+++ b/envelope.h
@@ -24,7 +24,7 @@
 #define _MUTT_ENVELOPE_H
 
 #include <stdbool.h>
-#include "mutt/list.h"
+#include "mutt/mutt.h"
 
 /**
  * struct Envelope - The header of an email

diff --git a/filter.c b/filter.c
index 2775aeb5dbd99ac867a3cfbd7cdc98c4c520323f..584f0d4163f0125970298028ec2105df87fcd47e 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "filter.h"
 #include "mutt_curses.h"

diff --git a/from.c b/from.c
index c175a3716f91f956cf3a0e5ae92988fc3923d3c0..87fb40140eca4b7f5faee06d1b73bd84a0e7fbb6 100644 (file)
--- a/from.c
+++ b/from.c
@@ -22,13 +22,10 @@
 
 #include "config.h"
 #include <ctype.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "globals.h"
-#include "protos.h"
 
 /*
  * A valid message separator looks like:

diff --git a/group.c b/group.c
index b4783ff7e0bd280a00002151c3817a443f73ab03..c780cfa90240bff0337a82019f8d4a913dc7e5b7 100644 (file)
--- a/group.c
+++ b/group.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #include <stdlib.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "group.h"
 #include "address.h"
 #include "globals.h"

diff --git a/handler.c b/handler.c
index 6706ae08b0957067432a4c2a839943d56e2da000..c390cc30dcfe88d2c8905815e29f503dda828955 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -51,9 +51,6 @@
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 #define BUFI_SIZE 1000
 #define BUFO_SIZE 2000

diff --git a/hdrline.c b/hdrline.c
index c38e6e797bbec18d5eec8caca3078654ff8743b1..cd1f02c851043cd59a419d58a433893cf058de01 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -47,9 +46,6 @@
 #include "sort.h"
 #include "tags.h"
 #include "thread.h"
-#ifdef USE_NOTMUCH
-#include "mutt_notmuch.h"
-#endif
 
 /**
  * enum FlagChars - Index into the FlagChars variable ($flag_chars)

diff --git a/header.c b/header.c
index 601a7093422faeba18807a33bdabd7f12a730bf6..a859b7f2308946c3cd5405e8fb2e74aca917d4a9 100644 (file)
--- a/header.c
+++ b/header.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/help.c b/help.c
index b2a9bd7395ad4088c80985b49416a566d7b5ea50..8491920d70498aef0ee816eaa9fd78244be67c6b 100644 (file)
--- a/help.c
+++ b/help.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include <stddef.h>
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -31,7 +30,6 @@
 #include "mutt/mutt.h"
 #include "globals.h"
 #include "keymap.h"
-#include "mbyte.h"
 #include "mutt_curses.h"
 #include "opcodes.h"
 #include "options.h"

diff --git a/history.c b/history.c
index 44927407a24382de5ec72f7bc8d5bc4a481ae7cd..43bc198cbcf1e71a444a488043d6ab9d203c5739 100644 (file)
--- a/history.c
+++ b/history.c
@@ -29,6 +29,7 @@
 #include "mutt/mutt.h"
 #include "history.h"
 #include "globals.h"
+#include "options.h"
 #include "protos.h"
 
 /* This history ring grows from 0..History, with last marking the

diff --git a/hook.c b/hook.c
index c84ed4022063a0290fbbe50cf362ff7d479971ed..e0d14bd73b5585fd06021f3171fa5ea35835712b 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
@@ -31,7 +30,6 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
-#include "context.h"
 #include "envelope.h"
 #include "globals.h"
 #include "header.h"
@@ -44,6 +42,8 @@
 #include "compress.h"
 #endif
 
+struct Context;
+
 /**
  * struct Hook - A list of user hooks
  */

diff --git a/imap/browse.c b/imap/browse.c
index 06841714b3664917877e2dc1608487b705777145..d82eacc3a6c3fbca7dab15ddfcf5042148c3972a 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -49,9 +49,6 @@
 #include "mutt_account.h"
 #include "options.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /**
  * add_folder - Format and add an IMAP folder to the browser

diff --git a/imap/imap.h b/imap/imap.h
index 9e8f2eb43c83c7e1d9bd0eecda808c454acddcd0..f366e72eb50a89d37ebd08bf57b88000296bc6eb 100644 (file)
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -44,15 +44,16 @@
 #ifndef _IMAP_IMAP_H
 #define _IMAP_IMAP_H
 
+#include "conn/conn.h"
+#include "mutt_account.h"
 #include <stddef.h>
 #include <sys/types.h>
-#include "mutt_account.h"
 
-struct Header;
-struct Pattern;
+struct BrowserState;
 struct Context;
+struct Header;
 struct Message;
-struct BrowserState;
+struct Pattern;
 
 /**
  * struct ImapMbox - An IMAP mailbox

diff --git a/imap/message.c b/imap/message.c
index 8d69a3a50b057524d089a6b8ad3e5aa1f0953b09..5581b54f0be8cb3c2156db3d33999fc01f922e56 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -71,6 +71,8 @@
 #include "hcache/hcache.h"
 #endif
 
+struct BodyCache;
+
 /**
  * new_header_data - Create a new ImapHeaderData
  * @retval ptr New ImapHeaderData

diff --git a/imap/message.h b/imap/message.h
index 6aa4ef3865f47278971761c18bd126718f68b269..63e17d43f17987020e50bfb7743655b2ea1c4afd 100644 (file)
--- a/imap/message.h
+++ b/imap/message.h
@@ -26,7 +26,6 @@
 
 #include <stdbool.h>
 #include <time.h>
-#include "mutt/list.h"
 
 /**
  * struct ImapHeaderData - IMAP-specific header data

diff --git a/imap/util.c b/imap/util.c
index 5e28d203606deb65bba6bf97affe541876900006..5b00c5aef8c3c0717fb534645067294b8364a0a6 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -69,6 +69,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -78,7 +79,6 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "conn/conn.h"
-#include "mutt.h"
 #include "bcache.h"
 #include "context.h"
 #include "globals.h"

diff --git a/init.c b/init.c
index 239904f4958e94b8867bafe710184068241d6760..795a482eff1f4ee1ed30356d8bcd5199bdaf109f 100644 (file)
--- a/init.c
+++ b/init.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <pwd.h>

diff --git a/init.h b/init.h
index 574f434944ec66c212750d73683ee7eff54ef52f..75d74b50bc5f0594c66f2b6a3429b775493004d3 100644 (file)
--- a/init.h
+++ b/init.h
@@ -35,7 +35,7 @@
 #include "group.h"
 #include "mutt_commands.h"
 #include "mutt_options.h"
-#include "mutt/regex3.h"
+#include "mutt/mutt.h"
 #include "mx.h"
 #include "options.h"
 #include "protos.h"
@@ -47,8 +47,6 @@
 #endif
 #endif
 
-struct Buffer;
-
 #ifndef _MAKEDOC
 /* flags to parse_set() */
 #define MUTT_SET_INV   (1 << 0) /**< default is to invert all vars */

diff --git a/keymap.c b/keymap.c
index 2cf66042aca0ec88cd8d1c41a82a9afbc07647c3..873127458e8fb4c457817b250339d3f44364a5d5 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "keymap.h"

diff --git a/keymap.h b/keymap.h
index d8e44b2d2a358fec0f8e5cbf2f5f91da7a2e53cd..36d4497e68c360a4db7162a7937571e93778af42 100644 (file)
--- a/keymap.h
+++ b/keymap.h
@@ -24,7 +24,7 @@
 #define _MUTT_KEYMAP_H
 
 #include <stddef.h>
-#include "mutt/mapping.h"
+#include "mutt/mutt.h"
 
 /* maximal length of a key binding sequence used for buffer in km_bindkey */
 #define MAX_SEQ 8

diff --git a/main.c b/main.c
index 76b3048feea1d45f242fe990ed31db0492875a3e..fa247d118072e5899d52c4f4cd9d350019b13197 100644 (file)
--- a/main.c
+++ b/main.c
@@ -48,7 +48,6 @@
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mutt_socket.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "protos.h"

diff --git a/mbyte.c b/mbyte.c
index a79bf574580df3845a9e1f3eb3a82c9572e03d46..2d8fb8445c1d540703d178dadd9ebd619d4fadc6 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -23,14 +23,14 @@
 
 #include "config.h"
 #include <errno.h>
+#include <libintl.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <string.h>
 #include <wchar.h>
+#include <wctype.h>
 #include "mutt/mutt.h"
 #include "mbyte.h"
-#include "options.h"
-#include "protos.h"
 
 #ifndef EILSEQ
 #define EILSEQ EINVAL

diff --git a/mbyte.h b/mbyte.h
index 367aeb02f45c832bec53cd3b31e7de65adb1ffd6..11be857c0198f1b3d99e21566b88a1a7df638fc8 100644 (file)
--- a/mbyte.h
+++ b/mbyte.h
@@ -25,7 +25,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <wchar.h>
 
 void mutt_set_charset(char *charset);
 extern bool Charset_is_utf8;

diff --git a/menu.c b/menu.c
index 7eaedfe1bbaf49ecd7d3b2ed386784061c38db6e..dbe7df1ec090a1872980d111b6908d1d37c31295 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -40,13 +40,12 @@
 #include "pattern.h"
 #include "protos.h"
 #include "tags.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
 #endif
 
+struct Header;
+
 char *SearchBuffers[MENU_MAX];
 
 /* These are used to track the active menus, for redraw operations. */

diff --git a/mutt/file.c b/mutt/file.c
index 1e0a2d1a1dab97e67358164390adec541101336a..982a16dd3c9c79ee7f3f7b061f8695fb7da9fcfa 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -64,6 +64,7 @@
  */
 
 #include "config.h"
+#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -75,7 +76,6 @@
 #include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <utime.h>
 #include "file.h"

diff --git a/mutt/list.h b/mutt/list.h
index 714b0013cf3a1c0754310bbd435ff32a490eb3bc..32425fbfc49e381f56430d28c71ca27afaaa9518 100644 (file)
--- a/mutt/list.h
+++ b/mutt/list.h
@@ -25,7 +25,7 @@
 #define _MUTT_LIST_H
 
 #include <stdbool.h>
-#include "mutt/queue.h"
+#include "queue.h"
 
 /**
  * struct ListNode - A List node for strings

diff --git a/mutt/mbyte.h b/mutt/mbyte.h
index 9fc4e0ff23ea44d4ede21bd4827c78b33e488ae9..cd097b233cfef8ed07ab88546c591de27e9916e5 100644 (file)
--- a/mutt/mbyte.h
+++ b/mutt/mbyte.h
@@ -26,6 +26,7 @@
 #include <stddef.h>
 #include <ctype.h>
 #include <stdbool.h>
+#include <wchar.h>
 #include <wctype.h>
 
 extern bool OPT_LOCALES;

diff --git a/mutt_account.c b/mutt_account.c
index e407516633025e9216a1b23372f332512119227a..a81dfffe092d0fa756c59515631ef876a7626490 100644 (file)
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
+#include "conn/conn.h"
 #include "mutt_account.h"
 #include "globals.h"
 #include "options.h"

diff --git a/mutt_account.h b/mutt_account.h
index 8bb64bfd62d4e067328e0d33899ad1731b0d54a3..3c6bd0d59931a547bd2daa9e049ca0b0d86d71d3 100644 (file)
--- a/mutt_account.h
+++ b/mutt_account.h
@@ -25,8 +25,7 @@
 #ifndef _MUTT_ACCOUNT_H
 #define _MUTT_ACCOUNT_H
 
-#include "conn/conn.h"
-
+struct Account;
 struct Url;
 
 /**

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

diff --git a/mutt_socket.c b/mutt_socket.c
index 53b67ce1a6566e98c05ad4bd66f12618c1c2e487..f9f1c889d8ae0e7b9d5ac9c1c63b964ef002b883 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -24,10 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt/queue.h"
 #include "conn/conn.h"
 #include "mutt_socket.h"
-#include "globals.h"
 #include "mutt_account.h"
 #include "protos.h"
 #include "url.h"

diff --git a/mutt_socket.h b/mutt_socket.h
index f536554abfd99a08ae804ae1389ceee8333527a7..6db07fb86877906260a0ab16d750adab9d5bf7d0 100644 (file)
--- a/mutt_socket.h
+++ b/mutt_socket.h
@@ -23,10 +23,11 @@
 #ifndef _MUTT_SOCKET_H
 #define _MUTT_SOCKET_H
 
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 
 struct Account;
+struct Connection;
 
 /* logging levels */
 #define MUTT_SOCK_LOG_CMD  2

diff --git a/muttlib.c b/muttlib.c
index 993f0e27c24981d579b9a215b7dc045e85482d91..1418ad4d3c2dc851215d41acde707ff2405798c3 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -60,9 +60,6 @@
 #include "protos.h"
 #include "tags.h"
 #include "url.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif

diff --git a/mx.c b/mx.c
index 3055318d02cf0a61d27e0245c197f0170c97c757..3a2108cd3754967a5e254d448d9fb948c7c5f3b5 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -23,11 +23,9 @@
 
 #include "config.h"
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 2c4d2ab018d4c70ea21f5454f827630337be2f75..3ea832cb696838a65be60d05441e170d13ff33bd 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -64,9 +64,6 @@
 #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/pgp.c b/ncrypt/pgp.c
index 3765c6f2ae7f80cd97666995bc7c46ccda2fa81c..549e3cdcee10d3b4e2139eb47b4e8b73735e04b2 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -60,9 +60,6 @@
 #include "pgpmicalg.h"
 #include "protos.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 char PgpPass[LONG_STRING];
 time_t PgpExptime = 0; /* when does the cached passphrase expire? */

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 43f524bb4479a6184e7859ed465d685790ce7096..58e7b6cd15e799e40a79c7a7077f5b2ecfb591ce 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -53,9 +53,6 @@
 #include "parameter.h"
 #include "protos.h"
 #include "state.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /**
  * struct SmimeCommandContext - Data for a SIME command

diff --git a/nntp.c b/nntp.c
index ff21ed8c6407ab56e17a1e72e15338d42e4498f4..4541f1f28341b701e2296edd704b8d452faca146 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "conn/conn.h"

diff --git a/nntp.h b/nntp.h
index 6b211ea3b4658219f2997fe63745feb94b7afaca..d4d95263f612116a69e46ee8c7d966e82ae8391f 100644 (file)
--- a/nntp.h
+++ b/nntp.h
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <time.h>
 #include "format_flags.h"
-#include "where.h"
 #include "mx.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"

diff --git a/pager.c b/pager.c
index 97887a178a39bfd1410d40b465ce72b3055fb8f9..7dc84e008b60537a76a1a1b3d2109e596d9d6e87 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -52,7 +52,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "pattern.h"
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_SIDEBAR
@@ -61,9 +60,6 @@
 #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/parameter.c b/parameter.c
index 1f087a91ced7c9f5b4c5cef0c9b6d9ec18e5ad32..d9f74ee14de795bf938e764af4115edea380de69 100644 (file)
--- a/parameter.c
+++ b/parameter.c
@@ -36,6 +36,8 @@
  */
 
 #include "config.h"
+#include <stddef.h>
+#include "mutt/mutt.h"
 #include "parameter.h"
 
 /**

diff --git a/parameter.h b/parameter.h
index c2e86068c0e704774cc74949b30083d50489ab99..7f1e8ea2de64591b140a81a3183965e1d775fa2b 100644 (file)
--- a/parameter.h
+++ b/parameter.h
@@ -23,8 +23,6 @@
 #ifndef _MUTT_PARAMETER_H
 #define _MUTT_PARAMETER_H
 
-#include "mutt/mutt.h"
-
 /**
  * struct Parameter - Attribute associated with a MIME part
  */

diff --git a/parse.c b/parse.c
index b34f7a5df85da70bf53058df2e6e6c82dc4d88ea..91a1631f9bd21170f3148352d504d133b2d8d7e1 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -45,7 +45,6 @@
 #include "rfc2231.h"
 #include "url.h"
 
-struct Address;
 struct Context;
 
 /**

diff --git a/pattern.c b/pattern.c
index f8ea2530acfa0b8d26763ddbf6fc7cefe6802cd9..a1a4afb8ff16af80e3f73694b2645ae26b94e039 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -33,9 +33,8 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
-#include <wctype.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "pattern.h"
 #include "address.h"
@@ -57,9 +56,6 @@
 #include "state.h"
 #include "tags.h"
 #include "thread.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif

diff --git a/pattern.h b/pattern.h
index 663a43bb53b93485880a46514e687e13e4ced108..38cbdb0b310ece40bfb1d5e06de09c15b91ac3ba 100644 (file)
--- a/pattern.h
+++ b/pattern.h
@@ -29,7 +29,6 @@
 #include "mutt/mutt.h"
 
 struct Address;
-struct Buffer;
 struct Header;
 struct Context;
 

diff --git a/postpone.c b/postpone.c
index d7251327695fa56b94090e95935a2994baa83e59..bafd442dee81622678f6d593008e3f98735359bf 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -30,6 +30,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "conn/conn.h"
 #include "mutt.h"
 #include "body.h"
 #include "context.h"

diff --git a/protos.h b/protos.h
index 5cbb97ac9d699a17dc789e58f70cb60f9fe14c8c..fe3b9276abdd26c68ed024e7ce7fe56df0b9237c 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <wctype.h>
+#include "mutt.h"
 #include "format_flags.h"
 #include "options.h"
 

diff --git a/query.c b/query.c
index 38ea7ba71f468d452c9522d3ab2fdf329aa0d966..0b0015ee30f6eea891da50353b882f1dc017963d 100644 (file)
--- a/query.c
+++ b/query.c
@@ -41,9 +41,6 @@
 #include "mutt_menu.h"
 #include "opcodes.h"
 #include "protos.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 
 /**
  * struct Query - An entry from an external address-book

diff --git a/recvattach.c b/recvattach.c
index c9098fad486947432704ec53514206e39323767d..77b45debc27e97d99891abde565563620b23efc2 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -50,9 +50,6 @@
 #include "protos.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, int init);
 

diff --git a/remailer.c b/remailer.c
index 509bb441249f7be029b0e099b938bc48b9d78393..4ea72304cc2d40ad1b8a19173f09c93c07fc0761 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -27,6 +27,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/resize.c b/resize.c
index 08a02d640d442ee03ea73d0d5c1e88dbe261528e..633554ffc28bc3a902ea0566ae380ab188a9cf77 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include <fcntl.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>

diff --git a/rfc1524.c b/rfc1524.c
index af446ab2306911313bfeb7990fab91a2edf69507..bef66ccf8b93b036a39de8f40bbc78f22836eae0 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -34,7 +34,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "rfc1524.h"

diff --git a/rfc2047.c b/rfc2047.c
index 6d76602cf23b15b1771c63d34e17b4d01a015f74..40b350b8af3db646342ae47677c9e03a0b2acb21 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <iconv.h>
+#include <stdbool.h>
 #include <string.h>
 #include "mutt/mutt.h"
 #include "rfc2047.h"
@@ -33,7 +34,6 @@
 #include "mbyte.h"
 #include "mime.h"
 #include "options.h"
-#include "protos.h"
 
 /* If you are debugging this file, comment out the following line. */
 /* #define NDEBUG */

diff --git a/rfc2231.c b/rfc2231.c
index c5c20ac794b4d4b26b3991826be346956464dd1f..9cbd23f4e02ad0a0cdd9cad780ac4a5f6606a339 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,7 +42,6 @@
 #include "mime.h"
 #include "options.h"
 #include "parameter.h"
-#include "protos.h"
 #include "rfc2047.h"
 
 /**

diff --git a/rfc3676.c b/rfc3676.c
index 89a34d32c4b43cf2dbaf21752cb5ad404b910cab..a261cbf6038e3ad1a1b747190bf4ecf15564818b 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "body.h"
 #include "globals.h"
 #include "header.h"

diff --git a/safe_asprintf.c b/safe_asprintf.c
index 90a47418d8fd94c53cc0f7e67af501494dbbccc8..682d1a938ca558ccabdd3358bee2a364f83cdc6a 100644 (file)
--- a/safe_asprintf.c
+++ b/safe_asprintf.c
@@ -21,8 +21,8 @@
  */
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <unistd.h>
 #include "mutt/mutt.h"
 
 /* NOTE: Currently there is no check in configure.ac for vasprintf(3).  the

diff --git a/score.c b/score.c
index 92ccdefcf3751dff1c4c5dcd154fda8c64b94098..0b24478ad2c96533fe564e6c813a84f924f351cf 100644 (file)
--- a/score.c
+++ b/score.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"

diff --git a/send.c b/send.c
index e5e33804a06e29b38133bc3cc7151c97037377ed..da3400ad08c0b5832f2e94b361ec9f0ad68d0f1b 100644 (file)
--- a/send.c
+++ b/send.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>

diff --git a/sendlib.c b/sendlib.c
index 5b38c01617704c471efe2525b10506cc6dcb862d..46aa5890eadc756e9874b3deb1ab85a6776894e6 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -21,8 +21,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <iconv.h>
@@ -37,7 +35,6 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"

diff --git a/signal.c b/signal.c
index 0e7bbd3ee4e554494320f17a6f30ec2b7ca0ada3..7e090291e292b571399314516948bc46498a168d 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #include <errno.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/sort.c b/sort.c
index 9beecb26fb1ce8c21ebf10e98dfa62ca9592c8b8..452abe670fe026619759d09b01fe2684244d5e49 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -21,10 +21,10 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "mutt.h"
 #include "sort.h"
 #include "address.h"
 #include "body.h"

diff --git a/sort.h b/sort.h
index 5da3fab271e3a52b0518d352f6674e82d2748e44..b6023c820371fd2b565742e13669463bcabf6f3a 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -24,7 +24,7 @@
 #define _MUTT_SORT_H
 
 #include "where.h"
-#include "mutt/mapping.h"
+#include "mutt/mutt.h"
 
 struct Address;
 struct Context;

diff --git a/state.c b/state.c
index 36ae3536723eab8d196f9520993588cccaad2134..3e837baf104c6103b81ea4463559e2360bd78a51 100644 (file)
--- a/state.c
+++ b/state.c
@@ -23,9 +23,10 @@
 #include "config.h"
 #include <limits.h>
 #include <stdarg.h>
+#include <wchar.h>
+#include "mutt/mutt.h"
 #include "state.h"
 #include "globals.h"
-#include "mbyte.h"
 
 void state_mark_attach(struct State *s)
 {

diff --git a/status.c b/status.c
index 5b4194ae1c2cff58f5390fb1e66f175a2426c7c8..c962db9d8844b5f32e1c938c88310ff39d1e12a4 100644 (file)
--- a/status.c
+++ b/status.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "context.h"

diff --git a/system.c b/system.c
index 9d4a2ff719cf442e3b0f2b53c0c611ce1707d07e..b0c2a986238fe938034be34ed99582cc24f89b19 100644 (file)
--- a/system.c
+++ b/system.c
@@ -21,11 +21,8 @@
  */
 
 #include "config.h"
-#include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"

diff --git a/tags.c b/tags.c
index 3549eec88965a3b441b50a94848acd4cbc9063e9..8c71b2173be80379f83b3666f0fc492974874251 100644 (file)
--- a/tags.c
+++ b/tags.c
@@ -45,11 +45,8 @@
 #include "config.h"
 #include <stddef.h>
 #include <string.h>
-#include "mutt/hash.h"
-#include "mutt/queue.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "tags.h"
-#include "globals.h"
 
 char *HiddenTags;           /**< Private tags which should not be displayed */
 struct Hash *TagTransforms; /**< Lookup table of alternative tag names */

diff --git a/tags.h b/tags.h
index 3b5624ed7b5052dae68c068ca574392fdd59997d..a73562f758aecd8094cdbbf5a0defd518d35f19c 100644 (file)
--- a/tags.h
+++ b/tags.h
@@ -23,9 +23,8 @@
 #ifndef _MUTT_TAG_H
 #define _MUTT_TAG_H
 
-#include <stddef.h>
 #include <stdbool.h>
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 
 extern char *HiddenTags;
 extern struct Hash *TagTransforms;

diff --git a/thread.c b/thread.c
index 7f5ff5e1c3cc72cd313d6e9de69c954bbb4fbc88..254a62fdc232ca68ec39c246ae01f5a545b131d6 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

diff --git a/thread.h b/thread.h
index c7b885af7b1ef4821a566721a8ee5324d0334ca3..b5f0d676e1c5fb3f0bc243b72b63610040bd570c 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -24,6 +24,7 @@
 #define _MUTT_THREAD_H
 
 #include <stdbool.h>
+#include "mutt.h"
 
 struct Context;
 struct Header;

diff --git a/url.h b/url.h
index 7cebe6768dac559400102ec5e6e068ee8118a8f4..00c63675d7375e6fd473789cc197b0cfb4d83de8 100644 (file)
--- a/url.h
+++ b/url.h
@@ -22,7 +22,7 @@
 #define _MUTT_URL_H
 
 #include <stddef.h>
-#include "mutt/queue.h"
+#include "mutt/mutt.h"
 
 struct Envelope;