From: Pierre Habouzit <madcoder@debian.org>
Date: Fri, 17 Nov 2006 00:35:01 +0000 (+0100)
Subject: rationnalize includes a lot:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=1ee89902de184a640c171ae3285bff6882a791bd;hp=230399f9632c37b66c1c117a17e8327eae6b3235

rationnalize includes a lot:
that's very dirty, but lib-lib/lib-lib.h has a lot of commonly used
includes.

that saves a lot of things from the rest of the code.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/account.c b/account.c
index f13831e..73a036a 100644
--- a/account.c
+++ b/account.c
@@ -9,10 +9,6 @@
 
 /* remote host account manipulation (POP/IMAP) */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 #include <lib-ui/enter.h>
 
diff --git a/alias.c b/alias.c
index 907e743..70b3331 100644
--- a/alias.c
+++ b/alias.c
@@ -25,13 +25,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
diff --git a/attach.c b/attach.c
index a66665c..d32f80c 100644
--- a/attach.c
+++ b/attach.c
@@ -8,19 +8,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
diff --git a/base64.c b/base64.c
index a5e6cf3..9fdf037 100644
--- a/base64.c
+++ b/base64.c
@@ -39,10 +39,7 @@
  * 
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#include <lib-lib/lib-lib.h>
 #include <lib-mime/mime.h>
 
 #include "mutt.h"
diff --git a/browser.c b/browser.c
index 0db6801..09b85d1 100644
--- a/browser.c
+++ b/browser.c
@@ -7,22 +7,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <stdlib.h>
 #include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
 #include <pwd.h>
 #include <grp.h>
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
diff --git a/buffy.c b/buffy.c
index 2ada9b4..0db6026 100644
--- a/buffy.c
+++ b/buffy.c
@@ -10,19 +10,9 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <sys/stat.h>
+#include <lib-lib/lib-lib.h>
 #include <dirent.h>
 #include <utime.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/sidebar.h>
diff --git a/charset.c b/charset.c
index 8e79d13..32317b1 100644
--- a/charset.c
+++ b/charset.c
@@ -25,26 +25,13 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <ctype.h>
+#include <lib-lib/lib-lib.h>
 
 #include <sys/types.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <errno.h>
 #ifdef HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 #endif
 
-#include <lib-lib/lib-lib.h>
-
 #include "mutt.h"
 #include "charset.h"
 
diff --git a/commands.c b/commands.c
index 280a3fd..b649356 100644
--- a/commands.c
+++ b/commands.c
@@ -8,20 +8,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <utime.h>
-
 #include <lib-lib/lib-lib.h>
+#include <utime.h>
 
 #include <lib-mime/mime.h>
 
diff --git a/compose.c b/compose.c
index d93dbfd..08a95c8 100644
--- a/compose.c
+++ b/compose.c
@@ -11,17 +11,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
diff --git a/compress.c b/compress.c
index ed5da3e..6c801e8 100644
--- a/compress.c
+++ b/compress.c
@@ -7,11 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/mutt_signal.h>
diff --git a/copy.c b/copy.c
index 94d5d28..3a010d4 100644
--- a/copy.c
+++ b/copy.c
@@ -7,15 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
diff --git a/dotlock.c b/dotlock.c
index 118f531..3f55d40 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -8,23 +8,9 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <lib-lib/lib-lib.h>
 
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/utsname.h>
-#include <errno.h>
-#include <time.h>
-#include <fcntl.h>
-#include <limits.h>
 
 #ifndef _POSIX_PATH_MAX
 #include <posix1_lim.h>
@@ -55,12 +41,6 @@
 
 # endif
 
-# ifndef HAVE_SNPRINTF
-extern int snprintf (char *, size_t, const char *, ...);
-# endif
-
-#include <lib-lib/lib-lib.h>
-
 static int DotlockFlags;
 static int Retry = MAXLOCKATTEMPT;
 
