move typedefs to single file