Now using stdint.h definitions instead of custom ones