Hi Isaac, Seems Uncrustify has not done this for IpmiFeaturePkg. Do I need to provide the changes for the complete IpmiFeaturePkg or for my changes alone fine? Sure, I will use the PCD directly instead of macros. the main concern of #if is to avoid compiler warnings when the library is not mapped for the disabled interfaces. so, can we proceed with #if logic? Please let me know your comments on this. Thanks, Arun