Fix a file require ordering bug from a bad merge.