header #defs fixes