Remove patches:  one upstream, the other irrelevant

fix-make-distclean is upstream

includedir-subdir is irrelevant:  x86_64 arch is obsolete