fixes for std memset include