diff --git a/editmsg.c b/editmsg.c
index 123ce7e..9dd05e1 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -9,22 +9,12 @@
 
 /* simple, editor-based message editing */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "copy.h"
 #include "mx.h"
 
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <time.h>
-
 /*
  * return value:
  * 
diff --git a/extlib.c b/extlib.c
index 9a80e4d..ea984e6 100644
--- a/extlib.c
+++ b/extlib.c
@@ -15,11 +15,7 @@
 #define WHERE
 #define _EXTLIB_C
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
+#include <lib-lib/lib-lib.h>
 #include "lib.h"
 
 void (*mutt_error) (const char *, ...) = mutt_nocurses_error;
diff --git a/flags.c b/flags.c
index 232508a..e00dc88 100644
--- a/flags.c
+++ b/flags.c
@@ -7,10 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
diff --git a/from.c b/from.c
index f71e8a0..5931789 100644
--- a/from.c
+++ b/from.c
@@ -7,13 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <string.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/handler.c b/handler.c
index 26d1a99..7f24f9d 100644
--- a/handler.c
+++ b/handler.c
@@ -7,17 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
diff --git a/hcache.c b/hcache.c
index 3902812..953e70f 100644
--- a/hcache.c
+++ b/hcache.c
@@ -8,22 +8,13 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
+
+#include <lib-lib/lib-lib.h>
 
 #ifdef USE_HCACHE
 
 #define MUTTNG_HCACHE_ID        "0x004"
 
-# ifdef HAVE_INTTYPES_H
-#  include <inttypes.h>
-# else
-#  ifdef HAVE_STDINT_H
-#   include <stdint.h>
-#  endif
-# endif
-
 #if defined(HAVE_QDBM)
 #include <depot.h>
 #include <cabin.h>
@@ -34,15 +25,7 @@
 #include <db.h>
 #endif
 
-#include <errno.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <lib-lib/lib-lib.h>
 #include <lib-hash/hash.h>
-
 #include <lib-mime/mime.h>
 
 #include "charset.h"
diff --git a/headers.c b/headers.c
index 058ec94..2446041 100644
--- a/headers.c
+++ b/headers.c
@@ -7,14 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
diff --git a/help.c b/help.c
index 4bd1b01..0fa80c1 100644
--- a/help.c
+++ b/help.c
@@ -9,15 +9,6 @@
 
 #define HELP_C
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <wctype.h>
-#include <wchar.h>
-#include <ctype.h>
-#include <string.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
diff --git a/hook.c b/hook.c
index 0a1084c..9bb2386 100644
--- a/hook.c
+++ b/hook.c
@@ -7,16 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-
 #include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
diff --git a/imap/auth.c b/imap/auth.c
index 8fae85b..143fde0 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -11,10 +11,6 @@
 
 /* IMAP login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index 7ae029f..47ccf40 100644
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -9,16 +9,12 @@
 
 /* IMAP login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"
 
-#include <lib-lib/lib-lib.h>
-
 /* this is basically a stripped-down version of the cram-md5 method. */
 imap_auth_res_t imap_auth_anon (IMAP_DATA * idata, const char *method __attribute__ ((unused)))
 {
diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 9ef4bb8..7e00d6c 100644
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -9,9 +9,7 @@
 
 /* IMAP login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "imap_private.h"
@@ -20,7 +18,6 @@
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16
 
-#include <lib-lib/lib-lib.h>
 #include <lib-hash/hash.h>
 
 /* forward declarations */
diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index a2783f9..e05062b 100644
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -9,14 +9,10 @@
 
 /* GSS login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef USE_GSS
 
-#include <lib-lib/lib-lib.h>
-
 #include <netinet/in.h>
 
 #ifdef HAVE_HEIMDAL
diff --git a/imap/auth_login.c b/imap/auth_login.c
index 2770331..cb3f5bb 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -9,10 +9,6 @@
 
 /* plain LOGIN support */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 20a39b9..54c972b 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -9,10 +9,6 @@
 
 /* SASL login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/imap/browse.c b/imap/browse.c
index 96eb8b9..46730fd 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -10,18 +10,10 @@
 
 /* Mutt browser support routines */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/enter.h>
 
-
 #include "mutt.h"
 #include "imap_private.h"
 
diff --git a/imap/command.c b/imap/command.c
index e53d378..83ebbe7 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -12,10 +12,6 @@
 /* command.c: routines for sending commands to an IMAP server and parsing
  *  responses */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/imap/imap.c b/imap/imap.c
index da965d9..3bb4f8a 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -11,17 +11,6 @@
 
 /* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/imap/message.c b/imap/message.c
index 466d2dc..8412c61 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -10,13 +10,6 @@
 
 /* message parsing/updating functions */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
@@ -31,12 +24,6 @@
 #include "pgp.h"
 #endif
 
-#if HAVE_STDINT_H
-#include <stdint.h>
-#elif HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 static void flush_buffer (char *buf, size_t * len, CONNECTION * conn);
 static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
                              FILE * fp);
diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index 0ee9d63..2d9e333 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -3,11 +3,6 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/stat.h>
 
 #include <lib-lib/lib-lib.h>
 
diff --git a/imap/utf7.c b/imap/utf7.c
index d1419e3..b21149b 100644
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -7,10 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/imap/util.c b/imap/util.c
index cce8594..d7837e1 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -11,28 +11,15 @@
 
 /* general IMAP utility functions */
 
-#include "config.h"
-
 #include <lib-lib/lib-lib.h>
+#include <signal.h>
+#include <netdb.h>
 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
 #include "imap_private.h"
 #include <lib-sys/mutt_ssl.h>
 
