Move VPP and CSIT macros to global