Remove m4 submodule, replace with regen-acinclude.sh; use __UX and __ux symbols and macros as with coreux/include