diff --git a/Source/Core/VideoCommon/FreeLookCamera.cpp b/Source/Core/VideoCommon/FreeLookCamera.cpp
index 7d498482ae..2f7eabebad 100644
--- a/Source/Core/VideoCommon/FreeLookCamera.cpp
+++ b/Source/Core/VideoCommon/FreeLookCamera.cpp
@@ -12,25 +12,24 @@
 #include "Common/MathUtil.h"
 
 #include "Common/ChunkFile.h"
-#include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+
 #include "VideoCommon/VideoCommon.h"
-#include "VideoCommon/VideoConfig.h"
 
 FreeLookCamera g_freelook_camera;
 
 namespace
 {
-std::string to_string(FreelookControlType type)
+std::string to_string(FreeLook::ControlType type)
 {
   switch (type)
   {
-  case FreelookControlType::SixAxis:
+  case FreeLook::ControlType::SixAxis:
     return "Six Axis";
-  case FreelookControlType::FPS:
+  case FreeLook::ControlType::FPS:
     return "First Person";
-  case FreelookControlType::Orbital:
+  case FreeLook::ControlType::Orbital:
     return "Orbital";
   }
 
@@ -176,22 +175,22 @@ private:
 };
 }  // namespace
 
-void FreeLookCamera::SetControlType(FreelookControlType type)
+void FreeLookCamera::SetControlType(FreeLook::ControlType type)
 {
   if (m_current_type && *m_current_type == type)
   {
     return;
   }
 
-  if (type == FreelookControlType::SixAxis)
+  if (type == FreeLook::ControlType::SixAxis)
   {
     m_camera_controller = std::make_unique<SixAxisController>();
   }
-  else if (type == FreelookControlType::Orbital)
+  else if (type == FreeLook::ControlType::Orbital)
   {
     m_camera_controller = std::make_unique<OrbitalController>();
   }
-  else
+  else if (type == FreeLook::ControlType::FPS)
   {
     m_camera_controller = std::make_unique<FPSController>();
   }
diff --git a/Source/Core/VideoCommon/FreeLookCamera.h b/Source/Core/VideoCommon/FreeLookCamera.h
index 76bb53f0c5..2c91967c3e 100644
--- a/Source/Core/VideoCommon/FreeLookCamera.h
+++ b/Source/Core/VideoCommon/FreeLookCamera.h
@@ -8,7 +8,7 @@
 #include <optional>
 
 #include "Common/Matrix.h"
-#include "VideoCommon/VideoConfig.h"
+#include "Core/FreeLookConfig.h"
 
 class PointerWrap;
 
@@ -41,7 +41,7 @@ public:
 class FreeLookCamera
 {
 public:
-  void SetControlType(FreelookControlType type);
+  void SetControlType(FreeLook::ControlType type);
   Common::Matrix44 GetView();
   Common::Vec2 GetFieldOfView() const;
 
@@ -70,7 +70,7 @@ private:
   bool m_dirty = false;
   float m_fov_x = 1.0f;
   float m_fov_y = 1.0f;
-  std::optional<FreelookControlType> m_current_type;
+  std::optional<FreeLook::ControlType> m_current_type;
   std::unique_ptr<CameraController> m_camera_controller;
 
   float m_fov_step_size = 0.025f;