diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h
index da3cf79a..58b45a4a 100644
--- a/include/internal/catch_interfaces_reporter.h
+++ b/include/internal/catch_interfaces_reporter.h
@@ -31,10 +31,21 @@ namespace Catch
             fullConfig( _fullConfig )
         {}
         
+        ReporterConfig( const ReporterConfig& other )
+        :   name( other.name ),
+            stream( other.stream ),
+            includeSuccessfulResults( other.includeSuccessfulResults ),
+            fullConfig( other.fullConfig )
+        {}
+        
+
         std::string name;
         std::ostream& stream;
         bool includeSuccessfulResults;
         ConfigData fullConfig;
+
+    private:
+        void operator=(const ReporterConfig&);
     };
     
     class TestCaseInfo;
diff --git a/include/internal/catch_tags.h b/include/internal/catch_tags.h
new file mode 100644
index 00000000..f07ff62c
--- /dev/null
+++ b/include/internal/catch_tags.h
@@ -0,0 +1,14 @@
+//
+//  catch_tags.h
+//  CatchSelfTest
+//
+//  Created by Phil Nash on 19/09/2012.
+//
+//
+
+#ifndef __CatchSelfTest__catch_tags__
+#define __CatchSelfTest__catch_tags__
+
+#include <iostream>
+
+#endif /* defined(__CatchSelfTest__catch_tags__) */
diff --git a/include/internal/catch_tags.hpp b/include/internal/catch_tags.hpp
new file mode 100644
index 00000000..2a012d8b
--- /dev/null
+++ b/include/internal/catch_tags.hpp
@@ -0,0 +1,9 @@
+//
+//  catch_tags.hpp
+//  CatchSelfTest
+//
+//  Created by Phil Nash on 19/09/2012.
+//
+//
+
+#include "catch_tags.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_tags.cpp b/projects/SelfTest/SurrogateCpps/catch_tags.cpp
new file mode 100644
index 00000000..12967052
--- /dev/null
+++ b/projects/SelfTest/SurrogateCpps/catch_tags.cpp
@@ -0,0 +1,9 @@
+//
+//  catch_tags.cpp
+//  CatchSelfTest
+//
+//  Created by Phil Nash on 19/09/2012.
+//
+//
+
+#include "catch_tags.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_tags.h b/projects/SelfTest/SurrogateCpps/catch_tags.h
new file mode 100644
index 00000000..f07ff62c
--- /dev/null
+++ b/projects/SelfTest/SurrogateCpps/catch_tags.h
@@ -0,0 +1,14 @@
+//
+//  catch_tags.h
+//  CatchSelfTest
+//
+//  Created by Phil Nash on 19/09/2012.
+//
+//
+
+#ifndef __CatchSelfTest__catch_tags__
+#define __CatchSelfTest__catch_tags__
+
+#include <iostream>
+
+#endif /* defined(__CatchSelfTest__catch_tags__) */