diff --git a/src/libraries/turtle/format.hpp b/src/libraries/turtle/format.hpp
index 03e596a..837df97 100644
--- a/src/libraries/turtle/format.hpp
+++ b/src/libraries/turtle/format.hpp
@@ -29,12 +29,11 @@ namespace detail
     {};
 
     template< typename S >
-    eaten operator<<( S& s, const eater& );
+    eaten operator<<( S&, const eater& );
 
     template< int I >
     struct selector
-    {
-    };
+    {};
     template<>
     struct selector< sizeof( std::ostream& ) >
     {
diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp
index d654d82..f0949dc 100644
--- a/src/libraries/turtle/mock.hpp
+++ b/src/libraries/turtle/mock.hpp
@@ -6,8 +6,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef MOCK_TOOLS_HPP_INCLUDED
-#define MOCK_TOOLS_HPP_INCLUDED
+#ifndef MOCK_MOCK_HPP_INCLUDED
+#define MOCK_MOCK_HPP_INCLUDED
 
 #include "error.hpp"
 #include "object.hpp"
@@ -153,4 +153,4 @@ namespace detail
 #define MOCK_RESET(m,t) MOCK_MOCKER(m,t).reset()
 #define MOCK_VERIFY(m,t) MOCK_MOCKER(m,t).verify()
 
-#endif // #ifndef MOCK_TOOLS_HPP_INCLUDED
+#endif // #ifndef MOCK_MOCK_HPP_INCLUDED