diff --git a/build/build.xml b/build/build.xml
index ff233ea..58f930a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -96,7 +96,7 @@
   </target>
 
   <target name="reports" description="generate code analysis reports">
-    <headers name="turtle" excludes="*_iterate.hpp,*_template.hpp"/>
+    <headers name="turtle" excludes="**/*_iterate.hpp,**/*_template.hpp"/>
     <check name="turtle"/>
   </target>
 
diff --git a/build/vc100/turtle.vcxproj b/build/vc100/turtle.vcxproj
index 48e4b80..d13dd23 100644
--- a/build/vc100/turtle.vcxproj
+++ b/build/vc100/turtle.vcxproj
@@ -37,6 +37,7 @@
     <ClInclude Include="..\..\turtle\detail\function_template.hpp" />
     <ClInclude Include="..\..\turtle\detail\group.hpp" />
     <ClInclude Include="..\..\turtle\detail\invocation.hpp" />
+    <ClInclude Include="..\..\turtle\detail\is_functor.hpp" />
     <ClInclude Include="..\..\turtle\detail\lambda.hpp" />
     <ClInclude Include="..\..\turtle\detail\object_impl.hpp" />
     <ClInclude Include="..\..\turtle\detail\operators.hpp" />
@@ -48,7 +49,6 @@
     <ClInclude Include="..\..\turtle\detail\verifiable.hpp" />
     <ClInclude Include="..\..\turtle\detail\yes_no_type.hpp" />
     <ClInclude Include="..\..\turtle\error.hpp" />
-    <ClInclude Include="..\..\turtle\is_functor.hpp" />
     <ClInclude Include="..\..\turtle\log.hpp" />
     <ClInclude Include="..\..\turtle\mock.hpp" />
     <ClInclude Include="..\..\turtle\object.hpp" />
diff --git a/build/vc100/turtle.vcxproj.filters b/build/vc100/turtle.vcxproj.filters
index 7f1ae8e..c9dbd41 100644
--- a/build/vc100/turtle.vcxproj.filters
+++ b/build/vc100/turtle.vcxproj.filters
@@ -25,9 +25,6 @@
     <ClInclude Include="..\..\turtle\error.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\is_functor.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\turtle\log.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -112,5 +109,8 @@
     <ClInclude Include="..\..\turtle\detail\function_impl_template.hpp">
       <Filter>Source Files\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\turtle\detail\is_functor.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/vc100/turtle_test.vcxproj b/build/vc100/turtle_test.vcxproj
index 1a2536d..99c2215 100644
--- a/build/vc100/turtle_test.vcxproj
+++ b/build/vc100/turtle_test.vcxproj
@@ -24,13 +24,13 @@
   <ItemGroup>
     <ClCompile Include="..\..\test\detail\test_function.cpp" />
     <ClCompile Include="..\..\test\detail\test_invocation.cpp" />
+    <ClCompile Include="..\..\test\detail\test_is_functor.cpp" />
     <ClCompile Include="..\..\test\detail\test_parameters.cpp" />
     <ClCompile Include="..\..\test\detail\test_signature.cpp" />
     <ClCompile Include="..\..\test\detail\test_type_name.cpp" />
     <ClCompile Include="..\..\test\test_constraints.cpp" />
     <ClCompile Include="..\..\test\test_error.cpp" />
     <ClCompile Include="..\..\test\test_integration.cpp" />
-    <ClCompile Include="..\..\test\test_is_functor.cpp" />
     <ClCompile Include="..\..\test\test_log.cpp" />
     <ClCompile Include="..\..\test\test_max_args.cpp" />
     <ClCompile Include="..\..\test\test_mock.cpp" />
diff --git a/build/vc100/turtle_test.vcxproj.filters b/build/vc100/turtle_test.vcxproj.filters
index 7d14774..cfd1724 100644
--- a/build/vc100/turtle_test.vcxproj.filters
+++ b/build/vc100/turtle_test.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClCompile Include="..\..\test\test_integration.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\test_is_functor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\test\test_log.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -57,5 +54,8 @@
     <ClCompile Include="..\..\test\detail\test_invocation.cpp">
       <Filter>Source Files\detail</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\detail\test_is_functor.cpp">
+      <Filter>Source Files\detail</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/test_is_functor.cpp b/test/detail/test_is_functor.cpp
similarity index 93%
rename from test/test_is_functor.cpp
rename to test/detail/test_is_functor.cpp
index 9040e32..15e95cf 100644
--- a/test/test_is_functor.cpp
+++ b/test/detail/test_is_functor.cpp
@@ -6,7 +6,7 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <turtle/is_functor.hpp>
+#include <turtle/detail/is_functor.hpp>
 #include <boost/test/auto_unit_test.hpp>
 #ifdef _MSC_VER
 #pragma warning( push, 0 )
diff --git a/turtle/detail/check.hpp b/turtle/detail/check.hpp
index fcdd5ee..e387375 100644
--- a/turtle/detail/check.hpp
+++ b/turtle/detail/check.hpp
@@ -10,8 +10,8 @@
 #define MOCK_CHECK_HPP_INCLUDED
 
 #include "operators.hpp"
+#include "is_functor.hpp"
 #include "../log.hpp"
-#include "../is_functor.hpp"
 #include <boost/utility/enable_if.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/ref.hpp>
diff --git a/turtle/is_functor.hpp b/turtle/detail/is_functor.hpp
similarity index 94%
rename from turtle/is_functor.hpp
rename to turtle/detail/is_functor.hpp
index 5f54c6a..7a4d6f4 100644
--- a/turtle/is_functor.hpp
+++ b/turtle/detail/is_functor.hpp
@@ -9,7 +9,7 @@
 #ifndef MOCK_IS_FUNCTOR_HPP_INCLUDED
 #define MOCK_IS_FUNCTOR_HPP_INCLUDED
 
-#include "detail/yes_no_type.hpp"
+#include "yes_no_type.hpp"
 #include <boost/function_types/is_callable_builtin.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/or.hpp>