diff --git a/generator/index.zig b/generator/index.zig
index 205e174..b87c685 100644
--- a/generator/index.zig
+++ b/generator/index.zig
@@ -6,5 +6,4 @@ pub const ShaderCompileStep = @import("build_integration.zig").ShaderCompileStep
 test "main" {
     _ = @import("xml.zig");
     _ = @import("vulkan/c_parse.zig");
-    _ = @import("spirv/generator.zig");
 }
diff --git a/generator/vulkan/generator.zig b/generator/vulkan/generator.zig
index 75f4efd..1388f9b 100644
--- a/generator/vulkan/generator.zig
+++ b/generator/vulkan/generator.zig
@@ -9,8 +9,8 @@ const Allocator = mem.Allocator;
 const FeatureLevel = reg.FeatureLevel;
 
 const EnumFieldMerger = struct {
-    const EnumExtensionMap = std.StringHashMap(std.ArrayListUnmanaged(reg.Enum.Field));
-    const FieldSet = std.StringHashMap(void);
+    const EnumExtensionMap = std.StringArrayHashMap(std.ArrayListUnmanaged(reg.Enum.Field));
+    const FieldSet = std.StringArrayHashMap(void);
 
     gpa: *Allocator,
     reg_arena: *Allocator,