Minor tweaks to eliminate redundant or incorrect include directories.
Still seems to be happening.