[PATCH 1/2] include: avoid C++ keyword