Merge "Fix struct vs. class mismatch in forward definitions"