cpp: Put code blocks in header if sensible
Fix name and version bump