diff --git a/src/main/main.cpp b/src/main/main.cpp
index 6863b7f..544b3b8 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -6,6 +6,7 @@
 #include <filesystem>
 #include <numeric>
 #include <stdexcept>
+#include <cinttypes>
 
 #include "nfd.h"
 
@@ -140,7 +141,7 @@ ultramodern::WindowHandle create_window(ultramodern::gfx_callbacks_t::gfx_data_t
     SDL_GetWindowWMInfo(window, &wmInfo);
 
 #if defined(_WIN32)
-    return zelda64::WindowHandle{ wmInfo.info.win.window, GetCurrentThreadId() };
+    return ultramodern::WindowHandle{ wmInfo.info.win.window, GetCurrentThreadId() };
 #elif defined(__ANDROID__)
     static_assert(false && "Unimplemented");
 #elif defined(__linux__)
diff --git a/src/ui/ui_renderer.cpp b/src/ui/ui_renderer.cpp
index ad8772b..b2c79fb 100644
--- a/src/ui/ui_renderer.cpp
+++ b/src/ui/ui_renderer.cpp
@@ -4,7 +4,12 @@
 
 #include <fstream>
 #include <filesystem>
+#ifdef _WIN32
+#include <SDL_video.h>
+#else
 #include <SDL2/SDL_video.h>
+#endif
+
 
 #include "zelda_ui.h"
 #include "zelda_input.h"