diff --git a/src/base/base_core.h b/src/base/base_core.h
index b8058de9..191e1e7f 100644
--- a/src/base/base_core.h
+++ b/src/base/base_core.h
@@ -454,6 +454,15 @@ typedef enum OperatingSystem
 }
 OperatingSystem;
 
+typedef enum ImageType
+{
+  Image_Null,
+  Image_CoffPe,
+  Image_Elf32,
+  Image_Elf64,
+  Image_Macho
+} ImageType;
+
 typedef enum Arch
 {
   Arch_Null,
diff --git a/src/dwarf/dwarf_parse.c b/src/dwarf/dwarf_parse.c
index ee0df7ef..31c52af7 100644
--- a/src/dwarf/dwarf_parse.c
+++ b/src/dwarf/dwarf_parse.c
@@ -1473,15 +1473,15 @@ dw_ext_from_params(String8 producer, Arch arch, ImageType image_type)
   DW_Ext ext = DW_Ext_Null;
   switch (image_type) {
     case Image_Null: break;
-    case Image_COFF_PE: {
+    case Image_CoffPe: {
       if (str8_match(str8_lit("clang"), producer, StringMatchFlag_RightSideSloppy|StringMatchFlag_CaseInsensitive)) {
         ext = DW_Ext_GNU | DW_Ext_LLVM;
       } else if (str8_match(str8_lit("GNU"), producer, StringMatchFlag_RightSideSloppy|StringMatchFlag_CaseInsensitive)) {
         ext = DW_Ext_GNU;
       }
     } break;
-    case Image_ELF32:
-    case Image_ELF64: {
+    case Image_Elf32:
+    case Image_Elf64: {
       if (str8_match(str8_lit("clang"), producer, StringMatchFlag_RightSideSloppy|StringMatchFlag_CaseInsensitive)) {
         ext = DW_Ext_GNU | DW_Ext_LLVM;
       } else if (str8_match(str8_lit("GNU"), producer, StringMatchFlag_RightSideSloppy|StringMatchFlag_CaseInsensitive)) {
diff --git a/src/raddump/raddump.c b/src/raddump/raddump.c
index 35d3e47d..189fcc48 100644
--- a/src/raddump/raddump.c
+++ b/src/raddump/raddump.c
@@ -5159,7 +5159,7 @@ coff_print_obj(Arena *arena, String8List *out, String8 indent, String8 raw_data,
 
   if (opts & RD_Option_Dwarf) {
     DW_SectionArray dwarf_sections = rd_dw_sections_from_coff_section_table(scratch.arena, raw_data, string_table_off, header->section_count, sections);
-    dw_format(arena, out, indent, opts, &dwarf_sections, arch, Image_COFF_PE);
+    dw_format(arena, out, indent, opts, &dwarf_sections, arch, Image_CoffPe);
   }
 
 exit:;
@@ -6857,7 +6857,7 @@ pe_print(Arena *arena, String8List *out, String8 indent, String8 raw_data, RD_Op
 
   if (opts & RD_Option_Dwarf) {
     DW_SectionArray dwarf_sections = rd_dw_sections_from_coff_section_table(scratch.arena, raw_data, string_table_off, coff_header->section_count, sections);
-    dw_format(arena, out, indent, opts, &dwarf_sections, arch, Image_COFF_PE);
+    dw_format(arena, out, indent, opts, &dwarf_sections, arch, Image_CoffPe);
   }
 
 exit:;