Trying to preserve header paths