3 files changed, 14 insertions, 14 deletions
diff --git a/src/tools/wasm-interp.cc b/src/tools/wasm-interp.cc
index 5cbf7572..05642d47 100644
--- a/src/tools/wasm-interp.cc
+++ b/src/tools/wasm-interp.cc
@@ -53,10 +53,10 @@ static WabtStream s_log_stream;
 #define NOPE WABT_OPTION_NO_ARGUMENT
 #define YEP WABT_OPTION_HAS_ARGUMENT
 
-typedef enum RunVerbosity {
+enum RunVerbosity {
   RUN_QUIET = 0,
   RUN_VERBOSE = 1,
-} RunVerbosity;
+};
 
 enum {
   FLAG_VERBOSE,
@@ -636,7 +636,7 @@ WABT_DEFINE_VECTOR(interpreter_thread, WabtInterpreterThread);
 
 /* An extremely simple JSON parser that only knows how to parse the expected
  * format from wast2wabt. */
-typedef struct Context {
+struct Context {
   WabtInterpreterEnvironment env;
   WabtInterpreterThread thread;
   WabtInterpreterModule* last_module;
@@ -654,19 +654,19 @@ typedef struct Context {
   /* Test info */
   int passed;
   int total;
-} Context;
+};
 
-typedef enum ActionType {
+enum ActionType {
   ACTION_TYPE_INVOKE,
   ACTION_TYPE_GET,
-} ActionType;
+};
 
-typedef struct Action {
+struct Action {
   ActionType type;
   WabtStringSlice module_name;
   WabtStringSlice field_name;
   WabtInterpreterTypedValueVector args;
-} Action;
+};
 
 #define CHECK_RESULT(x)  \
   do {                   \
diff --git a/src/tools/wasm-link.cc b/src/tools/wasm-link.cc
index 75a6b224..d4085e67 100644
--- a/src/tools/wasm-link.cc
+++ b/src/tools/wasm-link.cc
@@ -57,11 +57,11 @@ static StringVector s_infiles;
 static WabtFileWriter s_log_stream_writer;
 static WabtStream s_log_stream;
 
-typedef struct Context {
+struct Context {
   WabtStream stream;
   WabtLinkerInputBinaryVector inputs;
   ssize_t current_section_payload_offset;
-} Context;
+};
 
 static void on_option(struct WabtOptionParser* parser,
                       struct WabtOption* option,
@@ -608,10 +608,10 @@ static bool write_combined_section(Context* ctx,
   return true;
 }
 
-typedef struct ExportInfo {
+struct ExportInfo {
   WabtExport* export_;
   WabtLinkerInputBinary* binary;
-} ExportInfo;
+};
 WABT_DEFINE_VECTOR(export_info, ExportInfo);
 
 static void resolve_symbols(Context* ctx) {
diff --git a/src/tools/wast-desugar.cc b/src/tools/wast-desugar.cc
index 494938f0..84813c0e 100644
--- a/src/tools/wast-desugar.cc
+++ b/src/tools/wast-desugar.cc
@@ -115,14 +115,14 @@ static void parse_options(int argc, char** argv) {
   }
 }
 
-typedef struct Context {
+struct Context {
   WabtMemoryWriter json_writer;
   WabtMemoryWriter module_writer;
   WabtStream json_stream;
   WabtStringSlice output_filename_noext;
   char* module_filename;
   WabtResult result;
-} Context;
+};
 
 int main(int argc, char** argv) {
   wabt_init_stdio();