More rationalization of the include patterns.