diff --git a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h
index 604d88d037..4681b19bf2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ActorInstanceCommands.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMFX_ACTORINSTANCECOMMANDS_H
-#define __EMFX_ACTORINSTANCECOMMANDS_H
+#pragma once
 
 // include the required headers
 #include "CommandSystemConfig.h"
@@ -61,6 +60,3 @@ public:
     void COMMANDSYSTEM_API MakeSelectedActorInstancesVisible();
     void COMMANDSYSTEM_API UnselectSelectedActorInstances();
 } // namespace CommandSystem
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h
index db4f4b9e04..8ea098021f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AttachmentCommands.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMFX_ATTACHMENTCOMMANDS_H
-#define __EMFX_ATTACHMENTCOMMANDS_H
+#pragma once
 
 // include the required headers
 #include "CommandSystemConfig.h"
@@ -35,6 +34,3 @@ public:
     static bool AddAttachment(MCore::Command* command, const MCore::CommandLine& parameters, AZStd::string& outResult, bool remove);
     MCORE_DEFINECOMMAND_END
 } // namespace CommandSystem
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h
index 48d2d01644..328785453c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/CommandSystemConfig.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __COMMANDSYSTEM_CONFIG_H
-#define __COMMANDSYSTEM_CONFIG_H
+#pragma once
 
 #include <MCore/Source/StandardHeaders.h>
 
@@ -35,5 +34,3 @@ enum
 {
     MEMCATEGORY_COMMANDSYSTEM = 990
 };
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h
index 6e8f4728c7..b3906dbfe0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMFX_IMPORTERCOMMANDS_H
-#define __EMFX_IMPORTERCOMMANDS_H
+#pragma once
 
 // include the required headers
 #include "CommandSystemConfig.h"
@@ -35,6 +34,3 @@ public:
     MCORE_DEFINECOMMAND_END
 
 } // namespace CommandSystem
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h
index 2ae284e907..7bfb0084aa 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MorphTargetCommands.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMFX_MORPHTARGETCOMMANDS_H
-#define __EMFX_MORPHTARGETCOMMANDS_H
+#pragma once
 
 // include the required headers
 #include "CommandSystemConfig.h"
@@ -30,6 +29,3 @@ namespace CommandSystem
     bool GetMorphTarget(EMotionFX::Actor* actor, EMotionFX::ActorInstance* actorInstance, uint32 lodLevel, const char* morphTargetName, EMotionFX::MorphTarget** outMorphTarget, EMotionFX::MorphSetupInstance::MorphTarget** outMorphTargetInstance, AZStd::string& outResult);
     MCORE_DEFINECOMMAND_END
 } // namespace CommandSystem
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h
index 13a39e5e8a..04af437935 100644
--- a/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h
+++ b/Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/SelectionCommands.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMFX_SELECTIONCOMMANDS_H
-#define __EMFX_SELECTIONCOMMANDS_H
+#pragma once
 
 // include the required headers
 #include "CommandSystemConfig.h"
@@ -49,6 +48,3 @@ public:
     bool COMMANDSYSTEM_API CheckIfHasAnimGraphSelectionParameter(const MCore::CommandLine& parameters);
     bool COMMANDSYSTEM_API CheckIfHasActorSelectionParameter(const MCore::CommandLine& parameters, bool ignoreInstanceParameters = false);
 } // namespace CommandSystem
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h
index 46b81a9d25..2c685ce77f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/Camera.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MCOMMON_CAMERA_H
-#define __MCOMMON_CAMERA_H
+#pragma once
 
 #include <AzCore/Math/Matrix4x4.h>
 #include <AzCore/Math/Vector2.h>
@@ -280,6 +279,3 @@ namespace MCommon
     // include inline code
 #include "Camera.inl"
 } // namespace MCommon
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h
index e0abe7922c..fa3631713c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/FirstPersonCamera.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MCOMMON_FIRSTPERSONCAMERA_H
-#define __MCOMMON_FIRSTPERSONCAMERA_H
+#pragma once
 
 // include required headers
 #include "Camera.h"
@@ -124,6 +123,3 @@ namespace MCommon
         float m_roll;                /**< Rotation around axis of screen. (0=straight, +clockwise, -CCW) */
     };
 } // namespace MCommon
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h
index e17fe65985..a2fd21a9b9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/LookAtCamera.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MCOMMON_LOOKATCAMERA_H
-#define __MCOMMON_LOOKATCAMERA_H
+#pragma once
 
 // include required headers
 #include "Camera.h"
