Update guard macros