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/LauncherUnified/Platform/Mac/Launcher_Mac.mm b/Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm
index cfba0d8aac..f4ea67c6e6 100644
--- a/Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm
+++ b/Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm
@@ -11,6 +11,8 @@
 #include <../Common/Apple/Launcher_Apple.h>
 #include <../Common/UnixLike/Launcher_UnixLike.h>
 
+#include <AzCore/Math/Vector2.h>
+
 #if AZ_TESTS_ENABLED
 
 int main(int argc, char* argv[])
diff --git a/Code/Legacy/CryCommon/VectorMap.h b/Code/Legacy/CryCommon/VectorMap.h
index 1a42f0e48f..ee99c6f952 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 <StlUtils.h> // for stl::free_container
 
 //--------------------------------------------------------------------------
 // VectorMap
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
index 7dd2629bd0..018bc74877 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
@@ -96,7 +96,7 @@ namespace AZ
         void UnregisterFont(const char* fontName);
 
     private:
-        using FontMap = std::unordered_map<AzFramework::FontId, FFont*>;
+        using FontMap = AZStd::unordered_map<AzFramework::FontId, FFont*>;
         using FontMapItor = FontMap::iterator;
         using FontMapConstItor = FontMap::const_iterator;