diff --git a/hash/test/hash_enum_test.cpp b/hash/test/hash_enum_test.cpp
index d17b608..30444e5 100644
--- a/hash/test/hash_enum_test.cpp
+++ b/hash/test/hash_enum_test.cpp
@@ -12,13 +12,11 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
+#include "./compile_time.hpp"
 
 namespace test {
 	enum enum_override { enum_override1, enum_override2 };
-	std::size_t hash_value(enum_override x) { return -896532; }
+	std::size_t hash_value(enum_override) { return 896532; }
 
 	enum enum1 { enum1a };
 	enum enum2 { enum2a, enum2b };
@@ -27,10 +25,16 @@ namespace test {
 }
 
 int main() {
-	boost::hash<test::enum1> hash1;
-	boost::hash<test::enum2> hash2;
-	boost::hash<test::enum3> hash3;
-	boost::hash<test::enum4> hash4;
+	compile_time_tests((test::enum1*) 0);
+	compile_time_tests((test::enum2*) 0);
+	compile_time_tests((test::enum3*) 0);
+	compile_time_tests((test::enum4*) 0);
+	compile_time_tests((test::enum_override*) 0);
+
+	HASH_NAMESPACE::hash<test::enum1> hash1;
+	HASH_NAMESPACE::hash<test::enum2> hash2;
+	HASH_NAMESPACE::hash<test::enum3> hash3;
+	HASH_NAMESPACE::hash<test::enum4> hash4;
 	
 	BOOST_TEST(hash1(test::enum1a) == hash1(test::enum1a));
 
@@ -46,7 +50,7 @@ int main() {
 	BOOST_TEST(hash4(test::enum4a) != hash4(test::enum4b));
 	BOOST_TEST(hash4(test::enum4b) == hash4(test::enum4b));
 
-	boost::hash<test::enum_override> hash_override;
+	HASH_NAMESPACE::hash<test::enum_override> hash_override;
 
 	BOOST_TEST(hash_override(test::enum_override1) ==
 		hash_override(test::enum_override1));
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index 73719e2..a73b718 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -12,10 +12,6 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
-
 #include "./compile_time.hpp"
 
 void void_func1() { static int x = 1; ++x; }
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index b233c71..2645dfa 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -16,8 +16,6 @@
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/functional/hash/detail/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 
 #include "./compile_time.hpp"
 
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index 5fcbc27..b255a28 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -12,11 +12,7 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
 #include <boost/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
-
 #include "./compile_time.hpp"
 
 void pointer_tests()
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index 8743e1e..f5fdb2a 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -18,10 +18,7 @@ int main() {}
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
 #include <boost/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 #include <vector>
 
 void hash_range_tests()
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index b3b8394..29ff28e 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -12,11 +12,7 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 #include <string>
-
 #include "./compile_time.hpp"
 
 void string_tests()