@@ -91,6 +90,3 @@ namespace MCommon
         AZ::Vector3 m_up;     /**< The up vector of the camera. */
     };
 } // namespace MCommon
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h
index 634c01951e..94860cdc1c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/MCommonConfig.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MCOMMON_CONFIG_H
-#define __MCOMMON_CONFIG_H
+#pragma once
 
 #include <MCore/Source/StandardHeaders.h>
 
@@ -27,5 +26,3 @@ enum
 {
     MEMCATEGORY_MCOMMON = 992,
 };
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h
index 8aaa465da9..ae6383d6a8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/OrbitCamera.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MCOMMON_ORBITCAMERA_H
-#define __MCOMMON_ORBITCAMERA_H
+#pragma once
 
 // include required headers
 #include "LookAtCamera.h"
@@ -125,6 +124,3 @@ namespace MCommon
         float           m_flightTargetBeta;
     };
 } // namespace MCommon
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h
index 4b916f43b7..a8946dfff0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/TranslateManipulator.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MCOMMON_TRANSLATEMANIPULATOR_H
-#define __MCOMMON_TRANSLATEMANIPULATOR_H
+#pragma once
 
 #include <MCore/Source/AABB.h>
 #include <MCore/Source/Vector.h>
@@ -111,6 +110,3 @@ namespace MCommon
         bool                    m_zAxisVisible;
     };
 } // namespace MCommon
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h
index cce01485e0..7995d4df2a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GBuffer.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_GBUFFER_H
-#define __RENDERGL_GBUFFER_H
+#pragma once
 
 // include required headers
 #include <MCore/Source/StandardHeaders.h>
@@ -76,6 +75,3 @@ namespace RenderGL
         RenderTexture*      m_renderTargetE; /**< Render target with width and height divided by four. */
     };
 }   // namespace RenderGL
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h
index aa64581449..84e6e1a6b2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLRenderUtil.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __OPENGLRENDERUTIL_H
-#define __OPENGLRENDERUTIL_H
+#pragma once
 
 #include "RenderGLConfig.h"
 #include "../../Common/RenderUtil.h"
@@ -114,6 +113,3 @@ namespace RenderGL
         uint32                      m_maxNumTextures;
     };
 } // namespace RenderGL
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h
index 5975470f86..b8e34d90ba 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GLSLShader.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_GLSLSHADER_H
-#define __RENDERGL_GLSLSHADER_H
+#pragma once
 
 #include <AzCore/std/string/string.h>
 #include <AzCore/IO/Path/Path.h>
@@ -96,7 +95,4 @@ namespace RenderGL
 
         uint32                          m_textureUnit;
     };
-}
-
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h
index 67ebbd9441..0b22df1656 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/GraphicsManager.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_GRAPHICSMANAGER__H
-#define __RENDERGL_GRAPHICSMANAGER__H
+#pragma once
 
 #include <AzCore/IO/Path/Path.h>
 #include <MCore/Source/StandardHeaders.h>
@@ -198,6 +197,4 @@ namespace RenderGL
     };
 
     GraphicsManager* GetGraphicsManager();
-}
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h
index b09e5f394d..09e49d4c5f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/IndexBuffer.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_INDEXBUFFER_H
-#define __RENDERGL_INDEXBUFFER_H
+#pragma once
 
 #include "VertexBuffer.h"
 
@@ -51,6 +50,4 @@ namespace RenderGL
         bool GetIsSuccess();
         bool GetHasError();
     };
-}
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h
index 825fa4c7b0..69b22184c8 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Material.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_MATERIAL_H
-#define __RENDERGL_MATERIAL_H
+#pragma once
 
 #include <AzCore/Math/Vector2.h>
 #include <MCore/Source/StandardHeaders.h>
@@ -105,6 +104,4 @@ namespace RenderGL
 
         GLActor* m_actor;
     };
-}
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h
index 644e47b9b9..3c38626672 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/PostProcessShader.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_POSTPROCESS_SHADER_H
-#define __RENDERGL_POSTPROCESS_SHADER_H
+#pragma once
 
 #include <AzCore/IO/Path/Path_fwd.h>
 #include "GLSLShader.h"
@@ -38,6 +37,4 @@ namespace RenderGL
 
         RenderTexture* m_rt;
     };
-}
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h
index 066b6e681d..4cdf646a34 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderGLConfig.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_CONFIG_H
-#define __RENDERGL_CONFIG_H
+#pragma once
 
 #include <MCore/Source/StandardHeaders.h>
 
@@ -28,6 +27,3 @@ enum
 {
     MEMCATEGORY_RENDERING = 997
 };
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h
index 9839ca0a5f..7ff3c08f33 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/RenderTexture.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_RENDERTEXTURE_H
-#define __RENDERGL_RENDERTEXTURE_H
+#pragma once
 
 #include "TextureCache.h"
 #include <MCore/Source/Color.h>
