Replaced SHORT and UINT with int16_t and uint32_t, removed types.h