Fix struct/class declaration mismatches