headers, and a few other insignificant changes.
of the broken m4 we had. This is his stuff virgin + our Makefile.