diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index 5bd29702f2..37dc50b19d 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -33,19 +33,6 @@
 
 #include <GL/glew.h>
 
-#ifdef _WIN32
-// no specific include - already inside of libslic3r/Emboss.hpp
-#elif defined(__APPLE__)
-#include <wx/uri.h>
-#include <CoreText/CTFont.h>
-#include <wx/osx/core/cfdictionary.h>
-#elif defined(__linux__)
-// Font Config must exist
-#include <wx/filename.h>
-#include <fontconfig/fontconfig.h>
-#include "slic3r/Utils/FontConfigHelp.hpp"
-#endif
-
 // uncomment for easier debug
 //#define ALLOW_DEBUG_MODE
 
diff --git a/src/slic3r/Utils/FontConfigHelp.cpp b/src/slic3r/Utils/FontConfigHelp.cpp
index 511c7af33a..5421dbd7f5 100644
--- a/src/slic3r/Utils/FontConfigHelp.cpp
+++ b/src/slic3r/Utils/FontConfigHelp.cpp
@@ -1,7 +1,10 @@
 #include "FontConfigHelp.hpp"
 
 #ifdef EXIST_FONT_CONFIG_INCLUDE
+
+#include <wx/filename.h>
 #include <fontconfig/fontconfig.h>
+#include "libslic3r/Utils.hpp"
 
 using namespace Slic3r::GUI;
 
diff --git a/src/slic3r/Utils/WxFontUtils.cpp b/src/slic3r/Utils/WxFontUtils.cpp
index d6aa5df496..c33f3d9387 100644
--- a/src/slic3r/Utils/WxFontUtils.cpp
+++ b/src/slic3r/Utils/WxFontUtils.cpp
@@ -1,6 +1,14 @@
 #include "WxFontUtils.hpp"
 #include "libslic3r/MapUtils.hpp"
 
+#if defined(__APPLE__)
+#include <wx/uri.h>
+#include <CoreText/CTFont.h>
+#include <wx/osx/core/cfdictionary.h>
+#elif defined(__linux__)
+#include "slic3r/Utils/FontConfigHelp.hpp"
+#endif
+
 using namespace Slic3r;
 using namespace Slic3r::GUI;
 
@@ -27,7 +35,7 @@ std::optional<Emboss::Font> WxFontUtils::load_font(const wxFont &font)
     return Emboss::load_font(file_path.c_str());
 #elif defined(__linux__)
     static FontConfigHelp help;
-    std::string           font_path = help.get_font_path(font);
+    std::string font_path = help.get_font_path(font);
     if (font_path.empty()) return {};
     return Emboss::load_font(font_path.c_str());
 #else