Add sys/types.h for integer types, and sort headers correctly