[2.2] Fix compile-time warnings caused by duplicate struct typedefs

[2.2] Fix compile-time warnings caused by duplicate struct typedefs #9751