added some headers and added an abort test
remove m4 include, since m4 is no longer used