Hi Liming, Would it be possible to include the following patch "BaseTools: Align include guard policy" in this release ? https://edk2.groups.io/g/devel/message/71780 Regards, Pierre