diff --git a/build/build.xml b/build/build.xml
index 5020345..08b22f8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -138,8 +138,8 @@
     <replaceregexp match="BOOST_MOCK_BOOST_MOCK" replace="BOOST_MOCK" flags="g">
         <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
     </replaceregexp>
-    <replaceregexp match='"([^"]+)"' replace="&lt;boost/mock/\1&gt;" flags="g">
-        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    <replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp"/>
     </replaceregexp>
     <replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g">
         <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
@@ -147,13 +147,10 @@
     <replaceregexp match="(namespace mock)" replace="namespace boost${line.separator}{${line.separator}\1" flags="g">
         <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
     </replaceregexp>
-    <replaceregexp match="(}${line.separator}${line.separator}#endif //)" replace="}${line.separator}\1" flags="g">
+    <replaceregexp match="} // mock" replace="}${line.separator}}" flags="g">
         <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
     </replaceregexp>
-    <replaceregexp match="(}${line.separator}${line.separator}#define)" replace="}${line.separator}\1" flags="g">
-        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
-    </replaceregexp>
-    <replaceregexp match="(mock::)" replace="boost::\1" flags="g">
+    <replaceregexp match="( mock::)" replace=" boost::mock::" flags="g">
         <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
     </replaceregexp>
   </target>
diff --git a/test/mock_error.hpp b/test/mock_error.hpp
index 850587a..06e2b79 100644
--- a/test/mock_error.hpp
+++ b/test/mock_error.hpp
@@ -24,9 +24,7 @@ namespace
     int untriggered_expectation_count = 0;
 
     std::string last_context;
-}
-namespace mock
-{
+
     template< typename Result >
     struct mock_error
     {
diff --git a/test/test_log.cpp b/test/test_log.cpp
index c85af70..564a51a 100644
--- a/test/test_log.cpp
+++ b/test/test_log.cpp
@@ -134,7 +134,7 @@ namespace mock
     {
         return s << "mock_streamable";
     }
-}
+} // mock
 
 BOOST_AUTO_TEST_CASE( mock_streamable_type_yields_its_value_when_serialized )
 {
@@ -300,7 +300,7 @@ namespace mock
     {
         return s << "ambiguous_convertible_mock_streamable";
     }
-}
+} // mock
 
 BOOST_AUTO_TEST_CASE( type_ambiguous_convertible_mock_streamable_yields_its_value_when_serialized )
 {
@@ -366,7 +366,7 @@ namespace mock
     {
         return s << "template_mock_streamable";
     }
-}
+} // mock
 
 BOOST_AUTO_TEST_CASE( template_mock_streamable_yields_its_value_when_serialized )
 {
@@ -538,7 +538,7 @@ namespace detail
         return s << "mock::detail::template_serializable";
     }
 }
-}
+} // mock
 
 BOOST_AUTO_TEST_CASE( mock_detail_template_type_serializable_yields_its_value_when_serialized )
 {
@@ -564,7 +564,7 @@ namespace detail
         return s << "mock::detail::template_streamable";
     }
 }
-}
+} // mock
 
 BOOST_AUTO_TEST_CASE( mock_detail_template_template_streamable_yields_its_value_when_serialized )
 {
diff --git a/turtle/action.hpp b/turtle/action.hpp
index e6bbb29..75a172a 100644
--- a/turtle/action.hpp
+++ b/turtle/action.hpp
@@ -215,6 +215,6 @@ namespace detail
         functor_type f_;
     };
 }
-}
+} // mock
 
 #endif // MOCK_ACTION_HPP_INCLUDED
diff --git a/turtle/args.hpp b/turtle/args.hpp
index cb756a0..6509e9c 100644
--- a/turtle/args.hpp
+++ b/turtle/args.hpp
@@ -48,7 +48,7 @@ namespace detail
         BOOST_MPL_ASSERT_RELATION( n, <=, N );
     };
 }
-}
+} // mock
 
 #define MOCK_ARG(N, n, S, tpn) \
     BOOST_PP_COMMA_IF(n) tpn \
diff --git a/turtle/boost_test_error.hpp b/turtle/boost_test_error.hpp
index eb2e28a..0659179 100644
--- a/turtle/boost_test_error.hpp
+++ b/turtle/boost_test_error.hpp
@@ -94,6 +94,6 @@ namespace mock
             fail( "untriggered expectation", context, file, line );
         }
     };
-}
+} // mock
 
 #endif // MOCK_BOOST_TEST_ERROR_POLICY_HPP_INCLUDED
diff --git a/turtle/check.hpp b/turtle/check.hpp
index 22dae6f..2f5def6 100644
--- a/turtle/check.hpp
+++ b/turtle/check.hpp
@@ -103,6 +103,6 @@ namespace detail
         Functor f_;
     };
 }
