Some header search path related changes.