Move all enums/typedefs into common