move conditional includes after others

diff --git a/alias.c b/alias.c
index e3041cbc197e775b94925b152d14dc3366414f6e..4eef21aaf0d46841bb487ed6ab82647f3f53bd92 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -23,9 +23,6 @@
 #include "config.h"
 #include <stddef.h>
 #include <errno.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -34,8 +31,8 @@
 #include <wctype.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
-#include "address.h"
 #include "alias.h"
+#include "address.h"
 #include "envelope.h"
 #include "globals.h"
 #include "mutt_charset.h"
@@ -43,6 +40,9 @@
 #include "mutt_idna.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/browser.c b/browser.c
index 933bd9d82cbbae874ea02ed300d0523b2c6b09ec..8ff53fd7bbd264c7368563656d8f9f50fcbfec47 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -25,9 +25,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <locale.h>
 #include <pwd.h>
@@ -42,9 +39,9 @@
 #include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
+#include "browser.h"
 #include "attach.h"
 #include "body.h"
-#include "browser.h"
 #include "buffy.h"
 #include "context.h"
 #include "format_flags.h"
@@ -63,6 +60,9 @@
 #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/commands.c b/commands.c
index bc62250dfcccf3f63378afa626d33e86bd7e917f..1db7f378d556e03e50938a0376627e9e712be196 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -24,9 +24,6 @@
 #include "config.h"
 #include <errno.h>
 #include <fcntl.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -60,6 +57,9 @@
 #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/compose.c b/compose.c
index e69e58c63de9af652779bb90fc44c1ce315d69c3..7adaa88923dbd109f6feeaa6d8ba25a236dbb1ec 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -23,9 +23,6 @@
 
 #include "config.h"
 #include <errno.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -57,6 +54,9 @@
 #include "options.h"
 #include "protos.h"
 #include "sort.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 #ifdef MIXMASTER
 #include "remailer.h"
 #endif

diff --git a/conn/conn.h b/conn/conn.h
index 3a723e1ec0fac02f7acb39666a4f7abbfbccdd10..1fb506227c0d605ba2f044d94b9dc5dcd7dfe38e 100644 (file)
--- a/conn/conn.h
+++ b/conn/conn.h
@@ -41,14 +41,14 @@
 #include "account.h"
 #include "conn_globals.h"
 #include "connection.h"
+#include "sasl_plain.h"
+#include "socket.h"
+#include "tunnel.h"
 #ifdef USE_SASL
 #include "sasl.h"
 #endif
-#include "sasl_plain.h"
-#include "socket.h"
 #ifdef USE_SSL
 #include "ssl.h"
 #endif
-#include "tunnel.h"
 
 #endif /* _CONN_CONN_H */

diff --git a/curs_lib.c b/curs_lib.c
index 285c80454bbb963df206bf9755e29442f370e2fa..4c780691792bd5e239ba04bd7820221df0e1f88e 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -27,9 +27,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <langinfo.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdarg.h>
@@ -55,6 +52,9 @@
 #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 76d2e86e80969b0ab45cf7019e68c3621b6dccf0..a92cf42df31c0d9f43d651d223577c1a5dabd447 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -23,9 +23,6 @@
 #include "config.h"
 #include <assert.h>
 #include <ctype.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -55,6 +52,9 @@
 #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 57ae237cc875e01a6f0f4982519fc19d7f905d96..b4dfd7e620e312eca2ce412774f3838da89f6d12 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -25,9 +25,6 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -46,6 +43,9 @@
 #include "mutt_idna.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/handler.c b/handler.c
index f93c2dc0155db08607877d7b8d95a0aa5f32220b..4cfac807970bb61c47327445b921ae3ac31a6d3c 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -24,9 +24,6 @@
 #include <stddef.h>
 #include <ctype.h>
 #include <iconv.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -55,6 +52,9 @@
 #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/imap/browse.c b/imap/browse.c
index a13961deeb4b10bc9bfd3581cc9a05a81b7ba238..e9d02d74fa4872225a13ce016ffc0d255b0de7ae 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -34,9 +34,6 @@
  */
 
 #include "config.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -53,6 +50,9 @@
 #include "mutt_regex.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/main.c b/main.c
index b1cff104d75db83222814125c4e515bd2156bac7..745c4f7742e5a5b425173341ffc931e978cfc7de 100644 (file)
--- a/main.c
+++ b/main.c
@@ -26,9 +26,6 @@
 
 #include "config.h"
 #include <errno.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <locale.h>
 #include <stdbool.h>
@@ -59,6 +56,9 @@
 #include "protos.h"
 #include "url.h"
 #include "version.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
 #endif

diff --git a/menu.c b/menu.c
index ad139e12471841321bc50927d5ae0a04c2ec2f57..91ea41d72b40daaf4d9bf16d3faae89f63f20c69 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -22,9 +22,6 @@
 
 #include "config.h"
 #include <stddef.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -44,6 +41,9 @@
 #include "pattern.h"
 #include "protos.h"
 #include "tags.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
 #endif

