Also remove some unneeded struct forward declarations.
Attach a file by drag & drop or click to upload
