[PATCH 1/2] include: don't use c++ keyword in public header