Move typedefs inside the class that they belong to.