Remove semi-colon from macro
Use uncrustify instead of indent

It does a better job and seems to be actively maintained.

I also tweaked how auto-generated headers are managed so the comments
surrounding them are not modified by uncrustify.