Fix header paths for archiving