4 files changed, 9 insertions, 7 deletions
diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c
index b249fd11b..61e93ea45 100644
--- a/tools/gbagfx/main.c
+++ b/tools/gbagfx/main.c
@@ -239,7 +239,7 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
 
 void HandlePngToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED)
 {
-    struct Palette palette = {0};
+    struct Palette palette = {};
 
     ReadPngPalette(inputPath, &palette);
     WriteJascPalette(outputPath, &palette);
@@ -247,7 +247,7 @@ void HandlePngToJascPaletteCommand(char *inputPath, char *outputPath, int argc U
 
 void HandlePngToGbaPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED)
 {
-    struct Palette palette = {0};
+    struct Palette palette = {};
 
     ReadPngPalette(inputPath, &palette);
     WriteGbaPalette(outputPath, &palette);
@@ -255,7 +255,7 @@ void HandlePngToGbaPaletteCommand(char *inputPath, char *outputPath, int argc UN
 
 void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED)
 {
-    struct Palette palette = {0};
+    struct Palette palette = {};
 
     ReadGbaPalette(inputPath, &palette);
     WriteJascPalette(outputPath, &palette);
@@ -288,7 +288,7 @@ void HandleJascToGbaPaletteCommand(char *inputPath, char *outputPath, int argc,
         }
     }
 
-    struct Palette palette = {0};
+    struct Palette palette = {};
 
     ReadJascPalette(inputPath, &palette);
 
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
index baa93233b..55335e382 100644
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -108,9 +108,9 @@ string generate_map_header_text(Json map_data, Json layouts_data, string version
         text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n";
     else if (version == "emerald")
         text << "\tmap_header_flags "
-             << "allow_bike=" << map_data["allow_bike"].bool_value() << ", "
-             << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", "
-             << "allow_run=" << map_data["allow_running"].bool_value() << ", "
+             << "allow_cycling=" << map_data["allow_cycling"].bool_value() << ", "
+             << "allow_escaping=" << map_data["allow_escaping"].bool_value() << ", "
+             << "allow_running=" << map_data["allow_running"].bool_value() << ", "
              << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n";
 
      text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n";
diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp
index 98805c952..7756cadc5 100644
--- a/tools/preproc/asm_file.cpp
+++ b/tools/preproc/asm_file.cpp
@@ -20,6 +20,7 @@
 
 #include <cstdio>
 #include <cstdarg>
+#include <stdexcept>
 #include "preproc.h"
 #include "asm_file.h"
 #include "char_util.h"
diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp
index 229f568fa..b996a048c 100644
--- a/tools/preproc/c_file.cpp
+++ b/tools/preproc/c_file.cpp
@@ -20,6 +20,7 @@
 
 #include <cstdio>
 #include <cstdarg>
+#include <stdexcept>
 #include <string>
 #include <memory>
 #include "preproc.h"