-#include <lib-lib/lib-lib.h>
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
-#include <errno.h>
-
 /* -- public functions -- */
 
 /* imap_expand_path: IMAP implementation of mutt_expand_path. Rewrite
diff --git a/init.c b/init.c
index 7e7b455..bf5c64a 100644
--- a/init.c
+++ b/init.c
@@ -10,19 +10,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/utsname.h>
-#include <errno.h>
-#include <sys/wait.h>
-
 #include <lib-lib/lib-lib.h>
+#include <sys/utsname.h>
 
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_ssl.h>
diff --git a/keymap.c b/keymap.c
index e80e5a3..51a296f 100644
--- a/keymap.c
+++ b/keymap.c
@@ -7,10 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
@@ -20,11 +16,6 @@
 #include "keymap.h"
 #include <lib-crypt/crypt.h>
 
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #define MUTT_FUNCTIONS_VALUES
 #include "functions.def"
 
diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index e6ad538..2711dd7 100644
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -12,37 +12,22 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef CRYPT_BACKEND_GPGME
 
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 #ifdef HAVE_LANGINFO_D_T_FMT
 #  include <langinfo.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 #endif
 
 #include <gpgme.h>
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
diff --git a/lib-crypt/crypt-mod-pgp-gpgme.c b/lib-crypt/crypt-mod-pgp-gpgme.c
index 977a8c1..f05487c 100644
--- a/lib-crypt/crypt-mod-pgp-gpgme.c
+++ b/lib-crypt/crypt-mod-pgp-gpgme.c
@@ -11,9 +11,7 @@
     This is a crytpo module wrapping the gpgme based pgp code.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef CRYPT_BACKEND_GPGME
 
diff --git a/lib-crypt/crypt-mod-smime-gpgme.c b/lib-crypt/crypt-mod-smime-gpgme.c
index 31e882f..9d24f04 100644
--- a/lib-crypt/crypt-mod-smime-gpgme.c
+++ b/lib-crypt/crypt-mod-smime-gpgme.c
@@ -11,9 +11,7 @@
     This is a crytpo module wrapping the gpgme based smime code.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef CRYPT_BACKEND_GPGME
 
diff --git a/lib-crypt/crypt-mod.c b/lib-crypt/crypt-mod.c
index eb406f4..d853535 100644
--- a/lib-crypt/crypt-mod.c
+++ b/lib-crypt/crypt-mod.c
@@ -7,10 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "crypt-mod.h"
diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 36fbcda..f5953bc 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -12,30 +12,15 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#include <lib-lib/lib-lib.h>
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 #endif
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
diff --git a/lib-crypt/cryptglue.c b/lib-crypt/cryptglue.c
index 019a339..860f8af 100644
--- a/lib-crypt/cryptglue.c
+++ b/lib-crypt/cryptglue.c
@@ -19,16 +19,10 @@
    contained in this file and the functions implemented by the crypto
    modules.  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "crypt.h"
-
-
 #include "crypt-mod.h"
 
 /*
diff --git a/lib-crypt/gnupgparse.c b/lib-crypt/gnupgparse.c
index 3db2f90..5943467 100644
--- a/lib-crypt/gnupgparse.c
+++ b/lib-crypt/gnupgparse.c
@@ -18,22 +18,8 @@
  * 
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
+
 #include <lib-mime/mime.h>
 #include <lib-sys/unix.h>
 #include <lib-ui/curses.h>
@@ -42,7 +28,6 @@
 #include "pgp.h"
 #include "charset.h"
 
-
 /****************
  * Read the GNUPG keys.  For now we read the complete keyring by
  * calling gnupg in a special mode.
diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 289ffc8..8875ed9 100644
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -17,12 +17,12 @@
  * a message.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
@@ -35,27 +35,6 @@
 #include "copy.h"
 #include "attach.h"
 
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-
 #include "crypt.h"
 
 
diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index 3235fae..1428e47 100644
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -11,20 +11,6 @@
  * is almost entirely format based.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index 76b39b8..ddb8f1c 100644
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -8,10 +8,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
@@ -26,16 +22,6 @@
 #include "pager.h"
 #include "sort.h"
 
-
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <locale.h>
-
 struct pgp_cache {
   char *what;
   char *dflt;
diff --git a/lib-crypt/pgplib.c b/lib-crypt/pgplib.c
index 2532db5..923aa14 100644
--- a/lib-crypt/pgplib.c
+++ b/lib-crypt/pgplib.c
@@ -9,16 +9,6 @@
 
 /* Generally useful, pgp-related functions. */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/lib-crypt/pgpmicalg.c b/lib-crypt/pgpmicalg.c
index a2d89db..c070173 100644
--- a/lib-crypt/pgpmicalg.c
+++ b/lib-crypt/pgpmicalg.c
@@ -11,9 +11,7 @@
  * algorithm.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "handler.h"
@@ -21,12 +19,6 @@
 #include "pgppacket.h"
 #include "charset.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
 #include <lib-mime/mime.h>
diff --git a/lib-crypt/pgppacket.c b/lib-crypt/pgppacket.c
index 518c11e..d003154 100644
--- a/lib-crypt/pgppacket.c
+++ b/lib-crypt/pgppacket.c
@@ -7,16 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
-
 #include <lib-lib/lib-lib.h>
 #include <lib-hash/hash.h>
 
diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index 7932525..24ed09a 100644
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -9,30 +9,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#include <lib-lib/lib-lib.h>
 
-#ifdef HAVE_LOCALE_H
-#  include <locale.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 #endif
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
diff --git a/lib-hash/sha1.c b/lib-hash/sha1.c
index 4a5bedb..90a16db 100644
--- a/lib-hash/sha1.c
+++ b/lib-hash/sha1.c
@@ -15,14 +15,9 @@
  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
 */
 
