diff -u -Naur mutt-1.4.2.1/configure mutt-1.4.2.1.fink/configure
--- mutt-1.4.2.1/configure	Thu Feb 12 03:51:57 2004
+++ mutt-1.4.2.1.fink/configure	Fri Apr 23 14:27:28 2004
@@ -564,7 +564,7 @@
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_compile='${CC-cc} -c -no-cpp-precomp $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
@@ -5701,7 +5701,7 @@
 
 
 if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
-        CFLAGS="-Wall -pedantic $CFLAGS"
+        CFLAGS="-Wall $CFLAGS"
 fi
 
 # Check whether --enable-nfs-fix or --disable-nfs-fix was given.
--- mutt-1.4.2.1/keymap.h	2001-09-11 13:20:34.000000000 +0200
+++ mutt-1.4.2.1/keymap-patched.h	2005-06-28 07:23:33.000000000 +0200
@@ -18,6 +18,7 @@
 
 #ifndef KEYMAP_H
 #define KEYMAP_H
+#include "mapping.h"
 
 /* maximal length of a key binding sequence used for buffer in km_bindkey */
 #define MAX_SEQ 8