fix require(.) references and headers