Fix cmake build.
C++ header guards.
Util build fix.