@@ -66,6 +65,4 @@ namespace RenderGL
         AZ::u32 m_frameBuffer;
         AZ::u32 m_depthBuffer;
     };
-}
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h
index ebb2e7e0a4..cd57446468 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/Shader.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_SHADER__H
-#define __RENDERGL_SHADER__H
+#pragma once
 
 #include <MCore/Source/Color.h>
 #include "RenderGLConfig.h"
@@ -51,6 +50,4 @@ namespace RenderGL
         virtual void SetUniform(const char* name, Texture* texture) = 0;
         virtual void SetUniform(const char* name, const float* values, uint32 numFloats) = 0;
     };
-}
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h
index 528269765c..2e240042db 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/StandardMaterial.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_STANDARD_MATERIAL_H
-#define __RENDERGL_STANDARD_MATERIAL_H
+#pragma once
 
 #include <AzCore/Math/Transform.h>
 #include <EMotionFX/Source/StandardMaterial.h>
@@ -54,6 +53,3 @@ namespace RenderGL
         Texture*                        m_normalMap;
     };
 } // namespace RenderGL
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h
index 4350cd67c7..57510133af 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/TextureCache.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_TEXTURECACHE_H
-#define __RENDERGL_TEXTURECACHE_H
+#pragma once
 
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/containers/vector.h>
@@ -76,7 +75,4 @@ namespace RenderGL
         Texture*                m_whiteTexture;
         Texture*                m_defaultNormalTexture;
     };
-}
-
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h
index c76cf5137a..71c04e6c93 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/VertexBuffer.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_VERTEXBUFFER_H
-#define __RENDERGL_VERTEXBUFFER_H
+#pragma once
 
 #include "RenderGLConfig.h"
 #include <MCore/Source/StandardHeaders.h>
@@ -66,5 +65,3 @@ namespace RenderGL
         bool GetHasError();
     };
 } // namespace RenderGL
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h
index 36158306a1..ab2ef8686b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/glactor.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_GLACTOR_H
-#define __RENDERGL_GLACTOR_H
+#pragma once
 
 #include "RenderGLConfig.h"
 #include "VertexBuffer.h"
@@ -99,6 +98,4 @@ namespace RenderGL
 
         void Delete() override;
     };
-}
-
-#endif
+} // namespace RenderGL
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h
index d33cfcfd7d..7006e62dde 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/OpenGL2/Source/shadercache.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __RENDERGL_SHADERCACHE__H
-#define __RENDERGL_SHADERCACHE__H
+#pragma once
 
 #include "Shader.h"
 #include <AzCore/std/string/string.h>
@@ -45,5 +44,3 @@ namespace RenderGL
         AZStd::vector<Entry> m_entries;   // the shader cache entries
     };
 }   // namespace RenderGL
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h
index 7fc4b1224c..6d339148f3 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioConfig.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_EMSTUDIOCONFIG_H
-#define __EMSTUDIO_EMSTUDIOCONFIG_H
+#pragma once
 
 #include <QString>
 
@@ -31,5 +30,3 @@ enum
 };
 
 #define SHOW_REALTIMEINTERFACE_PERFORMANCEINFO
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h
index 9d510c0769..2899ebc33a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioCore.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_EMSTUDIOCORE_H
-#define __EMSTUDIO_EMSTUDIOCORE_H
+#pragma once
 
 // include all headers
 #include "EMStudioConfig.h"
@@ -16,5 +15,3 @@
 #include "PluginManager.h"
 #include "EMStudioPlugin.h"
 #include "LayoutManager.h"
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
index 8ae84b6e49..f1cabccc31 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioPlugin.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_EMSTUDIOPLUGIN_H
-#define __EMSTUDIO_EMSTUDIOPLUGIN_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -127,5 +126,3 @@ namespace EMStudio
         virtual void AddWindowMenuEntries([[maybe_unused]] QMenu* parent) { }
     };
 }   // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h
index 6021f52217..127705867a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/InvisiblePlugin.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_INVISIBLEPLUGIN_H
-#define __EMSTUDIO_INVISIBLEPLUGIN_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -41,5 +40,3 @@ namespace EMStudio
         void CreateBaseInterface(const char* objectName) override       { MCORE_UNUSED(objectName); }
     };
 }   // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h
index df6f0195bc..97ca74284a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeSelectionWindow.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_NODESELECTIONWINDOW_H
-#define __EMSTUDIO_NODESELECTIONWINDOW_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -57,5 +56,3 @@ namespace EMStudio
         bool                                m_accepted;
     };
 } // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h
