diff --git a/Code/Editor/ErrorReport.h b/Code/Editor/ErrorReport.h
index 2ede92a8fe..a80bb36404 100644
--- a/Code/Editor/ErrorReport.h
+++ b/Code/Editor/ErrorReport.h
@@ -17,9 +17,6 @@
 // forward declarations.
 class CParticleItem;
 
-#include "BaseLibraryItem.h"
-#include <CryCommon/smartptr.h>
-
 #include "Objects/BaseObject.h"
 #include "Include/EditorCoreAPI.h"
 #include "Include/IErrorReport.h"
diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp
index fc18e1f4c3..ec688b27c7 100644
--- a/Code/Editor/IEditorImpl.cpp
+++ b/Code/Editor/IEditorImpl.cpp
@@ -12,6 +12,7 @@
 #include "EditorDefs.h"
 
 #include "IEditorImpl.h"
+#include <EditorCommonAPI.h>
 
 // Qt
 #include <QByteArray>
diff --git a/Code/Legacy/CrySystem/System.cpp b/Code/Legacy/CrySystem/System.cpp
index a5cee3a6b6..0b82eded4e 100644
--- a/Code/Legacy/CrySystem/System.cpp
+++ b/Code/Legacy/CrySystem/System.cpp
@@ -461,6 +461,9 @@ bool CSystem::IsQuitting() const
     bool wasExitMainLoopRequested = false;
     AzFramework::ApplicationRequests::Bus::BroadcastResult(wasExitMainLoopRequested, &AzFramework::ApplicationRequests::WasExitMainLoopRequested);
     return wasExitMainLoopRequested;
+}
+
+//////////////////////////////////////////////////////////////////////////
 ISystem* CSystem::GetCrySystem()
 {
     return this;