move most remaining macros out of acconfig.h which is an obsolete feature of