Cleanup m4 includes
Update width to new heads setup