Add support for moved headers