diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c1387acafcda81a81264ac1e486ffe75a59ba2f1..139c929627442bf8aca19d111c398f5c754501ce 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-12  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/30_threads/condition_variable_any/native_handle/
+	typesizes.cc: Include tweaks.
+	* testsuite/30_threads/mutex/native_handle/typesizes.cc: Same.
+	* testsuite/30_threads/timed_mutex/native_handle/typesizes.cc: Same.
+	* testsuite/30_threads/thread/native_handle/typesizes.cc: Same.
+	* testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc: Same.
+	* testsuite/30_threads/condition_variable/native_handle/
+	typesizes.cc: Same.
+
 2009-03-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* include/bits/shared_ptr.h: Add include guards.
diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc
index 93968798b67341cd5dfe0a510e70e569c3b8808e..bf740d24cef963c6db07fd4f3eaee9914366cba4 100644
--- a/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc
+++ b/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc
@@ -23,8 +23,8 @@
 // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
-#include <thread/all.h>
 #include <condition_variable>
+#include <thread/all.h>
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/native_handle/typesizes.cc
index 2544291ab13c33aec17ee48030b1eb0a11f19310..ed373026362e38b82d15eae3d909d0790bd052c0 100644
--- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/native_handle/typesizes.cc
+++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/native_handle/typesizes.cc
@@ -23,8 +23,8 @@
 // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
-#include <thread/all.h>
 #include <condition_variable>
+#include <thread/all.h>
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc
index cda0816cfbebe399fbb5f50206ca5e1cf0ec1e8a..76edae25e2cd4dd55b1bb0af755976c02a3ad596 100644
--- a/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc
+++ b/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc
@@ -23,8 +23,8 @@
 // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
-#include <thread/all.h>
 #include <mutex>
+#include <thread/all.h>
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc
index 8ee1f3895c1387466d5bde46b29b5d4a142366f1..6987f9b5760b64fd853948b8eb252adf5409394d 100644
--- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc
+++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc
@@ -23,8 +23,8 @@
 // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
-#include <thread/all.h>
 #include <mutex>
+#include <thread/all.h>
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc
index 6f3f650df4357a8776d1c6a09cd3beaa34a096f6..78e556dbb8c192160706a3a4566bbb002329d89d 100644
--- a/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc
+++ b/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc
@@ -23,8 +23,8 @@
 // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
-#include <thread/all.h>
 #include <thread>
+#include <thread/all.h>
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc
index e9debe55e00d1f878aa4861eb551e94152c3a99b..89ea70cda73cc61775f3dec0de78a771334c217b 100644
--- a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc
+++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc
@@ -23,8 +23,8 @@
 // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 // USA.
 
-#include <thread/all.h>
 #include <mutex>
+#include <thread/all.h>
 
 int main()
 {