From 8dd44075c85a98214dfa679e330de30cf6c5792f Mon Sep 17 00:00:00 2001
From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
Date: Wed, 11 Aug 2021 21:04:19 -0700
Subject: [PATCH] [redcode/crythread-2nd-pass] post merge include fixes

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
---
 Code/Editor/GameEngine.h                                        | 1 -
 Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp    | 1 -
 .../Platform/Android/GridMate/Session/LANSession_Android.cpp    | 1 +
 Code/Legacy/CryCommon/CryLibrary.h                              | 2 +-
 Code/Legacy/CryCommon/IFunctorBase.h                            | 2 --
 Code/Legacy/CryCommon/IMaterial.h                               | 1 -
 Code/Legacy/CryCommon/smartptr.h                                | 1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Code/Editor/GameEngine.h b/Code/Editor/GameEngine.h
index 64fd20a9aa..4d183cc38e 100644
--- a/Code/Editor/GameEngine.h
+++ b/Code/Editor/GameEngine.h
@@ -20,7 +20,6 @@
 #include "LogFile.h"
 #include "CryListenerSet.h"
 #include "Util/ModalWindowDismisser.h"
-#include <CryCommon/CryThread.h>
 #endif
 
 class CStartupLogoDialog;
diff --git a/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp b/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp
index f8f4711631..34514b8ef1 100644
--- a/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp
+++ b/Code/Editor/Plugins/PerforcePlugin/PerforceSourceControl.cpp
@@ -9,7 +9,6 @@
 #include "CryFile.h"
 #include "PerforceSourceControl.h"
 #include "PasswordDlg.h"
-#include <CryCommon/CryThread.h>
 
 #include <QSettings>
 #include <QDir>
diff --git a/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp b/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp
index 05fb56dfc1..3fa2a369a6 100644
--- a/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp
+++ b/Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp
@@ -7,6 +7,7 @@
  */
 
 #include <unistd.h>
+#include <AzCore/std/string/string.h>
 
 namespace GridMate
 {
diff --git a/Code/Legacy/CryCommon/CryLibrary.h b/Code/Legacy/CryCommon/CryLibrary.h
index 787085af00..a034a2a04b 100644
--- a/Code/Legacy/CryCommon/CryLibrary.h
+++ b/Code/Legacy/CryCommon/CryLibrary.h
@@ -49,7 +49,7 @@
 */
 
 #include <stdio.h>
-#include <AzCore/PlatformDef.h>
+#include <AzCore/PlatformIncl.h>
 #include <AzCore/Module/Environment.h>
 
 #define INJECT_ENVIRONMENT_FUNCTION "InjectEnvironment"
diff --git a/Code/Legacy/CryCommon/IFunctorBase.h b/Code/Legacy/CryCommon/IFunctorBase.h
index a64e811516..6fb3a5d981 100644
--- a/Code/Legacy/CryCommon/IFunctorBase.h
+++ b/Code/Legacy/CryCommon/IFunctorBase.h
@@ -14,8 +14,6 @@
 #define CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H
 #pragma once
 
-#include <CryCommon/CryThread.h>
-
 #include <AzCore/std/parallel/atomic.h>
 
 // Base class for functor storage.
diff --git a/Code/Legacy/CryCommon/IMaterial.h b/Code/Legacy/CryCommon/IMaterial.h
index c484c10482..83f9140be7 100644
--- a/Code/Legacy/CryCommon/IMaterial.h
+++ b/Code/Legacy/CryCommon/IMaterial.h
@@ -37,7 +37,6 @@ struct IRenderMesh;
 #include <IXml.h>
 #include <smartptr.h>
 #include <AzCore/EBus/EBus.h>
-#include <CryThread.h>
 
 #ifdef MAX_SUB_MATERIALS
 // This checks that the values are in sync in the different files.
diff --git a/Code/Legacy/CryCommon/smartptr.h b/Code/Legacy/CryCommon/smartptr.h
index 0ff6a61b60..baf51d5030 100644
--- a/Code/Legacy/CryCommon/smartptr.h
+++ b/Code/Legacy/CryCommon/smartptr.h
@@ -13,7 +13,6 @@
 
 #include <platform.h>
 #include <type_traits>
-#include <MultiThread.h>
 
 void CryFatalError(const char*, ...) PRINTF_PARAMS(1, 2);
 #if defined(APPLE)