From: Richard Russon <rich@flatcap.org>
Date: Wed, 9 Jan 2019 23:18:47 +0000 (+0000)
Subject: iwyu
X-Git-Tag: 2019-10-25~372^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fddfae47d04b2a4910d874d1844183e82d96e096;p=neomutt

iwyu
---

diff --git a/config/cfgaccount.h b/config/cfgaccount.h
index ebb5c9e4b..3754f43dc 100644
--- a/config/cfgaccount.h
+++ b/config/cfgaccount.h
@@ -24,6 +24,7 @@
 #define _CONFIG_ACCOUNT_H
 
 #include <stdint.h>
+#include <stdio.h>
 
 struct Buffer;
 struct ConfigSet;
diff --git a/config/dump.h b/config/dump.h
index d09b7e961..cd2d6fa42 100644
--- a/config/dump.h
+++ b/config/dump.h
@@ -24,8 +24,12 @@
 #define MUTT_CONFIG_DUMP_H
 
 #include <stddef.h>
+#include <stdbool.h>
+#include <stdio.h>
 
+struct Buffer;
 struct ConfigSet;
+struct HashElem;
 
 #define CS_DUMP_STYLE_MUTT   0 /**< Display config in Mutt style */
 #define CS_DUMP_STYLE_NEO    1 /**< Display config in NeoMutt style */
diff --git a/config/set.h b/config/set.h
index 7ed22569b..357d2c5b0 100644
--- a/config/set.h
+++ b/config/set.h
@@ -25,6 +25,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 
 struct Buffer;
 struct ConfigSet;
diff --git a/mutt/signal2.h b/mutt/signal2.h
index 6b4dda430..5dc264d1e 100644
--- a/mutt/signal2.h
+++ b/mutt/signal2.h
@@ -23,6 +23,8 @@
 #ifndef MUTT_LIB_SIGNAL_H
 #define MUTT_LIB_SIGNAL_H
 
+#include <stdbool.h>
+
 /**
  * typedef sig_handler_t - Handler for signals
  * @param sig Signal number, e.g. SIGINT
diff --git a/mutt_account.h b/mutt_account.h
index 51b680e98..017e5b8be 100644
--- a/mutt_account.h
+++ b/mutt_account.h
@@ -25,6 +25,8 @@
 #ifndef MUTT_MUTT_ACCOUNT_H
 #define MUTT_MUTT_ACCOUNT_H
 
+#include <stdbool.h>
+
 struct ConnAccount;
 struct Url;
 
diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 7a3f242d1..631f219e7 100644
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -49,8 +49,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include "notmuch_private.h"
@@ -60,13 +58,11 @@
 #include "mutt.h"
 #include "mutt_notmuch.h"
 #include "account.h"
-#include "context.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "index.h"
 #include "mailbox.h"
 #include "maildir/lib.h"
-#include "mutt_logging.h"
 #include "mutt_thread.h"
 #include "mx.h"
 #include "progress.h"
diff --git a/notmuch/mutt_notmuch.h b/notmuch/mutt_notmuch.h
index 9c38b8ae4..433fb1cbb 100644
--- a/notmuch/mutt_notmuch.h
+++ b/notmuch/mutt_notmuch.h
@@ -39,7 +39,9 @@
 #include "mx.h"
 
 struct Email;
+struct Mailbox;
 struct NmMboxData;
+struct stat;
 
 /* These Config Variables are only used in notmuch/mutt_notmuch.c */
 extern int   NmDbLimit;
diff --git a/notmuch/nm_db.c b/notmuch/nm_db.c
index e39c41437..9567a33e2 100644
--- a/notmuch/nm_db.c
+++ b/notmuch/nm_db.c
@@ -27,16 +27,22 @@
  */
 
 #include "config.h"
+#include <limits.h>
 #include <notmuch.h>
-#include <string.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <sys/stat.h>
+#include <time.h>
 #include "notmuch_private.h"
+#include "mutt/mutt.h"
+#include "config/lib.h"
 #include "email/lib.h"
-#include "account.h"
 #include "globals.h"
 #include "mutt_logging.h"
 #include "mutt_notmuch.h"
 
+struct Mailbox;
+
 /**
  * nm_db_get_filename - Get the filename of the Notmuch database
  * @param m Mailbox
diff --git a/notmuch/notmuch_private.h b/notmuch/notmuch_private.h
index 565873bc0..ae20cdc92 100644
--- a/notmuch/notmuch_private.h
+++ b/notmuch/notmuch_private.h
@@ -21,7 +21,9 @@
  */
 
 #include <notmuch.h>
-#include "email/lib.h"
+#include <stdbool.h>
+#include <time.h>
+#include "config/lib.h"
 #include "progress.h"
 
 #ifndef MUTT_NOTMUCH_NOTMUCH_PRIVATE_H
diff --git a/state.h b/state.h
index 0e464d6a8..b11385415 100644
--- a/state.h
+++ b/state.h
@@ -23,6 +23,8 @@
 #ifndef MUTT_STATE_H
 #define MUTT_STATE_H
 
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 
 /**