diff --git a/src/libraries/turtle/action.hpp b/src/libraries/turtle/action.hpp
index d42a3fb..754b69b 100644
--- a/src/libraries/turtle/action.hpp
+++ b/src/libraries/turtle/action.hpp
@@ -214,4 +214,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_ACTION_HPP_INCLUDED
+#endif // MOCK_ACTION_HPP_INCLUDED
diff --git a/src/libraries/turtle/args.hpp b/src/libraries/turtle/args.hpp
index 58a6f44..e5e9069 100644
--- a/src/libraries/turtle/args.hpp
+++ b/src/libraries/turtle/args.hpp
@@ -65,4 +65,4 @@ namespace detail
     tpn boost::function_types::result_type< S >::type M( \
         MOCK_ARGS(n, S, tpn) ) c
 
-#endif // #ifndef MOCK_ARGS_HPP_INCLUDED
+#endif // MOCK_ARGS_HPP_INCLUDED
diff --git a/src/libraries/turtle/check.hpp b/src/libraries/turtle/check.hpp
index a5fcf98..fb35cd6 100644
--- a/src/libraries/turtle/check.hpp
+++ b/src/libraries/turtle/check.hpp
@@ -151,4 +151,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_CHECK_HPP_INCLUDED
+#endif // MOCK_CHECK_HPP_INCLUDED
diff --git a/src/libraries/turtle/config.hpp b/src/libraries/turtle/config.hpp
index 59cd961..00bf32d 100644
--- a/src/libraries/turtle/config.hpp
+++ b/src/libraries/turtle/config.hpp
@@ -44,4 +44,4 @@
 #   endif
 #endif
 
-#endif // #ifndef MOCK_CONFIG_HPP_INCLUDED
+#endif // MOCK_CONFIG_HPP_INCLUDED
diff --git a/src/libraries/turtle/constraint.hpp b/src/libraries/turtle/constraint.hpp
index 577f104..17162c2 100644
--- a/src/libraries/turtle/constraint.hpp
+++ b/src/libraries/turtle/constraint.hpp
@@ -21,4 +21,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_CONSTRAINT_HPP_INCLUDED
+#endif // MOCK_CONSTRAINT_HPP_INCLUDED
diff --git a/src/libraries/turtle/constraints.hpp b/src/libraries/turtle/constraints.hpp
index 74a58ed..69d753e 100644
--- a/src/libraries/turtle/constraints.hpp
+++ b/src/libraries/turtle/constraints.hpp
@@ -223,4 +223,4 @@ namespace detail
     }
 }
 
-#endif // #ifndef MOCK_CONSTRAINTS_HPP_INCLUDED
+#endif // MOCK_CONSTRAINTS_HPP_INCLUDED
diff --git a/src/libraries/turtle/error.hpp b/src/libraries/turtle/error.hpp
index 83bbc97..80a2ce8 100644
--- a/src/libraries/turtle/error.hpp
+++ b/src/libraries/turtle/error.hpp
@@ -18,7 +18,7 @@
 #include <boost/exception/enable_current_exception.hpp>
 #else
 #include <iostream>
-#endif
+#endif // MOCK_USE_BOOST_TEST
 #include <string>
 
 namespace mock
@@ -124,4 +124,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_ERROR_HPP_INCLUDED
+#endif // MOCK_ERROR_HPP_INCLUDED
diff --git a/src/libraries/turtle/expectation.hpp b/src/libraries/turtle/expectation.hpp
index 63c0bc2..1aca145 100644
--- a/src/libraries/turtle/expectation.hpp
+++ b/src/libraries/turtle/expectation.hpp
@@ -228,4 +228,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_EXPECTATION_HPP_INCLUDED
+#endif // MOCK_EXPECTATION_HPP_INCLUDED
diff --git a/src/libraries/turtle/function.hpp b/src/libraries/turtle/function.hpp
index b817478..267b53a 100644
--- a/src/libraries/turtle/function.hpp
+++ b/src/libraries/turtle/function.hpp
@@ -297,4 +297,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_FUNCTION_HPP_INCLUDED
+#endif // MOCK_FUNCTION_HPP_INCLUDED
diff --git a/src/libraries/turtle/invocation.hpp b/src/libraries/turtle/invocation.hpp
index 24afefa..8ee8b5b 100644
--- a/src/libraries/turtle/invocation.hpp
+++ b/src/libraries/turtle/invocation.hpp
@@ -171,4 +171,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_INVOCATION_HPP_INCLUDED
+#endif // MOCK_INVOCATION_HPP_INCLUDED
diff --git a/src/libraries/turtle/is_functor.hpp b/src/libraries/turtle/is_functor.hpp
index 2d28de7..67df053 100644
--- a/src/libraries/turtle/is_functor.hpp
+++ b/src/libraries/turtle/is_functor.hpp
@@ -45,4 +45,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_IS_FUNCTOR_HPP_INCLUDED
+#endif // MOCK_IS_FUNCTOR_HPP_INCLUDED
diff --git a/src/libraries/turtle/lambda.hpp b/src/libraries/turtle/lambda.hpp
index 101f1c5..03078d6 100644
--- a/src/libraries/turtle/lambda.hpp
+++ b/src/libraries/turtle/lambda.hpp
@@ -74,4 +74,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_LAMBDA_HPP_INCLUDED
+#endif // MOCK_LAMBDA_HPP_INCLUDED
diff --git a/src/libraries/turtle/log.hpp b/src/libraries/turtle/log.hpp
index 00036eb..47ba7b9 100644
--- a/src/libraries/turtle/log.hpp
+++ b/src/libraries/turtle/log.hpp
@@ -288,4 +288,4 @@ namespace detail
     }
 }
 
