iwyu: optimise headers

dariocorreal · Jun 4, 2020 · 8e53202 · 8e53202
1 parent 25a6632
commit 8e53202
Show file tree

Hide file tree

Showing 29 changed files with 19 additions and 20 deletions.
diff --git a/autocrypt/acct_menu.c b/autocrypt/acct_menu.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include "autocrypt_private.h"
 #include "mutt/lib.h"

diff --git a/command_parse.h b/command_parse.h
@@ -29,6 +29,7 @@
 #include "mutt_commands.h"
 
 struct Buffer;
+struct GroupList;
 
 enum CommandResult parse_alternates      (struct Buffer *buf, struct Buffer *s, intptr_t data, struct Buffer *err);
 enum CommandResult parse_attachments     (struct Buffer *buf, struct Buffer *s, intptr_t data, struct Buffer *err);

diff --git a/conn/lib.h b/conn/lib.h
@@ -45,7 +45,6 @@
 #define MUTT_CONN_LIB_H
 
 #include "config.h"
-#include <stdio.h>
 // IWYU pragma: begin_exports
 #include "conn_globals.h"
 #include "connaccount.h"

diff --git a/conn/sasl.c b/conn/sasl.c
@@ -47,7 +47,6 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <time.h>
 #include "mutt/lib.h"
 #include "gui/lib.h"
 #include "mutt.h"

diff --git a/conn/sasl.h b/conn/sasl.h
@@ -25,9 +25,7 @@
 #ifndef MUTT_CONN_SASL_H
 #define MUTT_CONN_SASL_H
 
-#include <stddef.h>
 #include <sasl/sasl.h>
-#include <sys/types.h>
 
 struct Connection;
 

diff --git a/conn/socket.c b/conn/socket.c
@@ -29,7 +29,6 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <errno.h>
 #include <string.h>
 #include <time.h>

diff --git a/conn/socket.h b/conn/socket.h
@@ -24,7 +24,6 @@
 #ifndef MUTT_CONN_SOCKET_H
 #define MUTT_CONN_SOCKET_H
 
-#include <stddef.h>
 #include <time.h>
 
 struct Connection;

diff --git a/conn/tunnel.c b/conn/tunnel.c
@@ -40,7 +40,6 @@
 #include "conn_globals.h"
 #include "connaccount.h"
 #include "connection.h"
-#include "socket.h"
 
 /**
  * struct TunnelSockData - A network tunnel (pair of sockets)

diff --git a/core/neomutt.h b/core/neomutt.h
@@ -23,6 +23,7 @@
 #ifndef MUTT_CORE_NEOMUTT_H
 #define MUTT_CORE_NEOMUTT_H
 
+#include <stddef.h>
 #include <stdbool.h>
 #include "account.h"
 #include "mailbox.h"

diff --git a/email/rfc2231.c b/email/rfc2231.c
@@ -36,7 +36,6 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
 #include "mutt/lib.h"
 #include "rfc2231.h"

diff --git a/email/rfc2231.h b/email/rfc2231.h
@@ -23,6 +23,7 @@
 #ifndef MUTT_EMAIL_RFC2231_H
 #define MUTT_EMAIL_RFC2231_H
 
+#include <stddef.h>
 #include <stdbool.h>
 
 struct ParameterList;

diff --git a/enter.c b/enter.c
@@ -48,6 +48,7 @@
 #include "muttlib.h"
 #include "opcodes.h"
 #include "protos.h"
+#include "history/lib.h"
 
 /**
  * enum EnterRedrawFlags - redraw flags for mutt_enter_string_full()

diff --git a/hcache/lib.h b/hcache/lib.h
@@ -67,7 +67,6 @@
 #define MUTT_HCACHE_LIB_H
 
 #include <stddef.h>
-#include <stdbool.h>
 #include <stdint.h>
 
 struct Buffer;

diff --git a/hdrline.c b/hdrline.c
@@ -32,6 +32,7 @@
 #include "config.h"
 #include <locale.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/imap/command.c b/imap/command.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/imap/search.c b/imap/search.c
@@ -30,6 +30,7 @@
  */
 
 #include "config.h"
+#include <stdbool.h>
 #include <string.h>
 #include "imap_private.h"
 #include "email/lib.h"

diff --git a/mutt/date.c b/mutt/date.c
@@ -27,18 +27,15 @@
  */
 
 #include "config.h"
-#include <ctype.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
 #include <time.h>
 #include "date.h"
 #include "logging.h"
 #include "memory.h"
-#include "message.h"
 #include "prex.h"
 #include "regex3.h"
 #include "string2.h"

diff --git a/mutt/file.h b/mutt/file.h
@@ -27,7 +27,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <time.h>
 
 struct Buffer;
 struct stat;
@@ -38,7 +37,9 @@ extern const char filename_safe_chars[];
 #define MUTT_CONT (1 << 0) ///< \-continuation
 #define MUTT_EOL  (1 << 1) ///< don't strip `\n` / `\r\n`
 
-#ifndef HAVE_STRUCT_TIMESPEC
+#ifdef HAVE_STRUCT_TIMESPEC
+struct timespec;
+#else
 /**
  * struct timespec - Time value with nanosecond precision
  */

diff --git a/mutt/list.c b/mutt/list.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 #include <stdbool.h>
-#include <string.h>
 #include "list.h"
 #include "memory.h"
 #include "queue.h"

diff --git a/mutt/list.h b/mutt/list.h
@@ -24,6 +24,7 @@
 #ifndef MUTT_LIB_LIST_H
 #define MUTT_LIB_LIST_H
 
+#include <stddef.h>
 #include <stdbool.h>
 #include "queue.h"
 

diff --git a/mutt_history.c b/mutt_history.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include "mutt/lib.h"
 #include "config/lib.h"

diff --git a/mutt_lua.h b/mutt_lua.h
@@ -25,7 +25,6 @@
 
 #include <stdint.h>
 #include "mutt_commands.h"
-#include <stdint.h>
 
 struct Buffer;
 

diff --git a/mutt_menu.h b/mutt_menu.h
@@ -27,11 +27,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include "mutt/regex3.h"
+#include "mutt/lib.h"
 #include "keymap.h"
 
-struct NotifyCallback;
-
 /* These Config Variables are only used in menu.c */
 extern short C_MenuContext;
 extern bool  C_MenuMoveOff;

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
@@ -32,6 +32,7 @@
 #include "config.h"
 #include <limits.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>

diff --git a/nntp/browse.c b/nntp/browse.c
@@ -27,6 +27,7 @@
  */
 
 #include "config.h"
+#include <stdint.h>
 #include <stdio.h>
 #include "mutt/lib.h"
 #include "email/lib.h"

diff --git a/pop/lib.h b/pop/lib.h
@@ -39,7 +39,6 @@
 #include "core/lib.h"
 #include "mx.h"
 
-struct Slist;
 struct stat;
 
 /* These Config Variables are only used in pop/pop.c */

diff --git a/recvattach.h b/recvattach.h
@@ -24,6 +24,7 @@
 #ifndef MUTT_RECVATTACH_H
 #define MUTT_RECVATTACH_H
 
+#include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/sidebar.c b/sidebar.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/status.c b/status.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include "mutt/lib.h"
 #include "config/lib.h"