diff --git a/src/libraries/turtle/error.hpp b/src/libraries/turtle/error.hpp
index e41d8a1..8f145fa 100644
--- a/src/libraries/turtle/error.hpp
+++ b/src/libraries/turtle/error.hpp
@@ -16,8 +16,9 @@
 #include <boost/test/unit_test_suite.hpp>
 #include <boost/test/execution_monitor.hpp>
 #include <boost/exception/enable_current_exception.hpp>
-#endif // MOCK_USE_BOOST_TEST
+#else
 #include <iostream>
+#endif
 
 namespace mock
 {
@@ -45,7 +46,7 @@ namespace mock
                 << boost::unit_test::log::begin( file, (std::size_t)line )
                 << boost::unit_test::log_all_errors
                 << boost::unit_test::lazy_ostream::instance()
-                << "mock error: " << message << ": " << context
+                << message << ": " << context
                 << boost::unit_test::log::end();
         }
 
@@ -79,7 +80,7 @@ namespace mock
             const std::string& file = "unknown location", int line = 0 )
         {
             std::cerr << file << '(' << line << "): "
-                << "mock error: " << message << ": " << context << std::endl;
+                << message << ": " << context << std::endl;
         }
 
         static void expected_call( const std::string& /*context*/,
diff --git a/src/libraries/turtle/lambda.hpp b/src/libraries/turtle/lambda.hpp
index 5ddd33e..4f9aea7 100644
--- a/src/libraries/turtle/lambda.hpp
+++ b/src/libraries/turtle/lambda.hpp
@@ -11,11 +11,11 @@
 
 #include "config.hpp"
 #ifdef MOCK_USE_BOOST_BIND
-#   include <boost/bind.hpp>
+#include <boost/bind.hpp>
 #else
-#   include <boost/spirit/home/phoenix/statement/throw.hpp>
-#   include <boost/spirit/home/phoenix/operator/self.hpp>
-#   include <boost/spirit/home/phoenix/core/nothing.hpp>
+#include <boost/spirit/home/phoenix/statement/throw.hpp>
+#include <boost/spirit/home/phoenix/operator/self.hpp>
+#include <boost/spirit/home/phoenix/core/nothing.hpp>
 #endif
 #include <boost/function.hpp>