Add include guards for RKV structs in q3.
Fix trailing characters on #endif.