diff --git a/Code/Editor/AnimationContext.cpp b/Code/Editor/AnimationContext.cpp
index b67e9e602e..d557a8635c 100644
--- a/Code/Editor/AnimationContext.cpp
+++ b/Code/Editor/AnimationContext.cpp
@@ -16,7 +16,6 @@
 
 // Editor
 #include "TrackView/TrackViewDialog.h"
-#include "RenderViewport.h"
 #include "ViewManager.h"
 #include "Objects/SelectionGroup.h"
 #include "Include/IObjectManager.h"
diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
index dabbbe95f6..33ed001735 100644
--- a/Code/Editor/EditorViewportWidget.h
+++ b/Code/Editor/EditorViewportWidget.h
@@ -8,8 +8,6 @@
 
 
 #pragma once
-// RenderViewport.h : header file
-//
 
 #if !defined(Q_MOC_RUN)
 #include <Cry_Camera.h>
diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp
index 0d114d5da8..54f3c2f723 100644
--- a/Code/Editor/Export/ExportManager.cpp
+++ b/Code/Editor/Export/ExportManager.cpp
@@ -22,7 +22,6 @@
 #include "OBJExporter.h"
 #include "OCMExporter.h"
 #include "FBXExporterDialog.h"
-#include "RenderViewport.h"
 #include "TrackViewExportKeyTimeDlg.h"
 #include "AnimationContext.h"
 #include "TrackView/DirectorNodeAnimator.h"
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
index 874868b5bc..29db338a85 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -84,6 +84,7 @@
 #include <Editor/Util/PathUtil.h>
 #include <IResourceSelectorHost.h>
 #include "CryEdit.h"
+#include "Undo/Undo.h"
 
 #include <QMenu>
 #include <QAction>
diff --git a/Code/Editor/RenderViewport.cpp b/Code/Editor/RenderViewport.cpp
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Code/Editor/RenderViewport.h b/Code/Editor/RenderViewport.h
deleted file mode 100644
index 8f5e19f93d..0000000000
--- a/Code/Editor/RenderViewport.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_RENDERVIEWPORT_H
-#define CRYINCLUDE_EDITOR_RENDERVIEWPORT_H
-
-#pragma once
-// RenderViewport.h : header file
-//
-
-#if !defined(Q_MOC_RUN)
-#include <Cry_Camera.h>
-
-#include <QSet>
-
-#include "Viewport.h"
-#include "Objects/DisplayContext.h"
-#include "Undo/Undo.h"
-#include "Util/PredefinedAspectRatios.h"
-
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/std/optional.h>
-#include <AzFramework/Input/Buses/Requests/InputSystemCursorRequestBus.h>
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/API/EditorCameraBus.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/Viewport/ViewportMessages.h>
-#include <MathConversion.h>
-#endif
-
-#include <AzFramework/Windowing/WindowBus.h>
-#include <AzFramework/Visibility/EntityVisibilityQuery.h>
-
-// forward declarations.
-class CBaseObject;
-class QMenu;
-class QKeyEvent;
-class EditorEntityNotifications;
-struct ray_hit;
-struct IRenderMesh;
-struct IVariable;
-
-namespace AzToolsFramework
-{
-    class ManipulatorManager;
-}
-
-#endif
diff --git a/Code/Editor/TrackView/TrackViewAnimNode.cpp b/Code/Editor/TrackView/TrackViewAnimNode.cpp
index 8696faf516..9d0892888f 100644
--- a/Code/Editor/TrackView/TrackViewAnimNode.cpp
+++ b/Code/Editor/TrackView/TrackViewAnimNode.cpp
@@ -34,7 +34,6 @@
 #include "Clipboard.h"
 #include "CommentNodeAnimator.h"
 #include "DirectorNodeAnimator.h"
-#include "RenderViewport.h"
 #include "ViewManager.h"
 #include "Include/IObjectManager.h"
 #include "Objects/GizmoManager.h"
diff --git a/Code/Editor/ViewManager.cpp b/Code/Editor/ViewManager.cpp
index 2ccbac09ed..7277a0f4f3 100644
--- a/Code/Editor/ViewManager.cpp
+++ b/Code/Editor/ViewManager.cpp
@@ -26,7 +26,6 @@
 #include "LayoutWnd.h"
 #include "2DViewport.h"
 #include "TopRendererWnd.h"
-#include "RenderViewport.h"
 #include "EditorViewportWidget.h"
 #include "CryEditDoc.h"
 
diff --git a/Code/Editor/ViewportTitleDlg.h b/Code/Editor/ViewportTitleDlg.h
index a5b4da8075..8a1766a764 100644
--- a/Code/Editor/ViewportTitleDlg.h
+++ b/Code/Editor/ViewportTitleDlg.h
@@ -12,7 +12,6 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include "RenderViewport.h"
 #include <AzCore/Component/Component.h>
 
 #include <IAudioSystem.h>
diff --git a/Code/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake
index 386b495faa..a007a95e7b 100644
--- a/Code/Editor/editor_lib_files.cmake
+++ b/Code/Editor/editor_lib_files.cmake
@@ -807,8 +807,6 @@ set(FILES
     ViewportManipulatorController.h
     LegacyViewportCameraController.cpp
     LegacyViewportCameraController.h
-    RenderViewport.cpp
-    RenderViewport.h
     TopRendererWnd.cpp
     TopRendererWnd.h
     ViewManager.cpp
diff --git a/Gems/Camera/Code/Source/CameraSystemComponent.h b/Gems/Camera/Code/Source/CameraSystemComponent.h
index 1b8f31b91e..7fc8d15d6b 100644
--- a/Gems/Camera/Code/Source/CameraSystemComponent.h
+++ b/Gems/Camera/Code/Source/CameraSystemComponent.h
@@ -58,4 +58,4 @@ namespace Camera
         AZ::EntityId m_activeView;
         CameraProperties m_activeViewProperties;
     };
-}
+} // namespace Camera
diff --git a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
index e75a820eec..2c3d114908 100644
--- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
+++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h
@@ -42,7 +42,7 @@ namespace Camera
             , public CameraNotificationBus::Handler
         {
         public:
-            CameraListModel(QWidget* myParent);
+            explicit CameraListModel(QWidget* myParent);
             ~CameraListModel();
 
             // QAbstractItemModel interface
diff --git a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
index 97cb4f33d3..16cbdaaf64 100644
--- a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
+++ b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
@@ -470,7 +470,7 @@ namespace PhysXDebug
 
     AZ::Vector3 GetViewCameraPosition()
     {
-        using namespace Camera;
+        using Camera::ActiveCameraRequestBus;
 
         AZ::Transform tm = AZ::Transform::CreateIdentity();
         ActiveCameraRequestBus::BroadcastResult(tm, &ActiveCameraRequestBus::Events::GetActiveCameraTransform);