fixing header resolution so that it works in both isolated and non-isolated builds