diff --git a/include/boost/math/common_factor_rt.hpp b/include/boost/math/common_factor_rt.hpp
index 6200b96..e7b2500 100644
--- a/include/boost/math/common_factor_rt.hpp
+++ b/include/boost/math/common_factor_rt.hpp
@@ -303,7 +303,7 @@ namespace detail
     BOOST_PRIVATE_GCD_UF( unsigned long );
 
 #ifdef BOOST_HAS_LONG_LONG
-    BOOST_PRIVATE_GCD_UF( unsigned long long );
+    BOOST_PRIVATE_GCD_UF( boost::ulong_long_type );
 #elif defined(BOOST_HAS_MS_INT64)
     BOOST_PRIVATE_GCD_UF( unsigned __int64 );
 #endif
@@ -325,7 +325,7 @@ namespace detail
     BOOST_PRIVATE_GCD_SF( char, unsigned char ); // should work even if unsigned
 
 #ifdef BOOST_HAS_LONG_LONG
-    BOOST_PRIVATE_GCD_SF( long long, unsigned long long );
+    BOOST_PRIVATE_GCD_SF( boost::long_long_type, boost::ulong_long_type );
 #elif defined(BOOST_HAS_MS_INT64)
     BOOST_PRIVATE_GCD_SF( __int64, unsigned __int64 );
 #endif
diff --git a/test/common_factor_test.cpp b/test/common_factor_test.cpp
index c78b99b..65907b2 100644
--- a/test/common_factor_test.cpp
+++ b/test/common_factor_test.cpp
@@ -113,7 +113,7 @@ MyUnsigned2  dummy4;
 // Various types to test with each GCD/LCM
 typedef ::boost::mpl::list<signed char, short, int, long,
 #ifdef BOOST_HAS_LONG_LONG
- long long,
+ boost::long_long_type,
 #elif defined(BOOST_HAS_MS_INT64)
  __int64,
 #endif
@@ -121,7 +121,7 @@ typedef ::boost::mpl::list<signed char, short, int, long,
 typedef ::boost::mpl::list<unsigned char, unsigned short, unsigned,
  unsigned long,
 #ifdef BOOST_HAS_LONG_LONG
- unsigned long long,
+ boost::ulong_long_type,
 #elif defined(BOOST_HAS_MS_INT64)
  unsigned __int64,
 #endif