bug fixes around include directories.