8 files changed, 15 insertions, 19 deletions
diff --git a/platform/uwp/app_uwp.cpp b/platform/uwp/app_uwp.cpp
index ddefa19708..789adb5e5b 100644
--- a/platform/uwp/app_uwp.cpp
+++ b/platform/uwp/app_uwp.cpp
@@ -28,17 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-//
-// This file demonstrates how to initialize EGL in a Windows Store app, using ICoreWindow.
-//
-
 #include "app_uwp.h"
 
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/os/keyboard.h"
 #include "main/main.h"
-
 #include "platform/windows/key_mapping_windows.h"
 
 #include <collection.h>
diff --git a/platform/uwp/app_uwp.h b/platform/uwp/app_uwp.h
index 9fd4967c21..87c66bd679 100644
--- a/platform/uwp/app_uwp.h
+++ b/platform/uwp/app_uwp.h
@@ -31,12 +31,11 @@
 #ifndef APP_UWP_H
 #define APP_UWP_H
 
-#include <string>
+#include "os_uwp.h"
 
+#include <GLES2/gl2.h>
 #include <wrl.h>
-
-#include "GLES2/gl2.h"
-#include "os_uwp.h"
+#include <string>
 
 /** clang-format does not play nice with this C++/CX hybrid, needs investigation. */
 /* clang-format off */
diff --git a/platform/uwp/context_egl_uwp.cpp b/platform/uwp/context_egl_uwp.cpp
index df5da99a1c..aa8cfb4d49 100644
--- a/platform/uwp/context_egl_uwp.cpp
+++ b/platform/uwp/context_egl_uwp.cpp
@@ -30,7 +30,7 @@
 
 #include "context_egl_uwp.h"
 
-#include "EGL/eglext.h"
+#include <EGL/eglext.h>
 
 using Platform::Exception;
 
diff --git a/platform/uwp/context_egl_uwp.h b/platform/uwp/context_egl_uwp.h
index a778849334..810c3dcbc1 100644
--- a/platform/uwp/context_egl_uwp.h
+++ b/platform/uwp/context_egl_uwp.h
@@ -31,13 +31,12 @@
 #ifndef CONTEXT_EGL_UWP_H
 #define CONTEXT_EGL_UWP_H
 
-#include <wrl.h>
-
-#include <EGL/egl.h>
-
 #include "core/error/error_list.h"
 #include "core/os/os.h"
 
+#include <EGL/egl.h>
+#include <wrl.h>
+
 using namespace Windows::UI::Core;
 
 class ContextEGL_UWP {
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index c20e3316a5..3e229c7419 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -30,9 +30,10 @@
 
 #include "export.h"
 
+#include "export_plugin.h"
+
 #include "editor/editor_settings.h"
 #include "editor/export/editor_export.h"
-#include "export_plugin.h"
 
 void register_uwp_exporter_types() {
 	// GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformUWP);
diff --git a/platform/uwp/export/export_plugin.cpp b/platform/uwp/export/export_plugin.cpp
index aac61184b1..69de383efc 100644
--- a/platform/uwp/export/export_plugin.cpp
+++ b/platform/uwp/export/export_plugin.cpp
@@ -30,9 +30,10 @@
 
 #include "export_plugin.h"
 
+#include "../logo_svg.gen.h"
+
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "platform/uwp/logo_svg.gen.h"
 
 #include "modules/modules_enabled.gen.h" // For svg and regex.
 #ifdef MODULE_SVG_ENABLED
diff --git a/platform/uwp/export/export_plugin.h b/platform/uwp/export/export_plugin.h
index b42a2ae6d9..999d54cb80 100644
--- a/platform/uwp/export/export_plugin.h
+++ b/platform/uwp/export/export_plugin.h
@@ -31,6 +31,8 @@
 #ifndef UWP_EXPORT_PLUGIN_H
 #define UWP_EXPORT_PLUGIN_H
 
+#include "app_packager.h"
+
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
@@ -46,8 +48,6 @@
 #include "thirdparty/minizip/unzip.h"
 #include "thirdparty/minizip/zip.h"
 
-#include "app_packager.h"
-
 #include <zlib.h>
 
 // Capabilities
diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h
index 153656add7..7f2195e4fd 100644
--- a/platform/uwp/os_uwp.h
+++ b/platform/uwp/os_uwp.h
@@ -32,12 +32,13 @@
 #define OS_UWP_H
 
 #include "context_egl_uwp.h"
+#include "joypad_uwp.h"
+
 #include "core/input/input.h"
 #include "core/math/transform_2d.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
 #include "drivers/xaudio2/audio_driver_xaudio2.h"
-#include "joypad_uwp.h"
 #include "servers/audio_server.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering_server.h"