diff --git a/Code/Editor/GameEngine.h b/Code/Editor/GameEngine.h
index 84df8bf002..829baec55a 100644
--- a/Code/Editor/GameEngine.h
+++ b/Code/Editor/GameEngine.h
@@ -20,6 +20,7 @@
 #include "LogFile.h"
 #include "CryListenerSet.h"
 #include "Util/ModalWindowDismisser.h"
+#include <CryCommon/CryThread.h>
 #endif
 
 class CStartupLogoDialog;
diff --git a/Code/Editor/Include/IObjectManager.h b/Code/Editor/Include/IObjectManager.h
index efc1955a56..360cc8fe34 100644
--- a/Code/Editor/Include/IObjectManager.h
+++ b/Code/Editor/Include/IObjectManager.h
@@ -12,6 +12,7 @@
 #pragma once
 
 #include <AzCore/PlatformIncl.h>
+#include <AzCore/Math/Guid.h>
 #include <CryCommon/platform.h>
 #include <CryCommon/Cry_Geo.h>
 #include <set>
diff --git a/Code/Editor/QtUtil.h b/Code/Editor/QtUtil.h
index bb1f8ba427..a16eb1e692 100644
--- a/Code/Editor/QtUtil.h
+++ b/Code/Editor/QtUtil.h
@@ -12,6 +12,7 @@
 #include <QString>
 #include <CryString.h>
 #include "UnicodeFunctions.h"
+#include <CryCommon/StlUtils.h>
 
 #include <QApplication>
 #include <QDropEvent>
diff --git a/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp b/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp
index 1e87b902a6..3030dcc740 100644
--- a/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp
+++ b/Code/LauncherUnified/Platform/Linux/Launcher_Linux.cpp
@@ -10,6 +10,7 @@
 
 #include <AzCore/Debug/StackTracer.h>
 #include <AzCore/IO/SystemFile.h> // for AZ_MAX_PATH_LEN
+#include <AzCore/Math/Vector2.h>
 
 #include <CryLibrary.h>
 
diff --git a/Code/Legacy/CryCommon/AppleSpecific.h b/Code/Legacy/CryCommon/AppleSpecific.h
index 87aea0fbb5..df3b7578eb 100644
--- a/Code/Legacy/CryCommon/AppleSpecific.h
+++ b/Code/Legacy/CryCommon/AppleSpecific.h
@@ -355,13 +355,9 @@ enum
 #define wcsnicmp wcsncasecmp
 //#define memcpy_s(dest,bytes,src,n) memcpy(dest,src,n)
 #define _isnan ISNAN
-#define _wtof(str) wcstod(str, 0)
-
 
 #define TARGET_DEFAULT_ALIGN (0x8U)
 
-
-
 #define _msize malloc_size
 
 
diff --git a/Code/Legacy/CryCommon/CryThread_pthreads.h b/Code/Legacy/CryCommon/CryThread_pthreads.h
index 2c6b389dbb..17f7e5d2a0 100644
--- a/Code/Legacy/CryCommon/CryThread_pthreads.h
+++ b/Code/Legacy/CryCommon/CryThread_pthreads.h
@@ -653,15 +653,9 @@ private:
 
 typedef CryEventTimed CryEvent;
 
-#if !PLATFORM_SUPPORTS_THREADLOCAL
-TLS_DECLARE(class CrySimpleThreadSelf*, g_CrySimpleThreadSelf);
-#endif
-
 class CrySimpleThreadSelf
 {
 protected:
-#if PLATFORM_SUPPORTS_THREADLOCAL
-
     static CrySimpleThreadSelf* GetSelf()
     {
         return m_Self;
@@ -673,20 +667,6 @@ protected:
     }
 private:
     static AZ_THREAD_LOCAL CrySimpleThreadSelf* m_Self;
-
-#else
-
-    static CrySimpleThreadSelf* GetSelf()
-    {
-        return TLS_GET(CrySimpleThreadSelf*, g_CrySimpleThreadSelf);
-    }
-
-    static void SetSelf(CrySimpleThreadSelf* pSelf)
-    {
-        TLS_SET(g_CrySimpleThreadSelf, pSelf);
-    }
-
-#endif
 };
 
 template<class Runnable>
diff --git a/Code/Legacy/CryCommon/LinuxSpecific.h b/Code/Legacy/CryCommon/LinuxSpecific.h
index a587350cb2..112e965555 100644
--- a/Code/Legacy/CryCommon/LinuxSpecific.h
+++ b/Code/Legacy/CryCommon/LinuxSpecific.h
@@ -209,8 +209,20 @@ typedef unsigned long int threadID;
 #define wcsicmp wcscasecmp
 #define wcsnicmp wcsncasecmp
 
-
-#define _wtof(str) wcstod(str, 0)
+typedef union _LARGE_INTEGER
+{
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    };
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    } u;
+    long long QuadPart;
+} LARGE_INTEGER;
 
 // stdlib.h stuff
 #define _MAX_DRIVE  3   // max. length of drive component
diff --git a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
index 2de17e6b28..625add59ad 100644
--- a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
+++ b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h
@@ -324,8 +324,6 @@ inline uint32 GetTickCount()
 #define _strlwr_s(BUF, SIZE) strlwr(BUF)
 #define _strups strupr
 
-#define _wtof(str) wcstod(str, 0)
-
 // Need to include this before using it's used in finddata, but after the strnicmp definition
 #include "CryString.h"
 
diff --git a/Code/Legacy/CryCommon/VectorMap.h b/Code/Legacy/CryCommon/VectorMap.h
index 1a42f0e48f..75b1562c4d 100644
--- a/Code/Legacy/CryCommon/VectorMap.h
+++ b/Code/Legacy/CryCommon/VectorMap.h
@@ -14,6 +14,7 @@
 #define CRYINCLUDE_CRYCOMMON_VECTORMAP_H
 #pragma once
 
+#include <CryCommon/StlUtils.h>
 
 //--------------------------------------------------------------------------
 // VectorMap