diff --git a/Source/Engine/Engine/Linux/LinuxGame.cpp b/Source/Engine/Engine/Linux/LinuxGame.cpp
index 1f59a66a9..3fe7c6a92 100644
--- a/Source/Engine/Engine/Linux/LinuxGame.cpp
+++ b/Source/Engine/Engine/Linux/LinuxGame.cpp
@@ -7,6 +7,7 @@
 #include "Engine/Platform/FileSystem.h"
 #include "Engine/Core/Config/PlatformSettings.h"
 #include "Engine/Engine/CommandLine.h"
+#include "Engine/Engine/Globals.h"
 #include "Engine/Graphics/Textures/TextureData.h"
 // hack using TextureTool in Platform module -> TODO: move texture data sampling to texture data itself
 #define COMPILE_WITH_TEXTURE_TOOL 1
diff --git a/Source/Engine/Platform/Linux/LinuxFileSystem.cpp b/Source/Engine/Platform/Linux/LinuxFileSystem.cpp
index ffe91a700..08119e338 100644
--- a/Source/Engine/Platform/Linux/LinuxFileSystem.cpp
+++ b/Source/Engine/Platform/Linux/LinuxFileSystem.cpp
@@ -6,6 +6,7 @@
 #include "Engine/Platform/File.h"
 #include "Engine/Core/Types/String.h"
 #include "Engine/Core/Types/StringView.h"
+#include "Engine/Core/Types/TimeSpan.h"
 #include "Engine/Core/Math/Math.h"
 #include "Engine/Utilities/StringConverter.h"
 #include <sys/types.h>
diff --git a/Source/Engine/Platform/Linux/LinuxPlatform.cpp b/Source/Engine/Platform/Linux/LinuxPlatform.cpp
index 8c212314c..90bd1784f 100644
--- a/Source/Engine/Platform/Linux/LinuxPlatform.cpp
+++ b/Source/Engine/Platform/Linux/LinuxPlatform.cpp
@@ -2031,8 +2031,8 @@ bool LinuxPlatform::Init()
     char buffer[UNIX_APP_BUFF_SIZE];
 
     // Get user locale string
-    char* locale = setlocale(LC_ALL, NULL);
-    if (strcmp (locale, "C") == 0)
+    const char* locale = setlocale(LC_ALL, NULL);
+    if (strcmp(locale, "C") == 0)
         locale = "";
     UserLocale = String(locale);
 
diff --git a/Source/ThirdParty/fmt/format-inl.h b/Source/ThirdParty/fmt/format-inl.h
index 1a9868f7e..074fa83b5 100644
--- a/Source/ThirdParty/fmt/format-inl.h
+++ b/Source/ThirdParty/fmt/format-inl.h
@@ -15,6 +15,8 @@
 #include <cctype>
 #include <cerrno>
 #include <climits>
+#include <limits>
+#include <limits.h>
 #include <math.h>
 #include <cstdarg>
 #include <cstddef>  // for std::ptrdiff_t
@@ -303,13 +305,11 @@ class fp {
 
   // All sizes are in bits.
   static FMT_CONSTEXPR_DECL const int char_size =
-    8;
-    //std::numeric_limits<unsigned char>::digits;
+    std::numeric_limits<unsigned char>::digits;
   // Subtract 1 to account for an implicit most significant bit in the
   // normalized form.
   static FMT_CONSTEXPR_DECL const int double_significand_size =
-    52 - 1;
-    //std::numeric_limits<double>::digits - 1;
+    std::numeric_limits<double>::digits - 1;
   static FMT_CONSTEXPR_DECL const uint64_t implicit_bit =
     1ull << double_significand_size;