diff --git a/include/boost/iterator/counting_iterator.hpp b/include/boost/iterator/counting_iterator.hpp
index ce597d6..7b772ed 100644
--- a/include/boost/iterator/counting_iterator.hpp
+++ b/include/boost/iterator/counting_iterator.hpp
@@ -57,11 +57,11 @@ namespace detail
 
 #  if defined(BOOST_HAS_LONG_LONG)
   template <>
-  struct is_numeric<long long>
+  struct is_numeric< ::boost::long_long_type>
     : mpl::true_ {};
   
   template <>
-  struct is_numeric<unsigned long long>
+  struct is_numeric< ::boost::ulong_long_type>
     : mpl::true_ {};
 #  endif
 
diff --git a/test/counting_iterator_test.cpp b/test/counting_iterator_test.cpp
index 5122867..c30a3e0 100644
--- a/test/counting_iterator_test.cpp
+++ b/test/counting_iterator_test.cpp
@@ -270,8 +270,8 @@ int main()
     test_integer<long>();
     test_integer<unsigned long>();
 #if defined(BOOST_HAS_LONG_LONG)
-    test_integer<long long>();
-    test_integer<unsigned long long>();
+    test_integer< ::boost::long_long_type>();
+    test_integer< ::boost::ulong_long_type>();
 #endif
 
     // Test user-defined type.