Updated data/typedefs.h