diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 89b40174df56..1540db24d480 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-18  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/precompiled/extc++.h: Fix bootstrap error due to
+	unconditional inclusion of <ext/enc_filebuf.h>.
+	* include/ext/random: Check for definition of UINT32_C.
+
 2015-09-17  Catherine Moore  <clm@codesourcery.com>
 
 	* src/c++11/debug.cc: Include <cstdio>.
diff --git a/libstdc++-v3/include/ext/random b/libstdc++-v3/include/ext/random
index be6db5d4f65b..0bcfa4a30165 100644
--- a/libstdc++-v3/include/ext/random
+++ b/libstdc++-v3/include/ext/random
@@ -43,7 +43,7 @@
 # include <x86intrin.h>
 #endif
 
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
+#if defined(_GLIBCXX_USE_C99_STDINT_TR1) && defined(UINT32_C)
 
 namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
 {
@@ -3499,7 +3499,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
 #include "ext/opt_random.h"
 #include "random.tcc"
 
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
+#endif // _GLIBCXX_USE_C99_STDINT_TR1 && UINT32_C
 
 #endif // C++11
 
diff --git a/libstdc++-v3/include/precompiled/extc++.h b/libstdc++-v3/include/precompiled/extc++.h
index 8883e47fb0c5..31f5ec802c63 100644
--- a/libstdc++-v3/include/precompiled/extc++.h
+++ b/libstdc++-v3/include/precompiled/extc++.h
@@ -46,7 +46,6 @@
 #endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
-#include <ext/enc_filebuf.h>
 #include <ext/extptr_allocator.h>
 #include <ext/functional>
 #include <ext/iterator>