Index: testsuite/util/testsuite_tr1.h
===================================================================
--- testsuite/util/testsuite_tr1.h	(revision 157670)
+++ testsuite/util/testsuite_tr1.h	(working copy)
@@ -129,6 +129,33 @@
     explicit ExplicitClass(int&);
   };
 
+  struct NType   // neither trivial nor standard-layout
+  {
+    int i;
+    int j;
+    virtual ~NType();
+  };
+
+  struct TType   // trivial but not standard-layout
+  {
+    int i;
+  private:
+    int j;
+  };
+
+  struct SLType  // standard-layout but not trivial
+  {
+    int i;
+    int j;
+    ~SLType();
+  };
+
+  struct PODType // both trivial and standard-layout
+  {
+    int i;
+    int j;
+  };
+
   int truncate_float(float x) { return (int)x; }
   long truncate_double(double x) { return (long)x; }
 
Index: testsuite/20_util/is_trivial/value.cc
===================================================================
--- testsuite/20_util/is_trivial/value.cc	(revision 157671)
+++ testsuite/20_util/is_trivial/value.cc	(working copy)
@@ -22,34 +22,6 @@
 #include <testsuite_hooks.h>
 #include <testsuite_tr1.h>
 
-struct NType   // neither trivial nor standard-layout
-{
-  int i;
-  int j;
-  virtual ~NType();
-};
-
-struct TType   // trivial but not standard-layout
-{
-  int i;
-
-private:
-  int j;
-};
-
-struct SLType  // standard-layout but not trivial
-{
-  int i;
-  int j;
-  ~SLType();
-};
-
-struct PODType // both trivial and standard-layout
-{
-  int i;
-  int j;
-};
-
 void test01()
 {
   bool test __attribute__((unused)) = true;
Index: testsuite/20_util/is_pod/value.cc
===================================================================
--- testsuite/20_util/is_pod/value.cc	(revision 157671)
+++ testsuite/20_util/is_pod/value.cc	(working copy)
@@ -22,34 +22,6 @@
 #include <testsuite_hooks.h>
 #include <testsuite_tr1.h>
 
-struct NType   // neither trivial nor standard-layout
-{
-  int i;
-  int j;
-  virtual ~NType();
-};
-
-struct TType   // trivial but not standard-layout
-{
-  int i;
-
-private:
-  int j;
-};
-
-struct SLType  // standard-layout but not trivial
-{
-  int i;
-  int j;
-  ~SLType();
-};
-
-struct PODType // both trivial and standard-layout
-{
-  int i;
-  int j;
-};
-
 void test01()
 {
   bool test __attribute__((unused)) = true;
Index: testsuite/20_util/is_standard_layout/value.cc
===================================================================
--- testsuite/20_util/is_standard_layout/value.cc	(revision 157671)
+++ testsuite/20_util/is_standard_layout/value.cc	(working copy)
@@ -22,34 +22,6 @@
 #include <testsuite_hooks.h>
 #include <testsuite_tr1.h>
 
-struct NType   // neither trivial nor standard-layout
-{
-  int i;
-  int j;
-  virtual ~NType();
-};
-
-struct TType   // trivial but not standard-layout
-{
-  int i;
-
-private:
-  int j;
-};
-
-struct SLType  // standard-layout but not trivial
-{
-  int i;
-  int j;
-  ~SLType();
-};
-
-struct PODType // both trivial and standard-layout
-{
-  int i;
-  int j;
-};
-
 void test01()
 {
   bool test __attribute__((unused)) = true;