diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 4edd4ca38..905282472 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -9,10 +9,6 @@
 
 #include "guis/GuiMenu.h"
 
-#if defined(_WIN64)
-#include <winsock2.h>
-#endif
-
 #include "CollectionSystemsManager.h"
 #include "EmulationStation.h"
 #include "FileFilterIndex.h"
diff --git a/es-core/src/ThemeData.h b/es-core/src/ThemeData.h
index 75a658e9f..f8509b2d6 100644
--- a/es-core/src/ThemeData.h
+++ b/es-core/src/ThemeData.h
@@ -22,6 +22,11 @@
 #include <sstream>
 #include <vector>
 
+#if defined(_WIN64)
+// Why this is needed here is anyone's guess but without it the compilation fails.
+#include <winsock2.h>
+#endif
+
 namespace pugi
 {
     class xml_node;
diff --git a/es-core/src/components/GIFAnimComponent.cpp b/es-core/src/components/GIFAnimComponent.cpp
index ec35c3c3a..07844f725 100644
--- a/es-core/src/components/GIFAnimComponent.cpp
+++ b/es-core/src/components/GIFAnimComponent.cpp
@@ -11,7 +11,6 @@
 #include "components/GIFAnimComponent.h"
 
 #include "Log.h"
-#include "ThemeData.h"
 #include "Window.h"
 #include "resources/ResourceManager.h"
 #include "utils/StringUtil.h"
diff --git a/es-core/src/components/GIFAnimComponent.h b/es-core/src/components/GIFAnimComponent.h
index b17db8586..4002a7540 100644
--- a/es-core/src/components/GIFAnimComponent.h
+++ b/es-core/src/components/GIFAnimComponent.h
@@ -10,6 +10,7 @@
 #define ES_CORE_COMPONENTS_GIF_ANIM_COMPONENT_H
 
 #include "GuiComponent.h"
+#include "ThemeData.h"
 #include "renderers/Renderer.h"
 #include "resources/TextureResource.h"
 #include "utils/MathUtil.h"