Minimize the #includes in intl/