cleanup intl types
Merge branch 'intl_size_t'

* intl_size_t:
  cleanup intl types