Cleaning up code so it works with existing stuff.

* Cleaning up c header generation code.
* Adding spacing to prevent erronous conflicts.