+#include <lib-lib/lib-lib.h>
 #define SHA1HANDSOFF
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-
 #include "sha1.h"
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
diff --git a/lib-lib/ascii.c b/lib-lib/ascii.c
index bdc63a5..73ffbc8 100644
--- a/lib-lib/ascii.c
+++ b/lib-lib/ascii.c
@@ -25,9 +25,7 @@
  * Versions of the string comparison functions which are locale-insensitive.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "ascii.h"
+#include "lib-lib.h"
 
 int ascii_strcasecmp(const char *a, const char *b)
 {
diff --git a/lib-lib/buffer.c b/lib-lib/buffer.c
index e1327c8..f186bfd 100644
--- a/lib-lib/buffer.c
+++ b/lib-lib/buffer.c
@@ -26,15 +26,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "mem.h"
-#include "str.h"
-#include "ascii.h"
-#include "buffer.h"
-#include "file.h"
+#include "lib-lib.h"
 
 /*
  * Creates and initializes a BUFFER*. If passed an existing BUFFER*,
diff --git a/lib-lib/buffer.h b/lib-lib/buffer.h
index f459618..a0c4588 100644
--- a/lib-lib/buffer.h
+++ b/lib-lib/buffer.h
@@ -29,8 +29,6 @@
 #ifndef MUTT_LIB_LIB_BUFFER_H
 #define MUTT_LIB_LIB_BUFFER_H
 
-#include "str.h"
-
 typedef struct {
     char *data;          /* pointer to data */
     char *dptr;          /* current read/write position */
diff --git a/lib-lib/date.c b/lib-lib/date.c
index 4bc6873..8fa90c6 100644
--- a/lib-lib/date.c
+++ b/lib-lib/date.c
@@ -26,7 +26,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include "date.h"
+#include "lib-lib.h"
 
 /* returns the seconds east of UTC given `g' and its corresponding gmtime()
    representation */
diff --git a/lib-lib/date.h b/lib-lib/date.h
index b31800a..a1182f4 100644
--- a/lib-lib/date.h
+++ b/lib-lib/date.h
@@ -20,8 +20,6 @@
 #ifndef MUTT_LIB_LIB_DATE_H
 #define MUTT_LIB_LIB_DATE_H
 
-#include <time.h>
-
 time_t mutt_local_tz(time_t);
 time_t mutt_mktime(struct tm *, int);
 void mutt_normalize_time(struct tm *);
diff --git a/lib-lib/file.c b/lib-lib/file.c
index 67b1d74..66a2028 100644
--- a/lib-lib/file.c
+++ b/lib-lib/file.c
@@ -26,17 +26,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <limits.h>
-
-#include "macros.h"
-#include "mem.h"
-#include "str.h"
-#include "file.h"
+#include "lib-lib.h"
 
 #ifndef O_NOFOLLOW
 #  define O_NOFOLLOW  0
diff --git a/lib-lib/file.h b/lib-lib/file.h
index 9d6ca73..c73f78e 100644
--- a/lib-lib/file.h
+++ b/lib-lib/file.h
@@ -33,9 +33,6 @@
 #ifndef MUTT_LIB_LIB_FILE_H
 #define MUTT_LIB_LIB_FILE_H
 
-#include <stdio.h>
-#include <stdlib.h>
-
 /****************************************************************************/
 /* fd ops                                                                   */
 /****************************************************************************/
diff --git a/lib-lib/hash.c b/lib-lib/hash.c
index 61e2e4f..5520389 100644
--- a/lib-lib/hash.c
+++ b/lib-lib/hash.c
@@ -22,13 +22,7 @@
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "mem.h"
-#include "str.h"
-#include "hash.h"
+#include "lib-lib.h"
 
 #define SOMEPRIME 149711
 
diff --git a/lib-lib/lib-lib.h b/lib-lib/lib-lib.h
index 5f8974d..e969bb5 100644
--- a/lib-lib/lib-lib.h
+++ b/lib-lib/lib-lib.h
@@ -20,10 +20,51 @@
 #ifndef MUTT_LIB_LIB_LIB_LIB_H
 #define MUTT_LIB_LIB_LIB_LIB_H
 
+#if HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <regex.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
+#elif HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 #include "macros.h"
 #include "mem.h"
 
 #include "ascii.h"
+#include "str.h"
 #include "buffer.h"
 #include "date.h"
 #include "file.h"
@@ -31,7 +72,6 @@
 #include "list.h"
 #include "mapping.h"
 #include "rx.h"
-#include "str.h"
 #include "url.h"
 
 #endif
diff --git a/lib-lib/list.c b/lib-lib/list.c
index 83123a5..c2c4f77 100644
--- a/lib-lib/list.c
+++ b/lib-lib/list.c
@@ -22,12 +22,7 @@
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  */
 
-#include <stdlib.h>
-#include <string.h>
-
-#include "mem.h"
-#include "str.h"
-#include "list.h"
+#include "lib-lib.h"
 
 string_list_t *string_list_dup(const string_list_t *p) {
     string_list_t *res = NULL;
diff --git a/lib-lib/list.h b/lib-lib/list.h
index 2dac0f8..b1b612e 100644
--- a/lib-lib/list.h
+++ b/lib-lib/list.h
@@ -25,9 +25,6 @@
 #ifndef MUTT_LIB_LIB_LIST_H
 #define MUTT_LIB_LIB_LIST_H
 
-#include "mem.h"
-#include "str.h"
-
 #define DO_SLIST(type, prefix, dtor)                                         \
     static inline type *prefix##_list_pop(type **list) {                     \
         if (*list) {                                                         \
diff --git a/lib-lib/mapping.c b/lib-lib/mapping.c
index d8d8200..f446ffd 100644
--- a/lib-lib/mapping.c
+++ b/lib-lib/mapping.c
@@ -29,10 +29,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <stdlib.h>
-
-#include "mapping.h"
-#include "ascii.h"
+#include "lib-lib.h"
 
 const char *mutt_getnamebyvalue(int val, const struct mapping_t *map)
 {
diff --git a/lib-lib/mem.h b/lib-lib/mem.h
index 9ff2589..ca9712b 100644
--- a/lib-lib/mem.h
+++ b/lib-lib/mem.h
@@ -20,10 +20,6 @@
 #ifndef MUTT_LIB_LIB_MEM_H
 #define MUTT_LIB_LIB_MEM_H
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #define ssizeof(foo)            (ssize_t)sizeof(foo)
 #define countof(foo)            (ssizeof(foo) / ssizeof(foo[0]))
 
diff --git a/lib-lib/rx.c b/lib-lib/rx.c
index f2b6720..521376f 100644
--- a/lib-lib/rx.c
+++ b/lib-lib/rx.c
@@ -22,11 +22,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <lib-lib/lib-lib.h>
+#include "lib-lib.h"
 
 rx_t *rx_compile(const char *s, int flags)
 {
diff --git a/lib-lib/rx.h b/lib-lib/rx.h
index 0341a19..d12fe85 100644
--- a/lib-lib/rx.h
+++ b/lib-lib/rx.h
@@ -29,9 +29,6 @@
 #ifndef MUTT_LIB_LIB_RX_H
 #define MUTT_LIB_LIB_RX_H
 
-#include <sys/types.h>
-#include <regex.h>
-
 #include "../lib/list.h"
 
 /* this is a non-standard option supported by Solaris 2.5.x which allows
diff --git a/lib-lib/str.c b/lib-lib/str.c
index a5333e4..f55aa45 100644
--- a/lib-lib/str.c
+++ b/lib-lib/str.c
@@ -17,8 +17,7 @@
  *  Copyright © 2006 Pierre Habouzit
  */
 
-#include "macros.h"
-#include "str.h"
+#include "lib-lib.h"
 
 #define XX 255
 unsigned char const __m_strdigits[128] = {
diff --git a/lib-lib/str.h b/lib-lib/str.h
index 4786d27..c9c8c90 100644
--- a/lib-lib/str.h
+++ b/lib-lib/str.h
@@ -20,11 +20,6 @@
 #ifndef MUTT_LIB_LIB_STR_H
 #define MUTT_LIB_LIB_STR_H
 
-#include <string.h>
-#include <ctype.h>
-
-#include "mem.h"
-
 #define HUGE_STRING     5120
 #define LONG_STRING     1024
 #define STRING          256
diff --git a/lib-lib/url.c b/lib-lib/url.c
index a5ee410..4829aa5 100644
--- a/lib-lib/url.c
+++ b/lib-lib/url.c
@@ -29,14 +29,7 @@
  * A simple URL parser.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include <lib-lib/lib-lib.h>
+#include "lib-lib.h"
 
 static struct mapping_t UrlMap[] = {
     {"file",   U_FILE},
diff --git a/lib-lib/url.h b/lib-lib/url.h
index 3078ebd..74a0e2a 100644
--- a/lib-lib/url.h
+++ b/lib-lib/url.h
@@ -25,8 +25,6 @@
 #ifndef MUTT_LIB_LIB_URL_H
 #define MUTT_LIB_LIB_URL_H
 
-#include <unistd.h>
-
 typedef enum url_scheme {
     U_FILE,
     U_POP,
diff --git a/lib-mime/rfc1524.c b/lib-mime/rfc1524.c
index de7ec11..456e04c 100644
--- a/lib-mime/rfc1524.c
+++ b/lib-mime/rfc1524.c
@@ -35,19 +35,6 @@
  * rfc1524.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <unistd.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
diff --git a/lib-mime/rfc2047.c b/lib-mime/rfc2047.c
index 5b68921..208d932 100644
--- a/lib-mime/rfc2047.c
+++ b/lib-mime/rfc2047.c
@@ -34,13 +34,6 @@
 #include "charset.h"
 #include "thread.h"
 
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 /* If you are debugging this file, comment out the following line. */
 /*#define NDEBUG*/
 
diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index 6bbd39a..e28be69 100644
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -36,10 +36,6 @@
  *
  */
 
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index 1868091..7350188 100644
--- a/lib-mime/rfc3676.c
+++ b/lib-mime/rfc3676.c
@@ -9,17 +9,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
diff --git a/lib-mime/rfc822address.c b/lib-mime/rfc822address.c
index cf88c95..6c11e63 100644
--- a/lib-mime/rfc822address.c
+++ b/lib-mime/rfc822address.c
@@ -26,10 +26,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt_idna.h"
diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index e399bb7..65b03b4 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -26,12 +26,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "recvattach.h"
diff --git a/lib-sys/exit.c b/lib-sys/exit.c
index 01a23e5..d762cf9 100644
--- a/lib-sys/exit.c
+++ b/lib-sys/exit.c
@@ -26,18 +26,14 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <stdlib.h>
 #ifdef HAVE_SYSEXITS_H
 #include <sysexits.h>
 #else /* Make sure EX_OK is defined <philiph@pobox.com> */
 #define EX_OK 0
 #endif
 
-#include <lib-lib/lib-lib.h>
 
 #include "exit.h"
 
diff --git a/lib-sys/filter.c b/lib-sys/filter.c
index e324a94..75e21b8 100644
--- a/lib-sys/filter.c
+++ b/lib-sys/filter.c
@@ -7,15 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <stdio.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt_signal.h"
diff --git a/lib-sys/mutt_signal.c b/lib-sys/mutt_signal.c
index 55b3f02..4807fa1 100644
--- a/lib-sys/mutt_signal.c
+++ b/lib-sys/mutt_signal.c
@@ -7,15 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <errno.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
diff --git a/lib-sys/mutt_socket.c b/lib-sys/mutt_socket.c
index f6319f0..fa054ae 100644
--- a/lib-sys/mutt_socket.c
+++ b/lib-sys/mutt_socket.c
@@ -9,21 +9,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <string.h>
-#include <errno.h>
 
-#include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
diff --git a/lib-sys/mutt_ssl.c b/lib-sys/mutt_ssl.c
index 1557a8f..9d658d4 100644
--- a/lib-sys/mutt_ssl.c
+++ b/lib-sys/mutt_ssl.c
@@ -7,9 +7,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef USE_SSL
 
@@ -18,10 +16,6 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#include <string.h>
-
-#include <lib-lib/lib-lib.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
 
diff --git a/lib-sys/mutt_ssl_gnutls.c b/lib-sys/mutt_ssl_gnutls.c
index 7fc5eda..cd48e19 100644
--- a/lib-sys/mutt_ssl_gnutls.c
+++ b/lib-sys/mutt_ssl_gnutls.c
@@ -8,9 +8,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef USE_GNUTLS
 
@@ -20,8 +18,6 @@
 #include <gnutls/openssl.h>
 #endif
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
 
diff --git a/lib-sys/mutt_tunnel.c b/lib-sys/mutt_tunnel.c
index 4d58591..fab888f 100644
--- a/lib-sys/mutt_tunnel.c
+++ b/lib-sys/mutt_tunnel.c
@@ -8,18 +8,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <errno.h>
 
-#include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
diff --git a/lib-sys/unix.c b/lib-sys/unix.c
index 30a75dc..62a2f1e 100644
--- a/lib-sys/unix.c
+++ b/lib-sys/unix.c
@@ -8,12 +8,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "unix.h"
diff --git a/lib-ui/color.c b/lib-ui/color.c
index ff90ff1..21b93f4 100644
--- a/lib-ui/color.c
+++ b/lib-ui/color.c
@@ -7,14 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "curses.h"
diff --git a/lib-ui/complete.c b/lib-ui/complete.c
index 06e70c3..bb0976c 100644
--- a/lib-ui/complete.c
+++ b/lib-ui/complete.c
@@ -7,16 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <dirent.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index de14e59..fb65b64 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -11,27 +11,13 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <wchar.h>
-#include <wctype.h>
 #include <termios.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
 #ifdef HAVE_LANGINFO_YESEXPR
 #include <langinfo.h>
 #endif
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_signal.h>
 
diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 5edd752..bc868e3 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -10,18 +10,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <errno.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/sidebar.h>
diff --git a/lib-ui/enter.c b/lib-ui/enter.c
index 39e0100..7623212 100644
--- a/lib-ui/enter.c
+++ b/lib-ui/enter.c
@@ -8,13 +8,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <wctype.h>
-#include <wchar.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "curses.h"
diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index 5797c22..25ccce1 100644
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -7,15 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
diff --git a/lib-ui/history.c b/lib-ui/history.c
index a50c00c..b70dd90 100644
--- a/lib-ui/history.c
+++ b/lib-ui/history.c
@@ -7,10 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index b125d3c..a99646f 100644
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -7,14 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "curses.h"
diff --git a/lib-ui/query.c b/lib-ui/query.c
index 11fa388..b76eb18 100644
--- a/lib-ui/query.c
+++ b/lib-ui/query.c
@@ -7,15 +7,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
+
 #include <lib-sys/unix.h>
 
 #include <lib-ui/menu.h>
diff --git a/lib-ui/resize.c b/lib-ui/resize.c
index 82fe316..74cd58c 100644
--- a/lib-ui/resize.c
+++ b/lib-ui/resize.c
@@ -7,29 +7,20 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #if defined(USE_SLANG_CURSES) || defined(HAVE_RESIZETERM)
 
-#include <lib-ui/curses.h>
-
-#include "mutt.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <termios.h>
-
 #ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#else
-# ifdef HAVE_IOCTL_H
-# include <ioctl.h>
-# endif
+#  include <sys/ioctl.h>
+#elif defined(HAVE_IOCTL_H)
+#  include <ioctl.h>
 #endif
 
+#include <lib-ui/curses.h>
+#include "mutt.h"
+
 /* this routine should be called after receiving SIGWINCH */
 void mutt_resize_screen (void)
 {
diff --git a/lib-ui/sidebar.c b/lib-ui/sidebar.c
index 1a45558..464a5c4 100644
--- a/lib-ui/sidebar.c
+++ b/lib-ui/sidebar.c
@@ -12,10 +12,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <libgen.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
+#include <libgen.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
diff --git a/lib-ui/status.c b/lib-ui/status.c
index 0f918fd..2dbf7e7 100644
--- a/lib-ui/status.c
+++ b/lib-ui/status.c
@@ -7,10 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
@@ -21,11 +17,6 @@
 #include "mx.h"
 #include "buffy.h"
 
-
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
 static char *get_sort_str (char *buf, ssize_t buflen, int method)
diff --git a/lib.c b/lib.c
index 7dd53a0..2bc65ce 100644
--- a/lib.c
+++ b/lib.c
@@ -8,12 +8,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
+#include <lib-lib/lib-lib.h>
 
 #include "lib.h"
 
diff --git a/lib/list.c b/lib/list.c
index c3c9952..0b852e0 100644
--- a/lib/list.c
+++ b/lib/list.c
@@ -7,14 +7,9 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <stddef.h>
-#include <string.h>
-
 #include <lib-lib/lib-lib.h>
-
 #include "list.h"
 
-
 list2_t* list_new (void) {
   return p_new(list2_t, 1);
 }
diff --git a/main.c b/main.c
index e097503..4551a3d 100644
--- a/main.c
+++ b/main.c
@@ -15,20 +15,10 @@
 
 #define MAIN_C 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
 #include <sys/utsname.h>
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-sys/mutt_signal.h>
 
 #include <lib-mime/mime.h>
diff --git a/makedoc.c b/makedoc.c
index 0363a46..98fd035 100644
--- a/makedoc.c
+++ b/makedoc.c
@@ -21,22 +21,8 @@
  **
  **/
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <errno.h>
 #include <lib-lib/lib-lib.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #endif
diff --git a/mbox.c b/mbox.c
index d4125b0..9663888 100644
--- a/mbox.c
+++ b/mbox.c
@@ -9,22 +9,9 @@
 
 /* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/stat.h>
-#include <dirent.h>
-#include <string.h>
-#include <utime.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-
 #include <lib-lib/lib-lib.h>
-#include <lib-ui/curses.h>
 
+#include <lib-ui/curses.h>
 #include <lib-sys/mutt_signal.h>
 
 #include "mutt.h"
diff --git a/mh.c b/mh.c
index e03762a..f40bbd1 100644
--- a/mh.c
+++ b/mh.c
@@ -13,29 +13,9 @@
  * mailboxes.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
+#include <lib-lib/lib-lib.h>
 #include <utime.h>
 
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
diff --git a/mutt_idna.c b/mutt_idna.c
index acfb102..4f2db0f 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -7,16 +7,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
 #ifdef HAVE_LIBIDN
 #include <idna.h>
 #endif
 
-#include <lib-lib/lib-lib.h>
-
 #include "mutt.h"
 #include "charset.h"
 #include "mutt_idna.h"
diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index fe256f6..98533e7 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -10,11 +10,6 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdarg.h>
 
 #include <lib-lib/lib-lib.h>
 
@@ -27,8 +22,6 @@
 #include <openssl/ssl.h>
 #endif
 
-#include <errno.h>
-
 #include <auth-client.h>
 #include <libesmtp.h>
 
diff --git a/mutt_sasl.c b/mutt_sasl.c
index 126504c..4ff580a 100644
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -9,17 +9,13 @@
 
 /* common SASL helper routines */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <errno.h>
 #include <netdb.h>
 #include <sasl/sasl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 #include <lib-sys/mutt_socket.h>
 
diff --git a/muttlib.c b/muttlib.c
index 0e396e6..8a9e34d 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -8,26 +8,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <grp.h>
 #include <pwd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <unistd.h>
 #include <utime.h>
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
diff --git a/mx.c b/mx.c
index 8b9eedd..1d5a750 100644
--- a/mx.c
+++ b/mx.c
@@ -8,27 +8,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include <utime.h>
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-sys/unix.h>
-
 #include <lib-mime/mime.h>
-
 #include <lib-ui/sidebar.h>
 
 #include "mutt.h"
diff --git a/nntp/mx_nntp.c b/nntp/mx_nntp.c
index 20d55d8..8943c9f 100644
--- a/nntp/mx_nntp.c
+++ b/nntp/mx_nntp.c
@@ -3,11 +3,6 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/stat.h>
 
 #include <lib-lib/lib-lib.h>
 
@@ -17,8 +12,6 @@
 #include "mx.h"
 #include "mx_nntp.h"
 
-
-
 static int nntp_is_magic (const char* path, struct stat* st) {
   url_scheme_t s = url_check_scheme (NONULL (path));
   return ((s == U_NNTP || s == U_NNTPS) ? M_NNTP : -1);
diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 1a868bd..1499ba8 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -9,21 +9,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
 #include <libgen.h>
-#include <sys/stat.h>
-
-#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
diff --git a/nntp/nntp.c b/nntp/nntp.c
index 93ad37b..4f3c812 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -9,19 +9,9 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/sidebar.h>
 
diff --git a/pager.c b/pager.c
index b486021..cbdc8fa 100644
--- a/pager.c
+++ b/pager.c
@@ -11,19 +11,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <wchar.h>
-#include <wctype.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
diff --git a/pattern.c b/pattern.c
index 26b8375..392a4a6 100644
--- a/pattern.c
+++ b/pattern.c
@@ -7,21 +7,9 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdarg.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/enter.h>
 #include <lib-ui/curses.h>
 
diff --git a/pgppubring.c b/pgppubring.c
index 2f2433c..cbac932 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -22,25 +22,16 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
+
 #include <lib-hash/hash.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #else
 extern char *optarg;
 extern int optind;
 #endif
-#include <errno.h>
 
 short Umask;   /* dirty hack because we need Umask in lib.c but don't want globals.h there */
 
diff --git a/pop/mx_pop.c b/pop/mx_pop.c
index 0c11d64..fd4ab46 100644
--- a/pop/mx_pop.c
+++ b/pop/mx_pop.c
@@ -3,17 +3,11 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/stat.h>
 
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "pop.h"
-
 #include "mx.h"
 #include "mx_pop.h"
 
diff --git a/pop/pop.c b/pop/pop.c
index 8610713..b00274a 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -7,13 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index cca0e0c..2743910 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -7,21 +7,14 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
+
 #include <lib-hash/hash.h>
 
 #include "mutt.h"
 #include "mx.h"
 #include "pop.h"
 
-
-#include <string.h>
-#include <unistd.h>
-
 #ifdef USE_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index e780215..02c8060 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -7,14 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/postpone.c b/postpone.c
index 9b4e0a6..5fa0971 100644
--- a/postpone.c
+++ b/postpone.c
@@ -8,15 +8,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
diff --git a/recvattach.c b/recvattach.c
index c2fec5e..07905f9 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -8,10 +8,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
@@ -29,14 +25,6 @@
 #include <lib-crypt/crypt.h>
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
diff --git a/recvcmd.c b/recvcmd.c
index d7234f9..4e37015 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -7,10 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
diff --git a/remailer.c b/remailer.c
index fa23865..a7b385b 100644
--- a/remailer.c
+++ b/remailer.c
@@ -11,21 +11,9 @@
  * Mixmaster support for Mutt
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
 
diff --git a/score.c b/score.c
index 061d84c..f782391 100644
--- a/score.c
+++ b/score.c
@@ -7,18 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "sort.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 typedef struct score_t {
   char *str;
   pattern_t *pat;
diff --git a/send.c b/send.c
index 4039463..27db967 100644
--- a/send.c
+++ b/send.c
@@ -7,27 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <dirent.h>
-#include <time.h>
-#include <sys/types.h>
-#include <utime.h>
-
 #include <lib-lib/lib-lib.h>
+#include <utime.h>
 
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
-
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 
diff --git a/sendlib.c b/sendlib.c
index 3759212..ef2b9da 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -9,28 +9,14 @@
 
 #define _SENDLIB_C 1
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/stat.h>
 #include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
 #include <sys/utsname.h>
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-sys/exit.h>
 #include <lib-sys/mutt_signal.h>
-
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
diff --git a/sort.c b/sort.c
index 2b70001..e758174 100644
--- a/sort.c
+++ b/sort.c
@@ -7,15 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
diff --git a/state.c b/state.c
index 2f0c8f7..1d41017 100644
--- a/state.c
+++ b/state.c
@@ -6,13 +6,8 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/rfc3676.h>
 
diff --git a/thread.c b/thread.c
index 57cfada..09bd915 100644
--- a/thread.c
+++ b/thread.c
@@ -7,20 +7,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "sort.h"
 #include "thread.h"
 
-
-#include <string.h>
-#include <ctype.h>
-
 #define VISIBLE(hdr, ctx) (hdr->virtual >= 0 || (hdr->collapsed && (!ctx->pattern || hdr->limited)))
 
 /* determine whether a is a descendant of b */