Clean up some rmg files and some existing headers

A loooot of cleanup will be necessary just to realign all the headers
correctly.