Move the two existing DECL/GET_foo_FUNCTION macro sets used for dynamic