Make struct declaration consistent across header files

Clang complains that these structs and classes must be declared symmetrically. So this fixes that.