Added typedefs. Moved some stuff from y EXI wrapper headers