index e3a5f9627a..b295f786a0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/PluginManager.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_PLUGINMANAGER_H
-#define __EMSTUDIO_PLUGINMANAGER_H
+#pragma once
 
 #include <AzCore/std/typetraits/conditional.h>
 #include <AzCore/std/typetraits/is_convertible.h>
@@ -68,5 +67,3 @@ namespace EMStudio
         void UnloadPlugins();
     };
 }   // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
index 2f9201ffa9..16cf8f8f31 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MCOMMON_MANIPULATORCALLBACKS_H
-#define __MCOMMON_MANIPULATORCALLBACKS_H
+#pragma once
 
 // include the Core system
 #include "../EMStudioConfig.h"
@@ -142,7 +141,4 @@ namespace EMStudio
 
         bool GetResetFollowMode() const override                { return true; }
     };
-} // namespace MCommon
-
-
-#endif
+} // namespace EMStudio
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h
index fbc4178009..c792efddda 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderLayouts.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_RENDERPLUGINLAYOUTS_H
-#define __EMSTUDIO_RENDERPLUGINLAYOUTS_H
+#pragma once
 
 // include the required headers
 #include "RenderPlugin.h"
@@ -176,6 +175,3 @@ namespace EMStudio
     // register all available layouts (this will be automatically called inside the RenderPlugin's constructor)
     void EMSTUDIO_API RegisterRenderPluginLayouts(RenderPlugin* renderPlugin);
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h
index a9bc26ae22..af5c1c367a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderUpdateCallback.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_RENDERUPDATECALLBACK_H
-#define __EMSTUDIO_RENDERUPDATECALLBACK_H
+#pragma once
 
 #include "../EMStudioConfig.h"
 #include <EMotionFX/Source/ActorInstance.h>
@@ -38,6 +37,3 @@ namespace EMStudio
         RenderPlugin*   m_plugin;
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h
index dcda6d2c1f..6c329a1320 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/ToolBarPlugin.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_TOOLBARPLUGIN_H
-#define __EMSTUDIO_TOOLBARPLUGIN_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -59,5 +58,3 @@ namespace EMStudio
         QPointer<QToolBar>   m_bar;
     };
 }   // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
index f821a7710e..e94fc0a060 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/GLWidget.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_GLWIDGET_H
-#define __EMSTUDIO_GLWIDGET_H
+#pragma once
 
 #if !defined(Q_MOC_RUN)
 #include "../RenderPluginsConfig.h"
@@ -84,6 +83,3 @@ namespace EMStudio
         AZ::Debug::Timer                        m_perfTimer;
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h
index 2bb4301781..b4b0299c7e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/RenderPluginsConfig.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_RENDERPLUGINSCONFIG_H
-#define __EMSTUDIO_RENDERPLUGINSCONFIG_H
+#pragma once
 
 #include <MCore/Source/StandardHeaders.h>
 
@@ -27,5 +26,3 @@ enum
 {
     MEMCATEGORY_RENDERPLUGIN = 993
 };
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
index 3510920d2c..14ecf6db34 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_ANIMGRAPHPLUGIN_H
-#define __EMSTUDIO_ANIMGRAPHPLUGIN_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -320,6 +319,3 @@ namespace EMStudio
         void UpdateWindowActionsCheckState();
     };
 }   // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h
index 5e8e76b7ef..4786527f62 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/DebugEventHandler.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_BENDSETUPINSTANCEDEBUGEVENTHANDLER_H
-#define __EMSTUDIO_BENDSETUPINSTANCEDEBUGEVENTHANDLER_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -45,5 +44,3 @@ namespace EMStudio
     private:
     };
 } // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h
index 47cfb9ddfc..b1925add10 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __GAMECONTROLLER_H
-#define __GAMECONTROLLER_H
+#pragma once
 
 
 // include the required headers
@@ -157,5 +156,3 @@ private:
 };
 
 #endif
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h
index 059108625a..d3dda7196f 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameControllerWindow.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_GAMECONTROLLERWINDOW_H
-#define __EMSTUDIO_GAMECONTROLLERWINDOW_H
+#pragma once
 
 #if !defined(Q_MOC_RUN)
 #include "../StandardPluginsConfig.h"
@@ -190,5 +189,3 @@ namespace EMStudio
         void AutoSelectGameController();
     };
 } // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h
index ff14484dc5..2ce33f9011 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GraphWidgetCallback.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_GRAPHWIDGETCALLBACK_H
-#define __EMSTUDIO_GRAPHWIDGETCALLBACK_H
+#pragma once
 
 // include required headers
 #include <MCore/Source/StandardHeaders.h>
