Fix hack.
Better include.
Fix lookup ambiguity.
More Path fixes, remove dupe headers.