-}
+} // mock
 
 #endif // MOCK_CHECK_HPP_INCLUDED
diff --git a/turtle/child.hpp b/turtle/child.hpp
index 51790fd..7e1d9d2 100644
--- a/turtle/child.hpp
+++ b/turtle/child.hpp
@@ -47,6 +47,6 @@ namespace detail
         boost::unit_test::const_string name_;
     };
 }
-}
+} // mock
 
 #endif // MOCK_CHILD_HPP_INCLUDED
diff --git a/turtle/cleanup.hpp b/turtle/cleanup.hpp
index cdf99f1..a0ce82c 100644
--- a/turtle/cleanup.hpp
+++ b/turtle/cleanup.hpp
@@ -33,7 +33,7 @@ namespace detail
     };
     BOOST_GLOBAL_FIXTURE( cleanup );
 }
-}
+} // mock
 
 #endif
 
diff --git a/turtle/constraint.hpp b/turtle/constraint.hpp
index 03fc49e..ccd7fb5 100644
--- a/turtle/constraint.hpp
+++ b/turtle/constraint.hpp
@@ -20,6 +20,6 @@ namespace mock
         {}
         Constraint f_;
     };
-}
+} // mock
 
 #endif // MOCK_CONSTRAINT_HPP_INCLUDED
diff --git a/turtle/constraints.hpp b/turtle/constraints.hpp
index 8a42e11..4ec698b 100644
--- a/turtle/constraints.hpp
+++ b/turtle/constraints.hpp
@@ -225,6 +225,6 @@ namespace detail
     {
         return t;
     }
-}
+} // mock
 
 #endif // MOCK_CONSTRAINTS_HPP_INCLUDED
diff --git a/turtle/context.hpp b/turtle/context.hpp
index 30b95c0..8d8e3c6 100644
--- a/turtle/context.hpp
+++ b/turtle/context.hpp
@@ -39,6 +39,6 @@ namespace detail
             const verifiable& v ) const = 0;
     };
 }
-}
+} // mock
 
 #endif // MOCK_CONTEXT_HPP_INCLUDED
diff --git a/turtle/default_error.hpp b/turtle/default_error.hpp
index 4df07a1..43fe242 100644
--- a/turtle/default_error.hpp
+++ b/turtle/default_error.hpp
@@ -72,6 +72,6 @@ namespace mock
             fail( "untriggered expectation", context, file, line );
         }
     };
-}
+} // mock
 
 #endif // MOCK_DEFAULT_ERROR_POLICY_HPP_INCLUDED
diff --git a/turtle/expectation.hpp b/turtle/expectation.hpp
index 2cfa1ab..1f72d14 100644
--- a/turtle/expectation.hpp
+++ b/turtle/expectation.hpp
@@ -257,6 +257,6 @@ namespace detail
 #undef MOCK_EXPECTATION
 
 }
-}
+} // mock
 
 #endif // MOCK_EXPECTATION_HPP_INCLUDED
diff --git a/turtle/function.hpp b/turtle/function.hpp
index e5d96f9..db2043f 100644
--- a/turtle/function.hpp
+++ b/turtle/function.hpp
@@ -325,6 +325,6 @@ namespace mock
     {
         f.reset();
     }
-}
+} // mock
 
 #endif // MOCK_FUNCTION_HPP_INCLUDED
diff --git a/turtle/group.hpp b/turtle/group.hpp
index e60417d..a776299 100644
--- a/turtle/group.hpp
+++ b/turtle/group.hpp
@@ -60,6 +60,6 @@ namespace detail
         verifiables_t verifiables_;
     };
 }
-}
+} // mock
 
 #endif // MOCK_GROUP_HPP_INCLUDED
diff --git a/turtle/invocation.hpp b/turtle/invocation.hpp
index 407d4b6..aeca91c 100644
--- a/turtle/invocation.hpp
+++ b/turtle/invocation.hpp
@@ -172,6 +172,6 @@ namespace detail
         }
     };
 }
-}
+} // mock
 
 #endif // MOCK_INVOCATION_HPP_INCLUDED
diff --git a/turtle/is_functor.hpp b/turtle/is_functor.hpp
index acf5f40..c98dfdc 100644
--- a/turtle/is_functor.hpp
+++ b/turtle/is_functor.hpp
@@ -45,6 +45,6 @@ namespace detail
         >
     {};
 }
-}
+} // mock
 
 #endif // MOCK_IS_FUNCTOR_HPP_INCLUDED
diff --git a/turtle/lambda.hpp b/turtle/lambda.hpp
index fea61fd..47a64c6 100644
--- a/turtle/lambda.hpp
+++ b/turtle/lambda.hpp
@@ -74,6 +74,6 @@ namespace detail
         {}
     };
 }
