diff --git a/src/hb-meta.hh b/src/hb-meta.hh
index 7b4d0263a..71698f941 100644
--- a/src/hb-meta.hh
+++ b/src/hb-meta.hh
@@ -292,10 +292,5 @@ template <> struct hb_int_max<signed long long>		{ static constexpr signed long
 template <> struct hb_int_max<unsigned long long>	{ static constexpr unsigned long long	value = ULLONG_MAX;	};
 #define hb_int_max(T) hb_int_max<T>::value
 
-template <bool is_signed> struct hb_signedness_int;
-template <> struct hb_signedness_int<false> { typedef unsigned int value; };
-template <> struct hb_signedness_int<true>  { typedef   signed int value; };
-#define hb_signedness_int(T) hb_signedness_int<T>::value
-
 
 #endif /* HB_META_HH */
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index a7e10ed74..9e17b5c88 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -57,7 +57,7 @@ template <typename Type, unsigned int Size>
 struct IntType
 {
   typedef Type type;
-  typedef typename hb_signedness_int (hb_is_signed (Type)) wide_type;
+  typedef hb_conditional<hb_is_signed (Type), signed, unsigned> wide_type;
 
   IntType<Type, Size>& operator = (wide_type i) { v = i; return *this; }
   operator wide_type () const { return v; }