Change library search order to match include search order