diff --git a/include/boost/integer_fwd.hpp b/include/boost/integer_fwd.hpp
index 33cfc99..34183d8 100644
--- a/include/boost/integer_fwd.hpp
+++ b/include/boost/integer_fwd.hpp
@@ -65,7 +65,7 @@ template <  >
 template <  >
     class integer_traits< unsigned long >;
 
-#ifdef ULLONG_MAX
+#if !defined(BOOST_NO_INTEGRAL_INT64_T) && !defined(BOOST_NO_INT64_T) && defined(BOOST_HAS_LONG_LONG)
 template <  >
     class integer_traits<  ::boost::long_long_type>;