Remove the header search path on master, too.