From ddf2fdea210583d238e37d251ed5daf8f8c55a34 Mon Sep 17 00:00:00 2001
From: Olivier Michel <Olivier.Michel@cyberbotics.com>
Date: Fri, 24 May 2024 11:18:57 +0200
Subject: [PATCH] Fixed Windows compilation on the CI worker (#6550)

* Update WbDisplay.cpp

* Update WbGuiApplication.cpp

* Update WbGuiApplication.cpp
---
 src/webots/gui/WbGuiApplication.cpp | 10 ++++++----
 src/webots/nodes/WbDisplay.cpp      |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/webots/gui/WbGuiApplication.cpp b/src/webots/gui/WbGuiApplication.cpp
index 5b72f543513..ad1d1f97a3c 100644
--- a/src/webots/gui/WbGuiApplication.cpp
+++ b/src/webots/gui/WbGuiApplication.cpp
@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifdef _WIN32
+#include <dwmapi.h>
+#include <windows.h>
+#include <QtGui/QWindow>
+#endif
+
 #include "WbGuiApplication.hpp"
 
 #include "WbApplication.hpp"
@@ -492,10 +498,6 @@ void WbGuiApplication::loadInitialWorld() {
 }
 
 #ifdef _WIN32
-#include <Windows.h>
-#include <dwmapi.h>
-#include <QtGui/QWindow>
-
 static bool windowsDarkMode = false;
 
 enum PreferredAppMode { Default, AllowDark, ForceDark, ForceLight, Max };
diff --git a/src/webots/nodes/WbDisplay.cpp b/src/webots/nodes/WbDisplay.cpp
index cc2c6899817..66702e6746f 100644
--- a/src/webots/nodes/WbDisplay.cpp
+++ b/src/webots/nodes/WbDisplay.cpp
@@ -40,6 +40,10 @@
 
 #include <QtCore/QDataStream>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #define SHIFT(value, shift) (((value) >> (shift)) & 0xFF)
 
 class WbDisplayImage {