gpu:ion: match include/ion.h & misc. fixup