AML: More changes for G02REF, Move definitions to header file