diff --git a/config.h.in b/config.h.in
index 9075a486..9a9c1517 100644
--- a/config.h.in
+++ b/config.h.in
@@ -18,9 +18,6 @@
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #undef TIME_WITH_SYS_TIME
 
@@ -51,15 +48,6 @@
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 
-/* Define if you have the <memory.h> header file.  */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the <stdarg.h> header file.  */
-#undef HAVE_STDARG_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
diff --git a/configure b/configure
index 9f0739b0..7b5952fa 100755
--- a/configure
+++ b/configure
@@ -3696,9 +3696,11 @@ _ACEOF
 
 fi
 
-
-
-
+if test $ac_cv_header_stdc != yes; then
+	{ { echo "$as_me:$LINENO: error: Need ANSI C compiler" >&5
+echo "$as_me: error: Need ANSI C compiler" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 
 
@@ -3712,9 +3714,6 @@ for ac_header in fcntl.h \
 	limits.h \
 	time.h \
 	sys/time.h \
-	memory.h \
-	string.h \
-	stdarg.h \
 	sys/select.h \
 	unistd.h \
 	dlfcn.h \
@@ -5735,7 +5734,7 @@ echo "$as_me:$LINENO: checking compiler flags for a dynamic object" >&5
 echo $ECHO_N "checking compiler flags for a dynamic object... $ECHO_C" >&6
 
 cat > conftest.$ac_ext <<EOF
-#line 5738 "configure"
+#line 5737 "configure"
 int a=0
 EOF
 
@@ -5774,7 +5773,7 @@ echo "${ECHO_T}none of $mh_cv_flags supported" >&6
 
 mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5'
 cat > conftest.$ac_ext <<EOF
-#line 5777 "configure"
+#line 5776 "configure"
 int foo()
 {
 return(0);
diff --git a/configure.in b/configure.in
index 4c10013a..dc3dd469 100755
--- a/configure.in
+++ b/configure.in
@@ -66,13 +66,13 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_HEADER_STDC
+if test $ac_cv_header_stdc != yes; then
+	AC_MSG_ERROR([Need ANSI C compiler])
+fi
 AC_CHECK_HEADERS(fcntl.h \
 	limits.h \
 	time.h \
 	sys/time.h \
-	memory.h \
-	string.h \
-	stdarg.h \
 	sys/select.h \
 	unistd.h \
 	dlfcn.h \