diff --git a/vtkm/TypeTraits.h b/vtkm/TypeTraits.h
index 84f7b66f99cee7617fb67a0c270d12dc9ee8bfe4..84d2b9a3ae7b1a5211f68c1cae1cfd6aa418d88d 100644
--- a/vtkm/TypeTraits.h
+++ b/vtkm/TypeTraits.h
@@ -107,20 +107,21 @@ struct TypeTraits<const T> : TypeTraits<T>
 /// Traits for basic C++ types.
 ///
 
-VTKM_BASIC_REAL_TYPE(float)
-VTKM_BASIC_REAL_TYPE(double)
-
+VTKM_BASIC_REAL_TYPE(vtkm::Float32)
+VTKM_BASIC_REAL_TYPE(vtkm::Float64)
+
+VTKM_BASIC_INTEGER_TYPE(vtkm::Int8)
+VTKM_BASIC_INTEGER_TYPE(vtkm::UInt8)
+VTKM_BASIC_INTEGER_TYPE(vtkm::Int16)
+VTKM_BASIC_INTEGER_TYPE(vtkm::UInt16)
+VTKM_BASIC_INTEGER_TYPE(vtkm::Int32)
+VTKM_BASIC_INTEGER_TYPE(vtkm::UInt32)
+VTKM_BASIC_INTEGER_TYPE(vtkm::Int64)
+VTKM_BASIC_INTEGER_TYPE(vtkm::UInt64)
+VTKM_BASIC_INTEGER_TYPE(bool)
 VTKM_BASIC_INTEGER_TYPE(char)
-VTKM_BASIC_INTEGER_TYPE(signed char)
-VTKM_BASIC_INTEGER_TYPE(unsigned char)
-VTKM_BASIC_INTEGER_TYPE(short)
-VTKM_BASIC_INTEGER_TYPE(unsigned short)
-VTKM_BASIC_INTEGER_TYPE(int)
-VTKM_BASIC_INTEGER_TYPE(unsigned int)
-VTKM_BASIC_INTEGER_TYPE(long)
-VTKM_BASIC_INTEGER_TYPE(unsigned long)
-VTKM_BASIC_INTEGER_TYPE(long long)
-VTKM_BASIC_INTEGER_TYPE(unsigned long long)
+VTKM_BASIC_INTEGER_TYPE(signed VTKM_UNUSED_INT_TYPE)
+VTKM_BASIC_INTEGER_TYPE(unsigned VTKM_UNUSED_INT_TYPE)
 
 #undef VTKM_BASIC_REAL_TYPE
 #undef VTKM_BASIC_INTEGER_TYPE