Clang 3.0: Fixed warnings due to mismatch of struct/class in declaration and definition.