Cross & typedefs done