Remove extra dependency on Portability.h