[PATCH 04/24] util: Use standard int types