diff --git a/src/canvas.cpp b/src/canvas.cpp
index 1956c21..5988f78 100644
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -3,7 +3,6 @@
 #include <algorithm>
 #include <glm/ext/matrix_clip_space.hpp>
 #include <glm/ext/matrix_transform.hpp>
-#include <glm/gtc/matrix_inverse.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 #include "math.hpp"
diff --git a/src/clipboard.cpp b/src/clipboard.cpp
index f5d1ec3..ddcaf6a 100644
--- a/src/clipboard.cpp
+++ b/src/clipboard.cpp
@@ -1,6 +1,7 @@
 #include "clipboard.hpp"
 
-#include <SDL3/SDL.h>
+#include <SDL3/SDL_clipboard.h>
+#include <SDL3/SDL_stdinc.h>
 
 namespace anm2ed
 {
@@ -18,4 +19,4 @@ namespace anm2ed
   bool Clipboard::is_empty() { return get().empty(); }
 
   void Clipboard::set(const std::string& string) { SDL_SetClipboardText(string.data()); }
-}
\ No newline at end of file
+}
diff --git a/src/document.cpp b/src/document.cpp
index 2f8421e..4f0d8f7 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -5,7 +5,6 @@
 #include <cstdint>
 #include <limits>
 #include <new>
-#include <optional>
 #include <set>
 #include <string_view>
 #include <unordered_map>
