diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index 624d9ba1b8..d3cfacf482 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -2,29 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
-#include <QBoxLayout>
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QObject>
-#include <QPushButton>
-#include <QString>
-#include <QStyle>
-#include <QWidget>
-#include <qabstractbutton.h>
-#include <qabstractslider.h>
-#include <qboxlayout.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qnamespace.h>
-#include <qsize.h>
-#include <qsizepolicy.h>
-#include <qsurfaceformat.h>
-#include "common/settings.h"
+#include <type_traits>
 #include "yuzu/configuration/configuration_shared.h"
-#include "yuzu/configuration/configure_per_game.h"
-#include "yuzu/configuration/shared_translation.h"
 
 namespace ConfigurationShared {
 
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h
index 046d78e2b4..5313bfb4f2 100644
--- a/src/yuzu/configuration/configuration_shared.h
+++ b/src/yuzu/configuration/configuration_shared.h
@@ -4,14 +4,12 @@
 #pragma once
 
 #include <forward_list>
-#include <iterator>
 #include <memory>
-#include <QCheckBox>
-#include <QComboBox>
+#include <QString>
 #include <QWidget>
 #include <qobjectdefs.h>
-#include "common/settings.h"
-#include "yuzu/configuration/shared_translation.h"
+
+class QObject;
 
 namespace ConfigurationShared {
 
@@ -29,16 +27,4 @@ private:
     std::shared_ptr<std::forward_list<Tab*>> group;
 };
 
-constexpr int USE_GLOBAL_INDEX = 0;
-constexpr int USE_GLOBAL_SEPARATOR_INDEX = 1;
-constexpr int USE_GLOBAL_OFFSET = 2;
-
-// CheckBoxes require a tracker for their state since we emulate a tristate CheckBox
-enum class CheckState {
-    Off,    // Checkbox overrides to off/false
-    On,     // Checkbox overrides to on/true
-    Global, // Checkbox defers to the global state
-    Count,  // Simply the number of states, not a valid checkbox state
-};
-
 } // namespace ConfigurationShared
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 1cafeaa314..0496bd78f0 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -3,6 +3,7 @@
 
 #include <forward_list>
 #include <memory>
+#include <QComboBox>
 
 #include "audio_core/sink/sink.h"
 #include "audio_core/sink/sink_details.h"
diff --git a/src/yuzu/configuration/configure_audio.h b/src/yuzu/configuration/configure_audio.h
index a9b0054337..31cf682e00 100644
--- a/src/yuzu/configuration/configure_audio.h
+++ b/src/yuzu/configuration/configure_audio.h
@@ -10,7 +10,7 @@
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/shared_translation.h"
 
