Switched to local header includes versus system for portability.h