Re: __NHC__ ifdefs in the core libraries