-class QPushButton;
+class QComboBox;
 
 namespace Core {
 class System;
diff --git a/src/yuzu/configuration/configure_cpu.cpp b/src/yuzu/configuration/configure_cpu.cpp
index 0982e006d9..ac298a50f6 100644
--- a/src/yuzu/configuration/configure_cpu.cpp
+++ b/src/yuzu/configuration/configure_cpu.cpp
@@ -3,6 +3,7 @@
 
 #include <forward_list>
 #include <memory>
+#include <QComboBox>
 #include "common/common_types.h"
 #include "common/settings.h"
 #include "configuration/shared_widget.h"
diff --git a/src/yuzu/configuration/configure_cpu.h b/src/yuzu/configuration/configure_cpu.h
index fb970122d0..57603e5c98 100644
--- a/src/yuzu/configuration/configure_cpu.h
+++ b/src/yuzu/configuration/configure_cpu.h
@@ -6,6 +6,9 @@
 #include <memory>
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
+#include "yuzu/configuration/shared_translation.h"
+
+class QComboBox;
 
 namespace Core {
 class System;
@@ -37,13 +40,6 @@ private:
 
     std::unique_ptr<Ui::ConfigureCpu> ui;
 
-    ConfigurationShared::CheckState cpuopt_unsafe_unfuse_fma;
-    ConfigurationShared::CheckState cpuopt_unsafe_reduce_fp_error;
-    ConfigurationShared::CheckState cpuopt_unsafe_ignore_standard_fpcr;
-    ConfigurationShared::CheckState cpuopt_unsafe_inaccurate_nan;
-    ConfigurationShared::CheckState cpuopt_unsafe_fastmem_check;
-    ConfigurationShared::CheckState cpuopt_unsafe_ignore_global_monitor;
-
     const Core::System& system;
 
     const ConfigurationShared::TranslationMap& translations;
diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index 4f8c1912f4..931900b7de 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -7,7 +7,8 @@
 #include <memory>
 #include <vector>
 #include <QDialog>
-#include "configuration/configuration_shared.h"
+#include "yuzu/configuration/configuration_shared.h"
+#include "yuzu/configuration/shared_translation.h"
 #include "yuzu/vk_device_info.h"
 
 namespace Core {
diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h
index 9e421d024c..718ba54f56 100644
--- a/src/yuzu/configuration/configure_graphics.h
+++ b/src/yuzu/configuration/configure_graphics.h
@@ -5,6 +5,7 @@
 
 #include <functional>
 #include <memory>
+#include <type_traits>
 #include <vector>
 #include <QColor>
 #include <QString>
@@ -14,6 +15,7 @@
 #include "common/common_types.h"
 #include "vk_device_info.h"
 #include "yuzu/configuration/configuration_shared.h"
+#include "yuzu/configuration/shared_translation.h"
 
 class QPushButton;
 class QEvent;
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 61e9b3d699..c5e21da023 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -8,6 +8,7 @@
 #include "ui_configure_graphics_advanced.h"
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_graphics_advanced.h"
+#include "yuzu/configuration/shared_translation.h"
 #include "yuzu/configuration/shared_widget.h"
 
 ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(
diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h
index 42634d3ffe..90b79f786e 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.h
+++ b/src/yuzu/configuration/configure_graphics_advanced.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
+#include "yuzu/configuration/shared_translation.h"
 
 namespace Core {
 class System;
diff --git a/src/yuzu/configuration/configure_per_game.h b/src/yuzu/configuration/configure_per_game.h
index e43d4df949..4849ac2910 100644
--- a/src/yuzu/configuration/configure_per_game.h
+++ b/src/yuzu/configuration/configure_per_game.h
@@ -15,6 +15,7 @@
 #include "vk_device_info.h"
 #include "yuzu/configuration/config.h"
 #include "yuzu/configuration/configuration_shared.h"
+#include "yuzu/configuration/shared_translation.h"
 
 namespace Core {
 class System;
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 40d0be8cab..5fe3c4a7f5 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -5,6 +5,8 @@
 #include <forward_list>
 #include <optional>
 
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDateTimeEdit>
 #include <QFileDialog>
 #include <QGraphicsItem>
diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h
index c598c07f34..4457ccc21e 100644
--- a/src/yuzu/configuration/configure_system.h
+++ b/src/yuzu/configuration/configure_system.h
@@ -9,7 +9,11 @@
 
 #include <QWidget>
 #include "yuzu/configuration/configuration_shared.h"
+#include "yuzu/configuration/shared_translation.h"
 
+class QCheckBox;
+class QLineEdit;
+class QComboBox;
 class QDateTimeEdit;
 
 namespace Core {
@@ -43,9 +47,6 @@ private:
     std::unique_ptr<Ui::ConfigureSystem> ui;
     bool enabled = false;
 
-    ConfigurationShared::CheckState use_rng_seed;
-    ConfigurationShared::CheckState use_unsafe_extended_memory_layout;
-
     Core::System& system;
     const ConfigurationShared::TranslationMap& translations;
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations;
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index 64e1d90ad6..71f4eadbec 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -1,6 +1,7 @@
 #include <functional>
 #include <limits>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QDateTimeEdit>
 #include <QHBoxLayout>
 #include <QIcon>
@@ -8,7 +9,9 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSizePolicy>
+#include <QSlider>
 #include <QSpinBox>
+#include <QStyle>
 #include <QWidget>
 #include <qabstractbutton.h>
 #include <qabstractspinbox.h>