diff --git a/retroarch.h b/retroarch.h
index 4c4db9d222..02c045378f 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -1902,6 +1902,7 @@ extern video_driver_t video_null;
 extern const gfx_ctx_driver_t gfx_ctx_osmesa;
 extern const gfx_ctx_driver_t gfx_ctx_sdl_gl;
 extern const gfx_ctx_driver_t gfx_ctx_x_egl;
+extern const gfx_ctx_driver_t gfx_ctx_uwp;
 extern const gfx_ctx_driver_t gfx_ctx_wayland;
 extern const gfx_ctx_driver_t gfx_ctx_x;
 extern const gfx_ctx_driver_t gfx_ctx_drm;
diff --git a/uwp/uwp_func.h b/uwp/uwp_func.h
index 04bde58d72..5138084509 100644
--- a/uwp/uwp_func.h
+++ b/uwp/uwp_func.h
@@ -47,8 +47,8 @@ void uwp_input_next_frame(void);
 bool uwp_keyboard_pressed(unsigned key);
 int16_t uwp_mouse_state(unsigned port, unsigned id, bool screen);
 int16_t uwp_pointer_state(unsigned idx, unsigned id, bool screen);
-const char* uwp_get_cpu_model_name();
-enum retro_language uwp_get_language();
+const char* uwp_get_cpu_model_name(void);
+enum retro_language uwp_get_language(void);
 
 void uwp_fill_installed_core_packages(struct string_list *list);
 
diff --git a/uwp/uwp_main.cpp b/uwp/uwp_main.cpp
index b77833f807..d45161028d 100644
--- a/uwp/uwp_main.cpp
+++ b/uwp/uwp_main.cpp
@@ -13,22 +13,23 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "uwp_main.h"
+#include <ppltasks.h>
+#include <collection.h>
+#include <windows.devices.enumeration.h>
+
+#include <encodings/utf.h>
+#include <lists/string_list.h>
 #include <queues/task_queue.h>
 #include <retro_timers.h>
+
+#include "uwp_main.h"
 #include "../retroarch.h"
 #include "../frontend/frontend.h"
 #include "../input/input_keymaps.h"
 #include "../verbosity.h"
-#include "../libretro-common/include/encodings/utf.h"
-#include "../libretro-common/include/lists/string_list.h"
 #include "uwp_func.h"
 #include "uwp_async.h"
 
-#include <ppltasks.h>
-#include <collection.h>
-#include <windows.devices.enumeration.h>
-
 #if defined(HAVE_OPENGL) && defined(HAVE_ANGLE)
 #ifndef HAVE_EGL
 #define HAVE_EGL       1