NSM: Added missing guard macros