Move cross ref defs to separate file