diff --git a/include/boost/typeof/typeof.hpp b/include/boost/typeof/typeof.hpp
index 4cf7f19..15a335a 100644
--- a/include/boost/typeof/typeof.hpp
+++ b/include/boost/typeof/typeof.hpp
@@ -15,7 +15,7 @@
 
 #include <boost/config.hpp>
 
-#if (!defined(BOOST_MSVC) || (BOOST_MSVC > 1900)) && !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_TYPEOF_EMULATION)
+#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1900) && !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_TYPEOF_EMULATION)
 #   define BOOST_TYPEOF_DECLTYPE
 #   ifndef BOOST_TYPEOF_NATIVE
 #       define BOOST_TYPEOF_NATIVE