diff --git a/include/boost/type_traits/common_type.hpp b/include/boost/type_traits/common_type.hpp
index 84b9fff..fe5cbbc 100644
--- a/include/boost/type_traits/common_type.hpp
+++ b/include/boost/type_traits/common_type.hpp
@@ -19,7 +19,7 @@
 #  define BOOST_COMMON_TYPE_DONT_USE_TYPEOF
 #endif
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
 // All supported GCC versions (and emulations thereof) support __typeof__
 #define BOOST_COMMON_TYPE_USE_TYPEOF
 #endif
@@ -36,7 +36,6 @@
 #include <boost/type_traits/add_rvalue_reference.hpp>
 #elif defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/detail/common_type_imp.hpp>
 #else
 #include <boost/typeof/typeof.hpp>   // boost wonders never cease!
 #include <boost/type_traits/detail/common_type_imp.hpp>