Add CPP so HERMIT builds with HEAD
Whitespace changes