diff --git a/src/imgui/actions.cpp b/src/imgui/actions.cpp
index f26078f..558ea91 100644
--- a/src/imgui/actions.cpp
+++ b/src/imgui/actions.cpp
@@ -2,6 +2,9 @@
 
 #include <utility>
 
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
+
 namespace anm2ed::imgui
 {
   bool is_action_shortcut_valid(int shortcutType) { return shortcutType >= 0 && shortcutType < SHORTCUT_COUNT; }
diff --git a/src/imgui/actions.hpp b/src/imgui/actions.hpp
index 17a2dca..665d6d4 100644
--- a/src/imgui/actions.hpp
+++ b/src/imgui/actions.hpp
@@ -3,7 +3,8 @@
 #include <functional>
 #include <vector>
 
-#include "util/imgui/imgui.hpp"
+#include <imgui/imgui.h>
+
 #include "manager.hpp"
 #include "settings.hpp"
 
diff --git a/src/imgui/documents.cpp b/src/imgui/documents.cpp
index 4494a42..1719dc1 100644
--- a/src/imgui/documents.cpp
+++ b/src/imgui/documents.cpp
@@ -8,6 +8,8 @@
 #include "strings.hpp"
 #include "time.hpp"
 #include "toast.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;
diff --git a/src/imgui/popup/autosave_restore.cpp b/src/imgui/popup/autosave_restore.cpp
index 0c44a08..f45bb35 100644
--- a/src/imgui/popup/autosave_restore.cpp
+++ b/src/imgui/popup/autosave_restore.cpp
@@ -3,7 +3,7 @@
 #include <format>
 
 #include "path.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::util;
diff --git a/src/imgui/popup/item_properties.cpp b/src/imgui/popup/item_properties.cpp
index cf83de8..cb3abc5 100644
--- a/src/imgui/popup/item_properties.cpp
+++ b/src/imgui/popup/item_properties.cpp
@@ -2,7 +2,9 @@
 
 #include <format>
 
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;
diff --git a/src/imgui/taskbar.cpp b/src/imgui/taskbar.cpp
index 013a1da..066ece1 100644
--- a/src/imgui/taskbar.cpp
+++ b/src/imgui/taskbar.cpp
@@ -13,6 +13,8 @@
 #include "strings.hpp"
 #include "toast.hpp"
 #include "types.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;
diff --git a/src/imgui/taskbar.hpp b/src/imgui/taskbar.hpp
index 722b948..7862751 100644
--- a/src/imgui/taskbar.hpp
+++ b/src/imgui/taskbar.hpp
@@ -4,11 +4,11 @@
 
 #include "canvas.hpp"
 #include "dialog.hpp"
-#include "util/imgui/imgui.hpp"
 #include "manager.hpp"
 #include "resources.hpp"
 #include "settings.hpp"
 #include "strings.hpp"
+#include "util/imgui/popup.hpp"
 
 #include "wizard/about.hpp"
 #include "wizard/change_all_frame_properties.hpp"
diff --git a/src/imgui/toast.cpp b/src/imgui/toast.cpp
index bc04ea4..460890e 100644
--- a/src/imgui/toast.cpp
+++ b/src/imgui/toast.cpp
@@ -2,7 +2,6 @@
 
 #include <format>
 
-#include "log.hpp"
 #include <imgui/imgui.h>
 
 #include "types.hpp"
diff --git a/src/imgui/window/animation_preview.cpp b/src/imgui/window/animation_preview.cpp
index b178cbc..685ba95 100644
--- a/src/imgui/window/animation_preview.cpp
+++ b/src/imgui/window/animation_preview.cpp
@@ -12,7 +12,6 @@
 #include <glm/gtc/type_ptr.hpp>
 
 #include "actions.hpp"
-#include "util/imgui/imgui.hpp"
 #include "log.hpp"
 #include "math.hpp"
 #include "path.hpp"
@@ -20,6 +19,11 @@
 #include "toast.hpp"
 #include "tool.hpp"
 #include "types.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::types;
 using namespace anm2ed::util;
diff --git a/src/imgui/window/frame_properties.cpp b/src/imgui/window/frame_properties.cpp
index dc9a8a2..7ab2685 100644
--- a/src/imgui/window/frame_properties.cpp
+++ b/src/imgui/window/frame_properties.cpp
@@ -8,7 +8,8 @@
 #include "math.hpp"
 #include "strings.hpp"
 #include "types.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::util::math;
 using namespace anm2ed::types;
diff --git a/src/imgui/window/onionskin.cpp b/src/imgui/window/onionskin.cpp
index 76982a0..9de558d 100644
--- a/src/imgui/window/onionskin.cpp
+++ b/src/imgui/window/onionskin.cpp
@@ -2,8 +2,10 @@
 
 #include <glm/gtc/type_ptr.hpp>
 
-#include "util/imgui/imgui.hpp"
 #include "strings.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::types;
 using namespace glm;
diff --git a/src/imgui/window/spritesheet_editor.cpp b/src/imgui/window/spritesheet_editor.cpp
index 95ee086..2350d6a 100644
--- a/src/imgui/window/spritesheet_editor.cpp
+++ b/src/imgui/window/spritesheet_editor.cpp
@@ -6,12 +6,16 @@
 #include <utility>
 
 #include "actions.hpp"
-#include "util/imgui/imgui.hpp"
 #include "imgui_internal.h"
 #include "math.hpp"
 #include "strings.hpp"
 #include "tool.hpp"
 #include "types.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::types;
 using namespace anm2ed::resource;
diff --git a/src/imgui/window/timeline.cpp b/src/imgui/window/timeline.cpp
index 4b04599..f5a82d0 100644
--- a/src/imgui/window/timeline.cpp
+++ b/src/imgui/window/timeline.cpp
@@ -13,6 +13,10 @@
 #include "log.hpp"
 #include "toast.hpp"
 #include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 #include "vector.hpp"
 
diff --git a/src/imgui/window/tools.cpp b/src/imgui/window/tools.cpp
index f935342..1628265 100644
--- a/src/imgui/window/tools.cpp
+++ b/src/imgui/window/tools.cpp
@@ -6,7 +6,8 @@
 #include "strings.hpp"
 #include "tool.hpp"
 #include "types.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;
diff --git a/src/imgui/window/welcome.cpp b/src/imgui/window/welcome.cpp
index b9f2cb7..775e886 100644
--- a/src/imgui/window/welcome.cpp
+++ b/src/imgui/window/welcome.cpp
@@ -5,6 +5,8 @@
 
 #include "path.hpp"
 #include "strings.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/selectable.hpp"
 
 using namespace anm2ed::util;
 using namespace anm2ed::resource;
diff --git a/src/imgui/window/window.cpp b/src/imgui/window/window.cpp
index 8e13c3a..e91f518 100644
--- a/src/imgui/window/window.cpp
+++ b/src/imgui/window/window.cpp
@@ -13,6 +13,11 @@
 #include "path.hpp"
 #include "strings.hpp"
 #include "toast.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 #include "vector.hpp"
 #include "working_directory.hpp"
 
diff --git a/src/imgui/window/window.hpp b/src/imgui/window/window.hpp
index 4b2033f..d7006f4 100644
--- a/src/imgui/window/window.hpp
+++ b/src/imgui/window/window.hpp
@@ -7,11 +7,12 @@
 
 #include "clipboard.hpp"
 #include "dialog.hpp"
-#include "util/imgui/imgui.hpp"
 #include "manager.hpp"
 #include "resources.hpp"
 #include "settings.hpp"
 #include "storage.hpp"
+#include "util/imgui/popup.hpp"
+#include "util/imgui/selectable.hpp"
 
 namespace anm2ed::imgui
 {
diff --git a/src/imgui/wizard/change_all_frame_properties.cpp b/src/imgui/wizard/change_all_frame_properties.cpp
index f24d39a..61146f7 100644
--- a/src/imgui/wizard/change_all_frame_properties.cpp
+++ b/src/imgui/wizard/change_all_frame_properties.cpp
@@ -7,7 +7,8 @@
 #include <vector>
 
 #include "math.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::util::math;
 using namespace glm;
diff --git a/src/imgui/wizard/configure.cpp b/src/imgui/wizard/configure.cpp
index acc927c..8c8447b 100644
--- a/src/imgui/wizard/configure.cpp
+++ b/src/imgui/wizard/configure.cpp
@@ -1,9 +1,10 @@
 #include "configure.hpp"
 
-#include "log.hpp"
-#include "path.hpp"
 #include "sdl.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/theme.hpp"
 
 using namespace anm2ed::types;
 
diff --git a/src/imgui/wizard/generate_animation_from_grid.cpp b/src/imgui/wizard/generate_animation_from_grid.cpp
index 587f5e8..ab3daac 100644
--- a/src/imgui/wizard/generate_animation_from_grid.cpp
+++ b/src/imgui/wizard/generate_animation_from_grid.cpp
@@ -3,7 +3,9 @@
 #include <algorithm>
 #include "math.hpp"
 #include "types.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::types;
 using namespace anm2ed::util;
diff --git a/src/imgui/wizard/render_animation.cpp b/src/imgui/wizard/render_animation.cpp
index b965bd2..b9718b8 100644
--- a/src/imgui/wizard/render_animation.cpp
+++ b/src/imgui/wizard/render_animation.cpp
@@ -3,11 +3,13 @@
 #include <ranges>
 #include <string>
 
-#include "util/imgui/imgui.hpp"
 #include "log.hpp"
 #include "path.hpp"
 #include "process.hpp"
 #include "toast.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::util;
diff --git a/src/loader.cpp b/src/loader.cpp
index f2e4bea..7faa8c6 100644
--- a/src/loader.cpp
+++ b/src/loader.cpp
@@ -14,11 +14,10 @@
 #include "sdl.hpp"
 #include "texture.hpp"
 
-#include "util/imgui/imgui.hpp"
-
 #include "snapshots.hpp"
 #include "socket.hpp"
 
+#include "util/imgui/theme.hpp"
 #include "util/math.hpp"
 
 #ifdef _WIN32
diff --git a/src/log.cpp b/src/log.cpp
index 6d7e2e8..42d916f 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -6,7 +6,6 @@
 #include <print>
 
 #include "file.hpp"
-#include "path.hpp"
 #include "sdl.hpp"
 #include "strings.hpp"
 #include "time.hpp"
diff --git a/src/playback.cpp b/src/playback.cpp
index 36486b0..cff7a0e 100644
--- a/src/playback.cpp
+++ b/src/playback.cpp
@@ -1,6 +1,5 @@
 #include "playback.hpp"
 
-#include <algorithm>
 #include <cmath>
 
 #include <glm/common.hpp>
diff --git a/src/render.cpp b/src/render.cpp
index f183d63..5b164b1 100644
--- a/src/render.cpp
+++ b/src/render.cpp
@@ -8,11 +8,15 @@
 #include <fstream>
 #include <string>
 
+#include <SDL3/SDL_timer.h>
+
 #include "log.hpp"
 #include "path.hpp"
 #include "process.hpp"
-#include "sdl.hpp"
-#include "string.hpp"
+
+#if _WIN32
+  #include "string.hpp"
+#endif
 
 using namespace anm2ed::util;
 
diff --git a/src/util/file.cpp b/src/util/file.cpp
index 0071b3a..c3055fb 100644
--- a/src/util/file.cpp
+++ b/src/util/file.cpp
@@ -1,7 +1,6 @@
 #include "file.hpp"
 
 #include <array>
-#include <cstring>
 
 namespace anm2ed::util
 {
@@ -16,7 +15,8 @@ namespace anm2ed::util
 #ifdef _WIN32
     std::wstring wideMode{};
     if (mode)
-      wideMode.assign(mode, mode + std::strlen(mode));
+      for (auto character = mode; *character; ++character)
+        wideMode.push_back((wchar_t)*character);
     else
       wideMode = L"rb";
     handle = _wfopen(path.native().c_str(), wideMode.c_str());
diff --git a/src/util/imgui/imgui.hpp b/src/util/imgui/imgui.hpp
deleted file mode 100644
index 9916e8d..0000000
--- a/src/util/imgui/imgui.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "constants.hpp"
-#include "draw.hpp"
-#include "input.hpp"
-#include "layout.hpp"
-#include "multiselect.hpp"
-#include "popup.hpp"
-#include "selectable.hpp"
-#include "shortcut.hpp"
-#include "theme.hpp"
-#include "tooltip.hpp"
diff --git a/src/util/imgui/popup.cpp b/src/util/imgui/popup.cpp
index 1460ce9..b4398c0 100644
--- a/src/util/imgui/popup.cpp
+++ b/src/util/imgui/popup.cpp
@@ -1,6 +1,5 @@
 #include "popup.hpp"
 
-#include <glm/glm.hpp>
 #include <imgui/imgui.h>
 
 #include "types.hpp"
diff --git a/src/util/path.cpp b/src/util/path.cpp
index a4fa375..ccfa1e8 100644
--- a/src/util/path.cpp
+++ b/src/util/path.cpp
@@ -1,7 +1,6 @@
 #include "path.hpp"
 
-#include <SDL3/SDL_filesystem.h>
-#include <SDL3/SDL_stdinc.h>
+#include <algorithm>
 #include <cctype>
 #include <cwctype>
 #include <filesystem>
diff --git a/src/util/sdl.cpp b/src/util/sdl.cpp
index 8d5040d..014093e 100644
--- a/src/util/sdl.cpp
+++ b/src/util/sdl.cpp
@@ -1,6 +1,7 @@
 #include "sdl.hpp"
 
-#include <SDL3/SDL.h>
+#include <SDL3/SDL_filesystem.h>
+#include <SDL3/SDL_stdinc.h>
 
 #include "path.hpp"
 
@@ -14,4 +15,4 @@ namespace anm2ed::util::sdl
     SDL_free(sdlPath);
     return filePath;
   }
-}
\ No newline at end of file
+}