Switched to using stdint.h instead of custom typedefs