Hi Isaac,<br /><br />&nbsp; &nbsp;Seems Uncrustify has not done this for&nbsp;IpmiFeaturePkg. Do I need to provide the changes for the complete IpmiFeaturePkg or for my changes alone fine?<br /><br />&nbsp; 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?&nbsp;<br />&nbsp; Please let me know your comments on this.<br /><br />Thanks,<br />Arun