iwyu: optimise #includes

igor47 · Mar 9, 2019 · 3df4a2c · 3df4a2c
1 parent de16c65
commit 3df4a2c
Show file tree

Hide file tree

Showing 83 changed files with 85 additions and 140 deletions.
diff --git a/browser.h b/browser.h
@@ -24,6 +24,7 @@
 #define MUTT_BROWSER_H
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <time.h>
 

diff --git a/config/address.c b/config/address.c
@@ -29,11 +29,10 @@
 #include "config.h"
 #include <stddef.h>
 #include <limits.h>
+#include <stdbool.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
-#include "email/address.h"
+#include "mutt/mutt.h"
+#include "email/lib.h"
 #include "address.h"
 #include "set.h"
 #include "types.h"

diff --git a/config/address.h b/config/address.h
@@ -23,8 +23,7 @@
 #ifndef MUTT_CONFIG_ADDRESS_H
 #define MUTT_CONFIG_ADDRESS_H
 
-#include <stdbool.h>
-
+struct Address;
 struct ConfigSet;
 
 void address_init(struct ConfigSet *cs);

diff --git a/config/bool.c b/config/bool.c
@@ -31,11 +31,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/hash.h"
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/cfgaccount.c b/config/cfgaccount.c
@@ -27,14 +27,9 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "mutt/buffer.h"
-#include "mutt/hash.h"
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "cfgaccount.h"
 #include "inheritance.h"
 #include "set.h"

diff --git a/config/command.c b/config/command.c
@@ -30,9 +30,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/dump.c b/config/dump.c
@@ -31,11 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mutt/buffer.h"
-#include "mutt/hash.h"
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "dump.h"
 #include "set.h"
 #include "types.h"

diff --git a/config/dump.h b/config/dump.h
@@ -23,8 +23,8 @@
 #ifndef MUTT_CONFIG_DUMP_H
 #define MUTT_CONFIG_DUMP_H
 
-#include <stddef.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 
 struct Buffer;

diff --git a/config/long.c b/config/long.c
@@ -30,8 +30,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/magic.c b/config/magic.c
@@ -30,10 +30,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/mbtable.c b/config/mbtable.c
@@ -31,11 +31,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "mutt/buffer.h"
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
-#include "config/mbtable.h"
+#include "mutt/mutt.h"
+#include "mbtable.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/number.c b/config/number.c
@@ -30,8 +30,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/path.c b/config/path.c
@@ -30,9 +30,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/quad.c b/config/quad.c
@@ -30,11 +30,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/hash.h"
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/regex.c b/config/regex.c
@@ -32,11 +32,7 @@
 #include <regex.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/mbyte.h"
-#include "mutt/memory.h"
-#include "mutt/regex3.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "regex2.h"
 #include "set.h"
 #include "types.h"

diff --git a/config/regex2.h b/config/regex2.h
@@ -24,10 +24,10 @@
 #define MUTT_CONFIG_REGEX_H
 
 #include <regex.h>
-#include <stdbool.h>
 
 struct Buffer;
 struct ConfigSet;
+struct Regex;
 
 void regex_init(struct ConfigSet *cs);
 struct Regex *regex_new(const char *str, int flags, struct Buffer *err);

diff --git a/config/set.c b/config/set.c
@@ -31,11 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mutt/buffer.h"
-#include "mutt/hash.h"
-#include "mutt/logging.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "inheritance.h"
 #include "types.h"

diff --git a/config/sort.c b/config/sort.c
@@ -30,10 +30,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
-#include "mutt/buffer.h"
-#include "mutt/logging.h"
-#include "mutt/mapping.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "sort.h"
 #include "set.h"
 #include "types.h"

diff --git a/config/sort.h b/config/sort.h
@@ -23,7 +23,7 @@
 #ifndef MUTT_CONFIG_SORT_H
 #define MUTT_CONFIG_SORT_H
 
-#include "mutt/mapping.h"
+#include "mutt/mutt.h"
 
 struct ConfigSet;
 

diff --git a/config/string.c b/config/string.c
@@ -30,9 +30,7 @@
 #include <stddef.h>
 #include <limits.h>
 #include <stdint.h>
-#include "mutt/buffer.h"
-#include "mutt/memory.h"
-#include "mutt/string2.h"
+#include "mutt/mutt.h"
 #include "set.h"
 #include "types.h"
 

diff --git a/config/types.h b/config/types.h
@@ -23,6 +23,8 @@
 #ifndef MUTT_CONFIG_TYPES_H
 #define MUTT_CONFIG_TYPES_H
 
