diff --git a/include/boost/type_traits/has_trivial_move_assign.hpp b/include/boost/type_traits/has_trivial_move_assign.hpp
index 7077ea0..f7bb198 100644
--- a/include/boost/type_traits/has_trivial_move_assign.hpp
+++ b/include/boost/type_traits/has_trivial_move_assign.hpp
@@ -67,4 +67,6 @@ template <class T> struct has_trivial_move_assign<T[]> : public false_type{};
 
 } // namespace boost
 
+#undef SOLARIS_EXTRA_CHECK
+
 #endif // BOOST_TT_HAS_TRIVIAL_MOVE_ASSIGN_HPP_INCLUDED
diff --git a/include/boost/type_traits/has_trivial_move_constructor.hpp b/include/boost/type_traits/has_trivial_move_constructor.hpp
index 5b43c7f..9e601f3 100644
--- a/include/boost/type_traits/has_trivial_move_constructor.hpp
+++ b/include/boost/type_traits/has_trivial_move_constructor.hpp
@@ -52,6 +52,9 @@ namespace boost {
 
 template <typename T> struct has_trivial_move_constructor 
    : public integral_constant<bool, ::boost::is_pod<T>::value && !::boost::is_volatile<T>::value SOLARIS_EXTRA_CHECK>{};
+
+#undef SOLARIS_EXTRA_CHECK
+
 #endif
 
 template <> struct has_trivial_move_constructor<void> : public false_type{};