-#endif // #ifndef MOCK_LOG_HPP_INCLUDED
+#endif // MOCK_LOG_HPP_INCLUDED
diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp
index ac43292..b63c16b 100644
--- a/src/libraries/turtle/mock.hpp
+++ b/src/libraries/turtle/mock.hpp
@@ -287,4 +287,4 @@ namespace detail
     MOCK_METHOD_STUB_ALT(M, S, t, const, BOOST_DEDUCED_TYPENAME) \
     MOCK_METHOD_EXPECTATION(S, t)
 
-#endif // #ifndef MOCK_MOCK_HPP_INCLUDED
+#endif // MOCK_MOCK_HPP_INCLUDED
diff --git a/src/libraries/turtle/node.hpp b/src/libraries/turtle/node.hpp
index 15c0e4b..b04fc16 100644
--- a/src/libraries/turtle/node.hpp
+++ b/src/libraries/turtle/node.hpp
@@ -67,4 +67,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_NODE_HPP_INCLUDED
+#endif // MOCK_NODE_HPP_INCLUDED
diff --git a/src/libraries/turtle/object.hpp b/src/libraries/turtle/object.hpp
index 548019a..f2fa72e 100644
--- a/src/libraries/turtle/object.hpp
+++ b/src/libraries/turtle/object.hpp
@@ -79,4 +79,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_OBJECT_HPP_INCLUDED
+#endif // MOCK_OBJECT_HPP_INCLUDED
diff --git a/src/libraries/turtle/operators.hpp b/src/libraries/turtle/operators.hpp
index 57fff09..15c19c2 100644
--- a/src/libraries/turtle/operators.hpp
+++ b/src/libraries/turtle/operators.hpp
@@ -107,4 +107,4 @@ namespace detail
     }
 }
 
-#endif // #ifndef MOCK_OPERATORS_HPP_INCLUDED
+#endif // MOCK_OPERATORS_HPP_INCLUDED
diff --git a/src/libraries/turtle/root.hpp b/src/libraries/turtle/root.hpp
index 05fc277..5ddd7d7 100644
--- a/src/libraries/turtle/root.hpp
+++ b/src/libraries/turtle/root.hpp
@@ -35,4 +35,4 @@ namespace mock
     }
 }
 
-#endif // #ifndef MOCK_ROOT_HPP_INCLUDED
+#endif // MOCK_ROOT_HPP_INCLUDED
diff --git a/src/libraries/turtle/sequence.hpp b/src/libraries/turtle/sequence.hpp
index 00c291f..8b50f02 100644
--- a/src/libraries/turtle/sequence.hpp
+++ b/src/libraries/turtle/sequence.hpp
@@ -64,4 +64,4 @@ namespace detail
     };
 }
 
-#endif // #ifndef MOCK_SEQUENCE_HPP_INCLUDED
+#endif // MOCK_SEQUENCE_HPP_INCLUDED
diff --git a/src/libraries/turtle/type_name.hpp b/src/libraries/turtle/type_name.hpp
index 66a9176..b36acfd 100644
--- a/src/libraries/turtle/type_name.hpp
+++ b/src/libraries/turtle/type_name.hpp
@@ -58,4 +58,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_TYPE_NAME_HPP_INCLUDED
+#endif // MOCK_TYPE_NAME_HPP_INCLUDED
diff --git a/src/libraries/turtle/verifiable.hpp b/src/libraries/turtle/verifiable.hpp
index 2bcdc8d..6fdfa40 100644
--- a/src/libraries/turtle/verifiable.hpp
+++ b/src/libraries/turtle/verifiable.hpp
@@ -27,4 +27,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_VERIFIABLE_HPP_INCLUDED
+#endif // MOCK_VERIFIABLE_HPP_INCLUDED
diff --git a/src/libraries/turtle/yes_no_type.hpp b/src/libraries/turtle/yes_no_type.hpp
index 9ec6063..84014c6 100644
--- a/src/libraries/turtle/yes_no_type.hpp
+++ b/src/libraries/turtle/yes_no_type.hpp
@@ -28,4 +28,4 @@ namespace detail
 }
 }
 
-#endif // #ifndef MOCK_YES_NO_TYPE_HPP_INCLUDED
+#endif // MOCK_YES_NO_TYPE_HPP_INCLUDED
diff --git a/src/tests/turtle_test/mock_error.hpp b/src/tests/turtle_test/mock_error.hpp
index 553bdd6..11724c1 100644
--- a/src/tests/turtle_test/mock_error.hpp
+++ b/src/tests/turtle_test/mock_error.hpp
@@ -126,4 +126,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_TEST_MOCK_ERROR_HPP_INCLUDED
+#endif // MOCK_TEST_MOCK_ERROR_HPP_INCLUDED
diff --git a/src/tests/turtle_test/silent_error.hpp b/src/tests/turtle_test/silent_error.hpp
index d19e363..ea07381 100644
--- a/src/tests/turtle_test/silent_error.hpp
+++ b/src/tests/turtle_test/silent_error.hpp
@@ -47,4 +47,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_TEST_SILENT_ERROR_HPP_INCLUDED
+#endif // MOCK_TEST_SILENT_ERROR_HPP_INCLUDED