X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=mutt.h;h=5931f2f4c592f68643181f3f44899716fd0f3111;hb=230399f9632c37b66c1c117a17e8327eae6b3235;hp=6e1726a3865dcb4b9dab0be485d8b9a3896ed8f1;hpb=711f787502b6a1a1c150b948a5ed9156c8ef9ba1;p=apps%2Fmadmutt.git

diff --git a/mutt.h b/mutt.h
index 6e1726a..5931f2f 100644
--- a/mutt.h
+++ b/mutt.h
@@ -11,37 +11,19 @@
 #ifndef _MUTT_H
 #define _MUTT_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>            /* needed for SEEK_SET */
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <signal.h>
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-#if defined(HAVE_WCTYPE_H) && defined(HAVE_WC_FUNCS)
-# include <wctype.h>
-#endif
 
 #ifndef _POSIX_PATH_MAX
 #include <posix1_lim.h>
 #endif
 
-#include <pwd.h>
-#include <grp.h>
-
-#include <lib-lib/buffer.h>
-#include <lib-lib/hash.h>
-#include <lib-lib/list.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
 
@@ -446,7 +428,6 @@ enum {
 
   OPTAUXSORT,                   /* (pseudo) using auxillary sort function */
   OPTFORCEREFRESH,              /* (pseudo) refresh even during macros */
-  OPTLOCALES,                   /* (pseudo) set if user has valid locale definition */
   OPTNOCURSES,                  /* (pseudo) when sending in batch mode */
   OPTNEEDREDRAW,                /* (pseudo) to notify caller of a submenu */
   OPTSEARCHREVERSE,             /* (pseudo) used by ci_search_command */
@@ -604,7 +585,6 @@ typedef struct {
 #define M_PARTS_RECOUNT (1<<1) /* force recount */
 
 #include "protos.h"
-#include "lib.h"
 #include "globals.h"
 
 #endif /* !_MUTT_H */