[PATCH 1/2] include: Add more sapi structs and enums.