Remove 2 forgotten autogenerated files
Remove custom macros from EXTRA_DIST