Merged mapgen.* with mapgen_spec.*, fixed some includes