diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 84bf38cfed1afe86a51b059a31cee1abdded29ad..471d7ba0d699f16b3470c772b27cf501f0cfd0ed 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-16  Marc Espie <espie@openbsd.org>
+	* configure.in:  Check for <sys/types.h>.
+	* configure:  Rebuild.
+	* config.h.in:  Rebuild.
+	* libmath/mathconf.h:  Include <sys/types.h> prior to
+	<machine/endian.h> if available.
+
 2001-08-15  Andreas Schwab  <schwab@suse.de>
 
 	* configure.target (cpu_include_dir): Set to `config/cpu/m68k' for
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ef41a45a7d78131d2c990a233933f46cd11e0da9..9a9ddde928c4e880be83dffd2aacfae108b0ce86 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2619,7 +2619,7 @@ if eval "test \"`echo '$''{'_cv_gnu_make_command'+set}'`\" = set"; then
 else
   _cv_gnu_make_command='' ;
           for a in "${MAKE-make}" make gmake gnumake ; do
-                  if ( $a --version 2> /dev/null | grep -c GNU > /dev/null )
+                  if ($a --version 2> /dev/null | grep -c GNU > /dev/null )
                   then
                           _cv_gnu_make_command=$a ;
                           break;
@@ -3836,8 +3836,8 @@ if test -n "$with_cross_host" || test x"$build" != x"$host"; then
 	# Construct linux crosses by hand, eliminating bits that need ld...
         # Check for available headers.
         for ac_hdr in nan.h ieeefp.h endian.h sys/isa_defs.h \
-	machine/endian.h machine/param.h sys/machine.h fp.h locale.h \
-	float.h inttypes.h
+	machine/endian.h machine/param.h sys/machine.h sys/types.h \
+	fp.h locale.h float.h inttypes.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index bc91990564f4b43e40b5aff7c9207ae95115cc8c..00bb59f32e5bb9b0e9a1a54f9cec15218525abae 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -72,8 +72,8 @@ if test -n "$with_cross_host" || test x"$build" != x"$host"; then
 	# Construct linux crosses by hand, eliminating bits that need ld...
         # Check for available headers.
         AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
-	machine/endian.h machine/param.h sys/machine.h fp.h locale.h \
-	float.h inttypes.h])
+	machine/endian.h machine/param.h sys/machine.h sys/types.h \
+	fp.h locale.h float.h inttypes.h])
 
 	# GLIBCPP_CHECK_COMPILER_FEATURES
 	SECTION_FLAGS='-ffunction-sections -fdata-sections'
diff --git a/libstdc++-v3/libmath/mathconf.h b/libstdc++-v3/libmath/mathconf.h
index 1e874990dd1820d63e814bd7a352d3f2e8e99f91..087631a56877187df373f8c25857bc84f043376c 100644
--- a/libstdc++-v3/libmath/mathconf.h
+++ b/libstdc++-v3/libmath/mathconf.h
@@ -34,6 +34,9 @@
 # include <endian.h>
 #else
 # ifdef HAVE_MACHINE_ENDIAN_H
+#  ifdef HAVE_SYS_TYPES_H
+#   include <sys/types.h>
+#  endif
 #  include <machine/endian.h>
 # else
 #  ifdef HAVE_SYS_MACHINE_H