@@ -36,5 +35,3 @@ namespace EMStudio
         NodeGraphWidget* m_graphWidget;
     };
 }   // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h
index 1743db3ab9..94cfaf275b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentNodesWindow.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_ATTACHMENTNODESWINDOW_H
-#define __EMSTUDIO_ATTACHMENTNODESWINDOW_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -80,6 +79,3 @@ namespace EMStudio
         QToolButton*                m_removeNodesButton;
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h
index 92a55668e8..e5ecbedc19 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsHierarchyWindow.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_ATTACHMENTSHIERARCHYWINDOW_H
-#define __EMSTUDIO_ATTACHMENTSHIERARCHYWINDOW_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -42,6 +41,3 @@ namespace EMStudio
         QTreeWidget* m_hierarchy;
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
index edab3a9580..2d8d9632ba 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_ATTACHMENTSPLUGIN_H
-#define __EMSTUDIO_ATTACHMENTSPLUGIN_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -91,6 +90,3 @@ namespace EMStudio
         AttachmentNodesWindow*                      m_attachmentNodesWindow;
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h
index 2e319e1dfa..586dfb8f44 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowCallback.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_LOGWINDOWCALLBACK_H
-#define __EMSTUDIO_LOGWINDOWCALLBACK_H
+#pragma once
 
 #if !defined(Q_MOC_RUN)
 #include "../StandardPluginsConfig.h"
@@ -78,5 +77,3 @@ namespace EMStudio
 } // namespace EMStudio
 
 Q_DECLARE_METATYPE(MCore::LogCallback::ELogLevel)
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h
index 61b6ab4b8c..db8aa0ab24 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_LOGWINDOWPLUGIN_H
-#define __EMSTUDIO_LOGWINDOWPLUGIN_H
+#pragma once
 
 #if !defined(Q_MOC_RUN)
 #include <MCore/Source/LogManager.h>
@@ -65,5 +64,3 @@ namespace EMStudio
         AzQtComponents::FilteredSearchWidget* m_searchWidget;
     };
 }   // namespace EMStudio
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h
index 2f0bf63685..e4004a62aa 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionExtractionWindow.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_MOTIONEXTRACTIONWINDOW_H
-#define __EMSTUDIO_MOTIONEXTRACTIONWINDOW_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -88,6 +87,3 @@ namespace EMStudio
         void CreateWarningWidget();
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h
index eb1bcad3a3..3aa9133bb4 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionPropertiesWindow.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_MOTIONPROPERTIESWINDOW_H
-#define __EMSTUDIO_MOTIONPROPERTIESWINDOW_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -48,6 +47,3 @@ namespace EMStudio
         void FinalizeSubProperties();
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h
index 3090a1f8bd..dbf39ccd84 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionRetargetingWindow.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_MOTIONRETARGETINGWINDOW_H
-#define __EMSTUDIO_MOTIONRETARGETINGWINDOW_H
+#pragma once
 
 // include MCore
 #if !defined(Q_MOC_RUN)
@@ -52,6 +51,3 @@ namespace EMStudio
         CommandSystem::SelectionList        m_selectionList;
     };
 } // namespace EMStudio
-
-
-#endif
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h
index 80c51cc36f..8937c4efaf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/StandardPluginsConfig.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __EMSTUDIO_STANDARDPLUGINSCONFIG_H
-#define __EMSTUDIO_STANDARDPLUGINSCONFIG_H
+#pragma once
 
 // include the EMotion FX config and mem categories on default
 #include <EMotionFX/Source/EMotionFXConfig.h>
@@ -32,5 +31,3 @@ enum
     MEMCATEGORY_STANDARDPLUGINS_ANIMGRAPH       = 1001,
     MEMCATEGORY_STANDARDPLUGINS_RESEARCH        = 1002
 };
-
-#endif
diff --git a/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h
index 9c8a73b92f..c313cd5489 100644
--- a/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h
+++ b/Gems/EMotionFX/Code/MysticQt/Source/MysticQtManager.h
@@ -6,8 +6,7 @@
  *
  */
 
-#ifndef __MYSTICQT_MANAGER_H
-#define __MYSTICQT_MANAGER_H
+#pragma once
 
 // include required files
 #if !defined(Q_MOC_RUN)
@@ -91,5 +90,3 @@ namespace MysticQt
     MCORE_INLINE const AZStd::string&       GetAppDir()                     { return gMysticQtManager->GetAppDir(); }
     MCORE_INLINE const AZStd::string&       GetDataDir()                    { return gMysticQtManager->GetDataDir(); }
 }   // namespace MysticQt
-
-#endif