Fix compile-time warnings caused by duplicate struct typedefs (#16880)

Fix compile-time warnings caused by duplicate struct typedefs (#16880) #6247