[redcode/crythread-2nd-pass] post merge include fixes

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-08-11 21:04:19 -07:00
parent f55ffae994
commit 8dd44075c8
7 changed files with 2 additions and 7 deletions
@@ -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"
@@ -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.
@@ -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.
@@ -13,7 +13,6 @@

 #include <platform.h>
 #include <type_traits>
-#include <MultiThread.h>

 void CryFatalError(const char*, ...) PRINTF_PARAMS(1, 2);
 #if defined(APPLE)