[PATCH v2 2/2] include: Don't use C++ keywords.