sorted headers, standard int types, assert macro