diff --git a/cimgui.h b/cimgui.h
index 6f419ae..bc0853e 100644
--- a/cimgui.h
+++ b/cimgui.h
@@ -46,24 +46,6 @@ typedef struct ImFontGlyph ImFontGlyph;
 typedef unsigned short ImDrawIdx;;
 typedef struct Pair Pair;
 typedef struct TextRange TextRange;
-typedef struct ImVector_ImVec2 ImVector_ImVec2;
-typedef struct ImVector_ImDrawIdx ImVector_ImDrawIdx;
-typedef struct ImVector_ImVec4 ImVector_ImVec4;
-typedef struct ImVector_TextRange ImVector_TextRange;
-typedef struct ImVector_ImFontPtr ImVector_ImFontPtr;
-typedef struct ImVector_ImDrawCmd ImVector_ImDrawCmd;
-typedef struct ImVector_ImDrawVert ImVector_ImDrawVert;
-typedef struct ImVector_unsigned_short ImVector_unsigned_short;
-typedef struct ImVector_ImTextureID ImVector_ImTextureID;
-typedef struct ImVector_char ImVector_char;
-typedef struct ImVector_ImDrawChannel ImVector_ImDrawChannel;
-typedef struct ImVector_CustomRect ImVector_CustomRect;
-typedef struct ImVector_Pair ImVector_Pair;
-typedef struct ImVector_unsigned_char ImVector_unsigned_char;
-typedef struct ImVector_ImFontGlyph ImVector_ImFontGlyph;
-typedef struct ImVector_ImFontConfig ImVector_ImFontConfig;
-typedef struct ImVector_ImWchar ImVector_ImWchar;
-typedef struct ImVector_float ImVector_float;
 typedef struct ImVec4 ImVec4;
 typedef struct ImVec2 ImVec2;
 typedef struct ImGuiTextBuffer ImGuiTextBuffer;
@@ -588,24 +570,24 @@ struct ImGuiIO
     float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
 };
 typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
-struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
-struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
-struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
-struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
-struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
-struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
-struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
-struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
-struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
-struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
-struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
-struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
-struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
-struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
-struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
-struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
-struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
-struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
+typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
+typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
+typedef struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
+typedef struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
+typedef struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
+typedef struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
+typedef struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
+typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
+typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
+typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
+typedef struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
+typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
+typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
+typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
+typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
+typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
+typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
+typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
 struct ImNewDummy {};
 struct ImGuiOnceUponAFrame
 {
diff --git a/generator/generator.lua b/generator/generator.lua
index 2ef2edc..3c648c8 100644
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -1003,8 +1003,8 @@ local function generate_templates(code,templates,typedefs)
 		local te = k:gsub("%s","_")
 		te = te:gsub("%*","Ptr")
 		--table.insert(code,"typedef struct ImVector_"..te.." {int Size;int Capacity;"..k.."* Data;} ImVector_"..te..";\n")
-		table.insert(code,"struct ImVector_"..te.." {int Size;int Capacity;"..k.."* Data;} ImVector_"..te..";\n")
-		table.insert(typedefs,"typedef struct ImVector_"..te.." ImVector_"..te..";\n")
+		table.insert(code,"typedef struct ImVector_"..te.." {int Size;int Capacity;"..k.."* Data;} ImVector_"..te..";\n")
+		--table.insert(typedefs,"typedef struct ImVector_"..te.." ImVector_"..te..";\n")
 	end
 end
 
diff --git a/generator/output/cimgui.h b/generator/output/cimgui.h
index 6f419ae..bc0853e 100644
--- a/generator/output/cimgui.h
+++ b/generator/output/cimgui.h
@@ -46,24 +46,6 @@ typedef struct ImFontGlyph ImFontGlyph;
 typedef unsigned short ImDrawIdx;;
 typedef struct Pair Pair;
 typedef struct TextRange TextRange;
-typedef struct ImVector_ImVec2 ImVector_ImVec2;
-typedef struct ImVector_ImDrawIdx ImVector_ImDrawIdx;
-typedef struct ImVector_ImVec4 ImVector_ImVec4;
-typedef struct ImVector_TextRange ImVector_TextRange;
-typedef struct ImVector_ImFontPtr ImVector_ImFontPtr;
-typedef struct ImVector_ImDrawCmd ImVector_ImDrawCmd;
-typedef struct ImVector_ImDrawVert ImVector_ImDrawVert;
-typedef struct ImVector_unsigned_short ImVector_unsigned_short;
-typedef struct ImVector_ImTextureID ImVector_ImTextureID;
-typedef struct ImVector_char ImVector_char;
-typedef struct ImVector_ImDrawChannel ImVector_ImDrawChannel;
-typedef struct ImVector_CustomRect ImVector_CustomRect;
-typedef struct ImVector_Pair ImVector_Pair;
-typedef struct ImVector_unsigned_char ImVector_unsigned_char;
-typedef struct ImVector_ImFontGlyph ImVector_ImFontGlyph;
-typedef struct ImVector_ImFontConfig ImVector_ImFontConfig;
-typedef struct ImVector_ImWchar ImVector_ImWchar;
-typedef struct ImVector_float ImVector_float;
 typedef struct ImVec4 ImVec4;
 typedef struct ImVec2 ImVec2;
 typedef struct ImGuiTextBuffer ImGuiTextBuffer;
@@ -588,24 +570,24 @@ struct ImGuiIO
     float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
 };
 typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
-struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
-struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
-struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
-struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
-struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
-struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
-struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
-struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
-struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
-struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
-struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
-struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
-struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
-struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
-struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
-struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
-struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
-struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
+typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
+typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
+typedef struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
+typedef struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
+typedef struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
+typedef struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
+typedef struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
+typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
+typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
+typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
+typedef struct ImVector_unsigned_short {int Size;int Capacity;unsigned short* Data;} ImVector_unsigned_short;
+typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
+typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
+typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
+typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
+typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
+typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
+typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
 struct ImNewDummy {};
 struct ImGuiOnceUponAFrame
 {