Changed header imports to use search paths