diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h
index 8b28ec38f6..ae4ca28779 100644
--- a/gfx/common/win32_common.h
+++ b/gfx/common/win32_common.h
@@ -35,7 +35,7 @@
 
 #ifndef _XBOX
 #include "../../ui/drivers/ui_win32_resource.h"
-#include "../../ui/drivers/win32/ui_win32_window.h"
+#include "../../ui/drivers/ui_win32.h"
 
 extern unsigned g_resize_width;
 extern unsigned g_resize_height;
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index afc2588ba7..9450e3d00b 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -54,7 +54,7 @@
 
 #include "../../gfx/common/gl_common.h"
 #include "../../gfx/common/win32_common.h"
-#include "win32/ui_win32_window.h"
+#include "ui_win32.h"
 
 #define SHADER_DLG_WIDTH                  220
 #define SHADER_DLG_MIN_HEIGHT             200
diff --git a/ui/drivers/win32/ui_win32_window.h b/ui/drivers/ui_win32.h
similarity index 92%
rename from ui/drivers/win32/ui_win32_window.h
rename to ui/drivers/ui_win32.h
index 957b2109b6..10c25cbd4d 100644
--- a/ui/drivers/win32/ui_win32_window.h
+++ b/ui/drivers/ui_win32.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _WIN32_WINDOW_UI
-#define _WIN32_WINDOW_UI
+#ifndef _WIN32_UI
+#define _WIN32_UI
 
 #include <stdint.h>
 #include <stddef.h>
@@ -28,7 +28,7 @@
 #include <windows.h>
 #endif
 
-#include "../../ui_companion_driver.h"
+#include "../ui_companion_driver.h"
 
 RETRO_BEGIN_DECLS
 
diff --git a/ui/drivers/win32/ui_win32_window.c b/ui/drivers/win32/ui_win32_window.c
index 49d8a1c244..2a371f2d89 100644
--- a/ui/drivers/win32/ui_win32_window.c
+++ b/ui/drivers/win32/ui_win32_window.c
@@ -41,7 +41,7 @@
 #include <retro_inline.h>
 #include <file/file_path.h>
 
-#include "ui_win32_window.h"
+#include "../ui_win32.h"
 
 #include "../../ui_companion_driver.h"
 #include "../../../driver.h"