From 978f2191747201fa651b731fe619bda35a851b0e Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Sat, 5 Feb 2005 14:11:36 +0000
Subject: [PATCH] Remove a number of unnecessary config.h includes, and add
 some missing ones.  May fix some bugs.

---
 crypthash.h  | 2 --
 imap/util.c  | 2 ++
 lib.h        | 2 --
 mbyte.h      | 2 --
 mutt_idna.h  | 1 -
 patchlist.sh | 4 +++-
 remailer.h   | 2 --
 rfc822.h     | 2 --
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/crypthash.h b/crypthash.h
index a2545b8e9..d8e3a572e 100644
--- a/crypthash.h
+++ b/crypthash.h
@@ -1,8 +1,6 @@
 #ifndef _CRYPTHASH_H
 # define _CRYPTHASH_H
 
-# include "config.h"
-
 
 # include <sys/types.h>
 # if HAVE_INTTYPES_H
diff --git a/imap/util.c b/imap/util.c
index 6f435593f..96c8caf8e 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -20,6 +20,8 @@
 
 /* general IMAP utility functions */
 
+#include "config.h"
+
 #include "mutt.h"
 #include "mx.h"	/* for M_IMAP */
 #include "url.h"
diff --git a/lib.h b/lib.h
index 358fa7239..f5fb94e98 100644
--- a/lib.h
+++ b/lib.h
@@ -25,8 +25,6 @@
 #ifndef _LIB_H
 # define _LIB_H
 
-# include "config.h"
-
 # include <stdio.h>
 # include <string.h>
 # ifdef HAVE_UNISTD_H
diff --git a/mbyte.h b/mbyte.h
index 797a2da7f..dc5ed9999 100644
--- a/mbyte.h
+++ b/mbyte.h
@@ -1,8 +1,6 @@
 #ifndef _MBYTE_H
 # define _MBYTE_H
 
-# include "config.h"
-
 # ifdef HAVE_WC_FUNCS
 #  ifdef HAVE_WCHAR_H
 #   include <wchar.h>
diff --git a/mutt_idna.h b/mutt_idna.h
index 0e2534a8f..4b4851629 100644
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -19,7 +19,6 @@
 #ifndef _MUTT_IDNA_H
 # define _MUTT_IDNA_H
 
-#include "config.h"
 #include "rfc822.h"
 #include "charset.h"
 
diff --git a/patchlist.sh b/patchlist.sh
index 9cefc141b..1f1f185c4 100755
--- a/patchlist.sh
+++ b/patchlist.sh
@@ -1,7 +1,9 @@
 #!/bin/sh --
 
 cat <<EOF
-/* this is an autogenerated file.  do not edit. */
+/* this is an autogenerated file.  edit patchlist.sh instead. */
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/remailer.h b/remailer.h
index 0ff0e973f..c7469170a 100644
--- a/remailer.h
+++ b/remailer.h
@@ -23,8 +23,6 @@
  * Mixmaster support for Mutt
  */
 
-#include "config.h"
-
 #ifdef MIXMASTER
 
 #define MIX_CAP_COMPRESS  (1 << 0)
diff --git a/rfc822.h b/rfc822.h
index 1e703e35a..d141ba89d 100644
--- a/rfc822.h
+++ b/rfc822.h
@@ -19,8 +19,6 @@
 #ifndef rfc822_h
 #define rfc822_h
 
-#include "config.h"
-
 /* possible values for RFC822Error */
 enum
 {
-- 
2.40.0