diff --git a/muttlib.c b/muttlib.c
index d5b9287a3614b8011901a72b5eeded3ea5c1891f..6d42493205a8603a83983e62c06c7f877e197074 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -26,9 +26,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <pwd.h>
 #include <regex.h>
@@ -58,20 +55,22 @@
 #include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_regex.h"
-#include "tags.h"
-
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "parameter.h"
 #include "protos.h"
+#include "tags.h"
 #include "url.h"
-#ifdef USE_IMAP
-#include "imap/imap.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
 #endif
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
+#ifdef USE_IMAP
+#include "imap/imap.h"
+#endif
 
 static const char *xdg_env_vars[] = {
       [XDG_CONFIG_HOME] = "XDG_CONFIG_HOME",

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index efd08f8e5f922a8dcffc622bb2ef3fb7797fddf1..863d274a383704d08b81cc604a6001e90972dcf4 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -33,9 +33,6 @@
 #include <gpg-error.h>
 #include <gpgme.h>
 #include <langinfo.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <locale.h>
 #include <stdbool.h>
@@ -68,6 +65,9 @@
 #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 d9adcd9d936ef9a092a0c6b6950d543d79f25bf5..b623f8902ad3c152e81a256a4542191772526ab7 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -31,9 +31,6 @@
  */
 
 #include "config.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
@@ -45,6 +42,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
+#include "pgp.h"
 #include "address.h"
 #include "body.h"
 #include "crypt.h"
@@ -59,12 +57,14 @@
 #include "ncrypt.h"
 #include "options.h"
 #include "parameter.h"
-#include "pgp.h"
 #include "pgpinvoke.h"
 #include "pgplib.h"
 #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 fba62f89379e9040109d2172c59ecafcaff9dca2..5b47c5a51fcd85263b4124d9fea5576b1854a3f0 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -23,9 +23,6 @@
  */
 
 #include "config.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -34,6 +31,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
+#include "smime.h"
 #include "address.h"
 #include "alias.h"
 #include "body.h"
@@ -54,8 +52,10 @@
 #include "options.h"
 #include "parameter.h"
 #include "protos.h"
-#include "smime.h"
 #include "state.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 
 /**
  * struct SmimeCommandContext - Data for a SIME command

diff --git a/pager.c b/pager.c
index ff85565f045ea719fc786581173c6289be262c8d..6c86996e6b85608fbea70a00389b2dfee60e22f6 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -25,9 +25,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
@@ -37,6 +34,7 @@
 #include <wchar.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
+#include "pager.h"
 #include "alias.h"
 #include "attach.h"
 #include "body.h"
@@ -55,7 +53,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "pager.h"
 #include "pattern.h"
 #include "protos.h"
 #include "sort.h"
@@ -65,6 +62,9 @@
 #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/pattern.c b/pattern.c
index bfe145cf9cd022fa913954713456fd7e39e12763..ca83f682e41428da40eb10b8828a3cace79f8d86 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -23,9 +23,6 @@
 #include "config.h"
 #include <stddef.h>
 #include <ctype.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdarg.h>
@@ -40,6 +37,7 @@
 #include <wctype.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
+#include "pattern.h"
 #include "address.h"
 #include "body.h"
 #include "context.h"
@@ -52,18 +50,20 @@
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_regex.h"
+#include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "pattern.h"
 #include "protos.h"
 #include "state.h"
+#include "tags.h"
 #include "thread.h"
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#endif
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
-#include "mx.h"
-#include "tags.h"
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"
 #endif

diff --git a/query.c b/query.c
index 674d9ff0b66154657444bdd7381ed370888f4695..dd03a2084f533f09013e7bdf441b52c05b3b5f9a 100644 (file)
--- a/query.c
+++ b/query.c
@@ -21,9 +21,6 @@
  */
 
 #include "config.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
@@ -45,6 +42,9 @@
 #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 3c5ab604167e4977dcaf872668c684810396d55d..0b3d3451abe0f8efbf4000a743c4123260f1d8bf 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -22,9 +22,6 @@
  */
 
 #include "config.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -53,6 +50,9 @@
 #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/system.c b/system.c
index 50b98b7aab56054888bb40ca16d7e566d18893cb..9d4a2ff719cf442e3b0f2b53c0c611ce1707d07e 100644 (file)
--- a/system.c
+++ b/system.c
@@ -24,6 +24,8 @@
 #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"
@@ -31,8 +33,6 @@
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
-#include <sys/types.h>
-#include <sys/wait.h>
 
 /**
  * mutt_system - Run an external command

diff --git a/version.c b/version.c
index 6d38c398d8755b03e850174b469e2f8d7840dbc7..d4351f21b62c647b62c76f34271c5c1064260710 100644 (file)
--- a/version.c
+++ b/version.c
@@ -29,12 +29,12 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "mutt_curses.h"
 #ifdef HAVE_STRINGPREP_H
 #include <stringprep.h>
 #elif defined(HAVE_IDN_STRINGPREP_H)
 #include <idn/stringprep.h>
 #endif
-#include "mutt_curses.h"
 
 /* #include "protos.h" */
 const char *mutt_make_version(void);