Merge "namespace ARCH_* defines"