Converted final two m4 files into macros. No more direce sincludes! Yay!