diff --git a/cf/broken.m4 b/cf/broken.m4
index 34cc082ad..cd3598760 100644
--- a/cf/broken.m4
+++ b/cf/broken.m4
@@ -10,10 +10,9 @@ do
 AC_CHECK_FUNC($ac_func, [
 ac_tr_func=HAVE_[]upcase($ac_func)
 AC_DEFINE_UNQUOTED($ac_tr_func)],[LIBOBJS[]="$LIBOBJS ${ac_func}.o"])
-dnl autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs $1"@@@
-END
+if false; then
+	AC_CHECK_FUNCS($1)
+fi
 done
 AC_SUBST(LIBOBJS)dnl
 ])
diff --git a/cf/find-func-no-libs2.m4 b/cf/find-func-no-libs2.m4
index 1a31b3b32..2eddca85f 100644
--- a/cf/find-func-no-libs2.m4
+++ b/cf/find-func-no-libs2.m4
@@ -28,12 +28,10 @@ fi
 
 eval "ac_res=\$ac_cv_funclib_$1"
 
-dnl autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs $1"@@@
-@@@libs="$libs $2"@@@
-END
-
+if false; then
+	AC_CHECK_FUNCS($1)
+dnl	AC_CHECK_LIBS($2, foo)
+fi
 # $1
 eval "ac_tr_func=HAVE_[]upcase($1)"
 eval "ac_tr_lib=HAVE_LIB[]upcase($ac_res | sed -e 's/-l//')"
diff --git a/cf/have-type.m4 b/cf/have-type.m4
index a9facdfa6..f88e45f5a 100644
--- a/cf/have-type.m4
+++ b/cf/have-type.m4
@@ -18,15 +18,13 @@ $2],
 [$1 foo;],
 eval "ac_cv_type_$cv=yes",
 eval "ac_cv_type_$cv=no"))dnl
-AC_MSG_RESULT(`eval echo \\$ac_cv_type_$cv`)
-if test `eval echo \\$ac_cv_type_$cv` = yes; then
+ac_foo=`eval echo \\$ac_cv_type_$cv`
+AC_MSG_RESULT($ac_foo)
+if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-dnl autoheader tricks *sigh*
-define(foo,translit($1, [ ], [_]))
-: << END
-@@@funcs="$funcs foo"@@@
-END
-undefine([foo])
-  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1)
+if false; then
+	AC_CHECK_TYPES($1)
+fi
+  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
 fi
 ])
diff --git a/cf/have-types.m4 b/cf/have-types.m4
index 65f7be4db..8e05abe17 100644
--- a/cf/have-types.m4
+++ b/cf/have-types.m4
@@ -6,9 +6,7 @@ AC_DEFUN(AC_HAVE_TYPES, [
 for i in $1; do
         AC_HAVE_TYPE($i)
 done
-: << END
-changequote(`,')dnl
-@@@funcs="$funcs $1"@@@
-changequote([,])dnl
-END
+if false;then
+	AC_CHECK_FUNCS($1)
+fi
 ])