diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 178da523b96..3c4b9982623 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -4,6 +4,8 @@
 	atomic int is not lock-free. Make member variables private.
 	* src/c++11/futex.cc: Likewise.
 
+	* src/c++11/futex.cc: Fix order of includes and preprocessor condition.
+
 2015-01-17  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/64638
diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
index f24b44e5a8f..1336779dfb7 100644
--- a/libstdc++-v3/src/c++11/futex.cc
+++ b/libstdc++-v3/src/c++11/futex.cc
@@ -22,9 +22,8 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include <bits/c++config.h>
-#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1
 #include <bits/atomic_futex.h>
+#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1
 #include <chrono>
 #include <climits>
 #include <syscall.h>