iwyu: tidy #includes

diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c
index d8b8a0fb86ddcb7cdc8e31b274a71f1eefd933bf..d5ec9cbb97038bc79cb50370024d101fced0441c 100644 (file)
--- a/autocrypt/autocrypt.c
+++ b/autocrypt/autocrypt.c
@@ -25,12 +25,11 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include "autocrypt_private.h"
+#include "mutt/mutt.h"
 #include "address/lib.h"
+#include "config/lib.h"
 #include "email/lib.h"
-#include "mutt.h"
 #include "autocrypt.h"
 #include "curs_lib.h"
 #include "globals.h"

diff --git a/autocrypt/autocrypt.h b/autocrypt/autocrypt.h
index 0b39830e3b8280659726dd2efc1d8fb1f6a53a05..c037517b05e9d6ed2998c4cac2f9846f2b8594b1 100644 (file)
--- a/autocrypt/autocrypt.h
+++ b/autocrypt/autocrypt.h
@@ -24,8 +24,11 @@
 #define MUTT_AUTOCRYPT_AUTOCRYPT_H
 
 #include <sqlite3.h>
-#include "where.h"
+#include <stdbool.h>
+#include <stdio.h>
 
+struct Email;
+struct Envelope;
 WHERE sqlite3 *AutocryptDB;
 
 struct AutocryptAccount

diff --git a/autocrypt/autocrypt_acct_menu.c b/autocrypt/autocrypt_acct_menu.c
index 97a95c80d313e1d370bacc81b4bdf7064bca1779..21d6f9a64c9a988cf0ceeb5a3ccfc3aef16166fb 100644 (file)
--- a/autocrypt/autocrypt_acct_menu.c
+++ b/autocrypt/autocrypt_acct_menu.c
@@ -21,13 +21,18 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
+#include <stdio.h>
 #include "autocrypt_private.h"
+#include "mutt/mutt.h"
 #include "address/lib.h"
+#include "config/lib.h"
 #include "mutt.h"
 #include "autocrypt.h"
 #include "curs_lib.h"
 #include "format_flags.h"
 #include "globals.h"
+#include "keymap.h"
 #include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"

diff --git a/autocrypt/autocrypt_db.c b/autocrypt/autocrypt_db.c
index 2043870df28faac4391a5bab848fe0576dd15f82..dce2a304b5bebd8d1c59692a017213f919c4e426 100644 (file)
--- a/autocrypt/autocrypt_db.c
+++ b/autocrypt/autocrypt_db.c
@@ -21,12 +21,13 @@
  */
 
 #include "config.h"
+#include <stddef.h>
+#include <sqlite3.h>
+#include <stdbool.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include "autocrypt_private.h"
+#include "mutt/mutt.h"
 #include "address/lib.h"
-#include "mutt.h"
 #include "autocrypt.h"
 #include "globals.h"
 

diff --git a/autocrypt/autocrypt_gpgme.c b/autocrypt/autocrypt_gpgme.c
index f25341dae18fd11e55159e0623d6abdb3b5d933c..48c440fb2e0678c5daf25dfdffa68c7310f54b2d 100644 (file)
--- a/autocrypt/autocrypt_gpgme.c
+++ b/autocrypt/autocrypt_gpgme.c
@@ -21,11 +21,11 @@
  */
 
 #include "config.h"
+#include <stddef.h>
 #include <gpgme.h>
-#include "autocrypt_private.h"
+#include <stdbool.h>
+#include "mutt/mutt.h"
 #include "address/lib.h"
-#include "mutt.h"
-#include "autocrypt.h"
 #include "globals.h"
 #include "ncrypt/crypt_gpgme.h"
 

diff --git a/autocrypt/autocrypt_private.h b/autocrypt/autocrypt_private.h
index 2c7fc79e284b68969a22ea2bf98f812b1a39f8b8..1e1db92ced32e484176e8b35a9b338ecb0873b6f 100644 (file)
--- a/autocrypt/autocrypt_private.h
+++ b/autocrypt/autocrypt_private.h
@@ -24,6 +24,7 @@
 #define MUTT_AUTOCRYPT_AUTOCRYPT_PRIVATE_H
 
 #include <sqlite3.h>
+#include <stdbool.h>
 
 struct Address;
 struct AddressList;

diff --git a/autocrypt/autocrypt_schema.c b/autocrypt/autocrypt_schema.c
index 756a8862194eb8518b9210fdbe318d7ea68ca756..8c2617d08c0c09eb7423aa4ac5c877361df84000 100644 (file)
--- a/autocrypt/autocrypt_schema.c
+++ b/autocrypt/autocrypt_schema.c
@@ -21,9 +21,10 @@
  */
 
 #include "config.h"
+#include <stddef.h>
+#include <sqlite3.h>
 #include "autocrypt_private.h"
-#include "mutt.h"
-#include "autocrypt.h"
+#include "mutt/mutt.h"
 
 int mutt_autocrypt_schema_init(void)
 {