-}
+} // mock
 
 #endif // MOCK_LAMBDA_HPP_INCLUDED
diff --git a/turtle/log.hpp b/turtle/log.hpp
index c209b75..8629462 100644
--- a/turtle/log.hpp
+++ b/turtle/log.hpp
@@ -21,6 +21,7 @@ namespace boost
 {
     template< typename T > class shared_ptr;
     template< typename T > class weak_ptr;
+    template< typename T > class reference_wrapper;
 
 namespace phoenix
 {
@@ -34,7 +35,6 @@ namespace assign_detail
 {
     template< typename T > class generic_list;
 }
-    template< typename T > class reference_wrapper;
 }
 
 namespace mock
@@ -307,6 +307,6 @@ namespace detail
         *s.s_ << t;
         return s;
     }
-}
+} // mock
 
 #endif // MOCK_LOG_HPP_INCLUDED
diff --git a/turtle/mock.hpp b/turtle/mock.hpp
index 305d949..e5b5718 100644
--- a/turtle/mock.hpp
+++ b/turtle/mock.hpp
@@ -75,7 +75,7 @@ namespace detail
     // the method is ambiguous : use MOCK_METHOD_EXT instead
     template< typename T >
     T& ambiguous_method_name_use_MOCK_METHOD_EXT_instead( const T& );
-}
+} // mock
 
 #define MOCK_BASE_CLASS(T, I) \
     struct T : I, mock::object, mock::detail::base< I >
diff --git a/turtle/object.hpp b/turtle/object.hpp
index cda5948..b9fc599 100644
--- a/turtle/object.hpp
+++ b/turtle/object.hpp
@@ -130,6 +130,6 @@ namespace detail
     {
         o.impl_->reset();
     }
-}
+} // mock
 
 #endif // MOCK_OBJECT_HPP_INCLUDED
diff --git a/turtle/operators.hpp b/turtle/operators.hpp
index 019dd8e..a0dcdbe 100644
--- a/turtle/operators.hpp
+++ b/turtle/operators.hpp
@@ -106,6 +106,6 @@ namespace detail
     {
         return detail::not_< Constraint >( c.f_ );
     }
-}
+} // mock
 
 #endif // MOCK_OPERATORS_HPP_INCLUDED
diff --git a/turtle/parent.hpp b/turtle/parent.hpp
index 520d28a..9529d6e 100644
--- a/turtle/parent.hpp
+++ b/turtle/parent.hpp
@@ -41,6 +41,6 @@ namespace detail
         boost::optional< type_name > type_;
     };
 }
-}
+} // mock
 
 #endif // MOCK_PARENT_HPP_INCLUDED
diff --git a/turtle/root.hpp b/turtle/root.hpp
index 10e119d..87e803f 100644
--- a/turtle/root.hpp
+++ b/turtle/root.hpp
@@ -137,6 +137,6 @@ namespace detail
     {
         mock::detail::root.reset();
     }
-}
+} // mock
 
 #endif // MOCK_ROOT_HPP_INCLUDED
diff --git a/turtle/sequence.hpp b/turtle/sequence.hpp
index f7c880a..978173f 100644
--- a/turtle/sequence.hpp
+++ b/turtle/sequence.hpp
@@ -63,6 +63,6 @@ namespace detail
 
         boost::shared_ptr< detail::sequence_impl > impl_;
     };
-}
+} // mock
 
 #endif // MOCK_SEQUENCE_HPP_INCLUDED
diff --git a/turtle/type_name.hpp b/turtle/type_name.hpp
index 4ed2d70..6ad2efc 100644
--- a/turtle/type_name.hpp
+++ b/turtle/type_name.hpp
@@ -81,6 +81,6 @@ namespace detail
         const std::type_info* info_;
     };
 }
-}
+} // mock
 
 #endif // MOCK_TYPE_NAME_HPP_INCLUDED
diff --git a/turtle/verifiable.hpp b/turtle/verifiable.hpp
index 19d8c59..842ce21 100644
--- a/turtle/verifiable.hpp
+++ b/turtle/verifiable.hpp
@@ -27,6 +27,6 @@ namespace detail
         virtual void reset() = 0;
     };
 }
-}
+} // mock
 
 #endif // MOCK_VERIFIABLE_HPP_INCLUDED
diff --git a/turtle/yes_no_type.hpp b/turtle/yes_no_type.hpp
index 4b45ee0..bb0e0f9 100644
--- a/turtle/yes_no_type.hpp
+++ b/turtle/yes_no_type.hpp
@@ -27,6 +27,6 @@ namespace detail
     no_type operator,( yes_type, yes_type );
     no_type operator,( no_type, yes_type );
 }
-}
+} // mock
 
 #endif // MOCK_YES_NO_TYPE_HPP_INCLUDED