wrap*.h upgrade