rename x32.* files to m.*, and modify makefile to use them. Delete x64.hdr and x64.h; keep x64.s for comparison whilst debugging use of  unified m.* files.