+#include <stdint.h>
+
 /* Data Types */
 #define DT_ADDRESS    1   /**< e-mail address */
 #define DT_BOOL       2   /**< boolean option */

diff --git a/conn/connection.h b/conn/connection.h
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "mutt/mutt.h"
 #include "connaccount.h"
 
 /**

diff --git a/conn/socket.c b/conn/socket.c
@@ -30,25 +30,13 @@
 
 #include "config.h"
 #include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/time.h>
 #include <time.h>
-#include <unistd.h>
 #include "mutt/mutt.h"
 #include "socket.h"
 #include "conn_globals.h"
 #include "connaccount.h"
 #include "connection.h"
-#include "globals.h"
-#include "options.h"
 #include "protos.h"
 #include "ssl.h"
 #include "tunnel.h"

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
@@ -38,7 +38,6 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "mutt.h"
 #include "conn_globals.h"
 #include "connaccount.h"
 #include "connection.h"

diff --git a/conn/tunnel.c b/conn/tunnel.c
@@ -30,6 +30,7 @@
 #include "config.h"
 #include <errno.h>
 #include <fcntl.h>
+#include <stdbool.h>
 #include <string.h>
 #include <sys/wait.h>
 #include <time.h>

diff --git a/copy.h b/copy.h
@@ -23,6 +23,8 @@
 #ifndef MUTT_COPY_H
 #define MUTT_COPY_H
 
+#include "config.h"
+#include <stdint.h>
 #include <stdio.h>
 
 struct Email;

diff --git a/email/body.h b/email/body.h
@@ -23,6 +23,7 @@
 #ifndef MUTT_EMAIL_BODY_H
 #define MUTT_EMAIL_BODY_H
 
+#include "config.h"
 #include <stdbool.h>
 #include <time.h>
 #include "parameter.h"

diff --git a/email/email.h b/email/email.h
@@ -23,6 +23,7 @@
 #ifndef MUTT_EMAIL_EMAIL_H
 #define MUTT_EMAIL_EMAIL_H
 
+#include "config.h"
 #include <stddef.h>
 #include <stdbool.h>
 #include <time.h>

diff --git a/email/email_globals.c b/email/email_globals.c
@@ -27,6 +27,7 @@
  */
 
 #include "config.h"
+#include <stddef.h>
 #include <stdbool.h>
 #include "mutt/mutt.h"
 

diff --git a/email/envelope.h b/email/envelope.h
@@ -23,6 +23,7 @@
 #ifndef MUTT_EMAIL_ENVELOPE_H
 #define MUTT_EMAIL_ENVELOPE_H
 
+#include "config.h"
 #include <stdbool.h>
 #include "mutt/mutt.h"
 

diff --git a/email/group.c b/email/group.c
@@ -30,8 +30,7 @@
 #include "config.h"
 #include <stdbool.h>
 #include <stdlib.h>
-#include "mutt/mutt.h"
-#include "email/lib.h"
+#include "email/address.h"
 #include "group.h"
 
 static struct Hash *Groups = NULL;

diff --git a/email/group.h b/email/group.h
@@ -25,12 +25,9 @@
 #define MUTT_GROUP_H
 
 #include <stdbool.h>
-#include "mutt/queue.h"
-#include "mutt/regex3.h"
+#include "mutt/mutt.h"
 
 struct Address;
-struct Buffer;
-struct Hash;
 
 #define MUTT_GROUP   0
 #define MUTT_UNGROUP 1

diff --git a/email/parse.c b/email/parse.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "mutt/regex3.h"
+#include "mutt.h"
 #include "parse.h"
 #include "address.h"
 #include "body.h"

diff --git a/email/parse.h b/email/parse.h
@@ -23,6 +23,7 @@
 #ifndef MUTT_EMAIL_PARSE_H
 #define MUTT_EMAIL_PARSE_H
 
+#include "config.h"
 #include <stdbool.h>
 #include <stdio.h>
 

diff --git a/email/rfc2047.c b/email/rfc2047.c
@@ -36,10 +36,10 @@
 #include <stdbool.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/lib.h"
 #include "rfc2047.h"
 #include "address.h"
 #include "email_globals.h"
+#include "envelope.h"
 #include "mime.h"
 
 #define ENCWORD_LEN_MAX 75

diff --git a/format_flags.h b/format_flags.h
@@ -24,6 +24,7 @@
 #define MUTT_FORMAT_FLAGS_H
 
 #include <stddef.h>
+#include <stdint.h>
 
 typedef uint8_t MuttFormatFlags;         ///< Flags for mutt_expando_format(), e.g. #MUTT_FORMAT_FORCESUBJ
 #define MUTT_FORMAT_NO_FLAGS          0  ///< No flags are set