diff --git a/ui/drivers/win32/ui_win32_window.c b/ui/drivers/win32/ui_win32_window.c
index 43b8921ed0..3f5899f37c 100644
--- a/ui/drivers/win32/ui_win32_window.c
+++ b/ui/drivers/win32/ui_win32_window.c
@@ -41,6 +41,8 @@
 #include <retro_inline.h>
 #include <file/file_path.h>
 
+#include "ui_win32_window.h"
+
 #include "../../ui_companion_driver.h"
 #include "../../../driver.h"
 #include "../../../runloop.h"
@@ -49,7 +51,7 @@
 void ui_window_win32_destroy(void *data)
 {
    ui_window_win32_t *window = (ui_window_win32_t*)data;
-   DestroyWindow(hwnd);
+   DestroyWindow(window->hwnd);
 }
 
 void ui_window_win32_set_visible(void *data,
diff --git a/ui/drivers/win32/ui_win32_window.h b/ui/drivers/win32/ui_win32_window.h
index 6b3e5a6838..ffd263413b 100644
--- a/ui/drivers/win32/ui_win32_window.h
+++ b/ui/drivers/win32/ui_win32_window.h
@@ -28,7 +28,7 @@
 #include <windows.h>
 #endif
 
-#icnlude "../../ui_companion_driver.h"
+#include "../../ui_companion_driver.h"
 
 RETRO_BEGIN_DECLS
 
diff --git a/ui/drivers/win32/win32_window.c b/ui/drivers/win32/win32_window.c
new file mode 100644
index 0000000000..e69de29bb2