Standardized the int sizes and declarations.