diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 879fd617aebb7e157de6d67bbdf374f339c36b81..38ed0311e2acf573388518440a44d3e6de02b7e9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-23  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/std/random: Add back <cstdio> include.
+	* src/c++11/random.cc: Don't include <cstdio> here.
+
 2013-07-22  Jason Merrill  <jason@redhat.com>
 
 	PR libstdc++/57914
diff --git a/libstdc++-v3/include/std/random b/libstdc++-v3/include/std/random
index 84b176154b9b4e0787004525d45c81f577ae04bc..4aa0416c0475865d6b868f041df78934aaa3846a 100644
--- a/libstdc++-v3/include/std/random
+++ b/libstdc++-v3/include/std/random
@@ -36,6 +36,7 @@
 #else
 
 #include <cmath>
+#include <cstdio> // For FILE
 #include <cstdlib>
 #include <string>
 #include <iosfwd>
diff --git a/libstdc++-v3/src/c++11/random.cc b/libstdc++-v3/src/c++11/random.cc
index 1646786882adbb9ac68b7c599cdab0b273232fca..b62f4f7e6b76c29b9f70525db5fc4e8a74028181 100644
--- a/libstdc++-v3/src/c++11/random.cc
+++ b/libstdc++-v3/src/c++11/random.cc
@@ -30,8 +30,6 @@
 # include <cpuid.h>
 #endif
 
-#include <cstdio>
-
 #ifdef _GLIBCXX_HAVE_UNISTD_H
 # include <unistd.h>
 #endif