Improved include dir finding