Remove typedef from struct