Fix warnings: -Wduplicate-decl-specifier, -Wmissing-field-initializers