diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 155bb86b7f3..e5c40572955 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-24  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/tr1/cinttypes: Simply protect everything with
+	_GLIBCXX_USE_C99_INTTYPES_TR1.
+	* include/tr1/cfenv: Likewise with _GLIBCXX_USE_C99_FENV_TR1.
+	* include/tr1/cstdint: Likewise with _GLIBCXX_USE_C99_STDINT_TR1.
+
 2006-07-21  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/tr1/random: Make include guards consistent.
diff --git a/libstdc++-v3/include/tr1/cfenv b/libstdc++-v3/include/tr1/cfenv
index d4e925a8bc3..93f6d43167a 100644
--- a/libstdc++-v3/include/tr1/cfenv
+++ b/libstdc++-v3/include/tr1/cfenv
@@ -36,12 +36,10 @@
 
 #include <bits/c++config.h>
 
-#if _GLIBCXX_HAVE_FENV_H
-#include <fenv.h>
-#endif
-
 #if _GLIBCXX_USE_C99_FENV_TR1
 
+#include <fenv.h>
+
 #undef feclearexcept
 #undef fegetexceptflag
 #undef feraiseexcept
diff --git a/libstdc++-v3/include/tr1/cinttypes b/libstdc++-v3/include/tr1/cinttypes
index 25e5c075e4a..5a899fe9248 100644
--- a/libstdc++-v3/include/tr1/cinttypes
+++ b/libstdc++-v3/include/tr1/cinttypes
@@ -35,16 +35,13 @@
 #define _TR1_CINTTYPES 1
 
 #include <bits/c++config.h>
-
 #include <tr1/cstdint>
 
-#if _GLIBCXX_HAVE_INTTYPES_H
+#if _GLIBCXX_USE_C99_INTTYPES_TR1
+
 // For 8.11.1/1 (see C99, Note 184) 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-#endif
-
-#if _GLIBCXX_USE_C99_INTTYPES_TR1
 
 // namespace std::tr1
 namespace std
diff --git a/libstdc++-v3/include/tr1/cstdint b/libstdc++-v3/include/tr1/cstdint
index 37a1550a5a2..198d74654e6 100644
--- a/libstdc++-v3/include/tr1/cstdint
+++ b/libstdc++-v3/include/tr1/cstdint
@@ -36,14 +36,12 @@
 
 #include <bits/c++config.h>
 
-#if _GLIBCXX_HAVE_STDINT_H
+#if _GLIBCXX_USE_C99_STDINT_TR1
+
 // For 8.22.1/1 (see C99, Notes 219, 220, 222) 
 #define __STDC_LIMIT_MACROS
 #define __STDC_CONSTANT_MACROS
 #include <stdint.h>
-#endif
-
-#if _GLIBCXX_USE_C99_STDINT_TR1
 
 // namespace std::tr1
 namespace std