sh: More header path fixups for mach dir refactoring.