From e3086fb6a8e56ec44fddc0fbfb28699e30f11609 Mon Sep 17 00:00:00 2001
From: Rosalie Wanders <rosalie@mailbox.org>
Date: Sat, 1 Feb 2025 21:43:52 +0100
Subject: [PATCH] RMG-Input: use only needed headers from RMG-Core

---
 Source/RMG-Input/CMakeLists.txt               |  6 ++---
 Source/RMG-Input/Thread/HotkeysThread.cpp     |  2 +-
 .../RMG-Input/UserInterface/EventFilter.hpp   |  2 +-
 .../RMG-Input/UserInterface/HotkeysDialog.cpp |  4 ----
 .../RMG-Input/UserInterface/HotkeysDialog.hpp |  2 +-
 Source/RMG-Input/UserInterface/MainDialog.hpp |  5 ++--
 .../RMG-Input/UserInterface/OptionsDialog.cpp |  5 +++-
 .../Widget/ControllerImageWidget.cpp          |  6 ++---
 .../UserInterface/Widget/ControllerWidget.cpp | 10 ++++----
 .../UserInterface/Widget/ControllerWidget.hpp |  8 +++----
 Source/RMG-Input/Utilities/QtKeyToSdl2Key.cpp |  9 ++++++++
 Source/RMG-Input/VRU.cpp                      | 19 +++++++--------
 Source/RMG-Input/main.cpp                     | 23 +++++++++++++++----
 13 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/Source/RMG-Input/CMakeLists.txt b/Source/RMG-Input/CMakeLists.txt
index eaf49e00..9fd88c6b 100644
--- a/Source/RMG-Input/CMakeLists.txt
+++ b/Source/RMG-Input/CMakeLists.txt
@@ -49,9 +49,9 @@ add_library(RMG-Input SHARED ${RMG_INPUT_SOURCES})
 target_link_libraries(RMG-Input RMG-Core ${SDL2_LIBRARIES})
 
 target_include_directories(RMG-Input PRIVATE 
-    ${CMAKE_CURRENT_BINARY_DIR} 
-    ${CMAKE_CURRENT_SOURCE_DIR} 
-    ${CMAKE_CURRENT_SOURCE_DIR}/../ 
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${SDL2_INCLUDE_DIRS}
 )
 
diff --git a/Source/RMG-Input/Thread/HotkeysThread.cpp b/Source/RMG-Input/Thread/HotkeysThread.cpp
index 0eb32b6a..e76845ed 100644
--- a/Source/RMG-Input/Thread/HotkeysThread.cpp
+++ b/Source/RMG-Input/Thread/HotkeysThread.cpp
@@ -9,7 +9,7 @@
  */
 #include "HotkeysThread.hpp"
 
-#include <RMG-Core/Core.hpp>
+#include <RMG-Core/Emulation.hpp>
 
 using namespace Thread;
 
diff --git a/Source/RMG-Input/UserInterface/EventFilter.hpp b/Source/RMG-Input/UserInterface/EventFilter.hpp
index e6fb0ca0..55f6b3c4 100644
--- a/Source/RMG-Input/UserInterface/EventFilter.hpp
+++ b/Source/RMG-Input/UserInterface/EventFilter.hpp
@@ -12,8 +12,8 @@
 
 #include <QFocusEvent>
 #include <QKeyEvent>
-#include <QList>
 #include <QObject>
+#include <QList>
 
 namespace UserInterface
 {
diff --git a/Source/RMG-Input/UserInterface/HotkeysDialog.cpp b/Source/RMG-Input/UserInterface/HotkeysDialog.cpp
index 214336c9..234f901d 100644
--- a/Source/RMG-Input/UserInterface/HotkeysDialog.cpp
+++ b/Source/RMG-Input/UserInterface/HotkeysDialog.cpp
@@ -10,10 +10,6 @@
 #include "HotkeysDialog.hpp"
 #include "common.hpp"
 
-#include <RMG-Core/Core.hpp>
-
-#include <iostream>
-
 using namespace UserInterface;
 
 HotkeysDialog::HotkeysDialog(QWidget* parent, QList<HotkeySettingMapping> hotkeySettingMappings, 
diff --git a/Source/RMG-Input/UserInterface/HotkeysDialog.hpp b/Source/RMG-Input/UserInterface/HotkeysDialog.hpp
index e8288148..a6dad5ed 100644
--- a/Source/RMG-Input/UserInterface/HotkeysDialog.hpp
+++ b/Source/RMG-Input/UserInterface/HotkeysDialog.hpp
@@ -15,7 +15,7 @@
 
 #include <SDL.h>
 
-#include <RMG-Core/Core.hpp>
+#include <RMG-Core/Settings.hpp>
 
 #include "ui_HotkeysDialog.h"
 
diff --git a/Source/RMG-Input/UserInterface/MainDialog.hpp b/Source/RMG-Input/UserInterface/MainDialog.hpp
index 41f88d7a..9d8eeaff 100644
--- a/Source/RMG-Input/UserInterface/MainDialog.hpp
+++ b/Source/RMG-Input/UserInterface/MainDialog.hpp
@@ -10,14 +10,15 @@
 #ifndef MAINDIALOG_HPP
 #define MAINDIALOG_HPP
 
-#include <QDialog>
 #include "common.hpp"
+#include <QDialog>
 
-#include "ui_MainDialog.h"
 #include "Widget/ControllerWidget.hpp"
 #include "Thread/SDLThread.hpp"
 #include "EventFilter.hpp"
 
+#include "ui_MainDialog.h"
+
 namespace UserInterface
 {
 class MainDialog : public QDialog, private Ui::MainDialog
diff --git a/Source/RMG-Input/UserInterface/OptionsDialog.cpp b/Source/RMG-Input/UserInterface/OptionsDialog.cpp
index b56938a9..c2b2fccf 100644
--- a/Source/RMG-Input/UserInterface/OptionsDialog.cpp
+++ b/Source/RMG-Input/UserInterface/OptionsDialog.cpp
@@ -11,10 +11,13 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include <RMG-Core/Core.hpp>
 
 #include <SDL.h>
 
+#include <RMG-Core/Emulation.hpp>
+#include <RMG-Core/Settings.hpp>
+
+
 using namespace UserInterface;
 
 OptionsDialog::OptionsDialog(QWidget* parent, OptionsDialogSettings settings,
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
index 3c85ffce..5d6b7bb3 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
@@ -10,10 +10,10 @@
 #include "ControllerImageWidget.hpp"
 
 #include <QSvgRenderer>
-#include <algorithm>
-#include <cmath>
-#include <QPainter>
 #include <QResizeEvent>
+#include <algorithm>
+#include <QPainter>
+#include <cmath>
 
 using namespace UserInterface::Widget;
 
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
index 75bb3278..624a4050 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.cpp
@@ -12,16 +12,18 @@
 
 #include "common.hpp"
 
+#include <RMG-Core/RomSettings.hpp>
+#include <RMG-Core/RomHeader.hpp>
 #include <RMG-Core/Core.hpp>
 
-#include <QPixmap>
-#include <QPainter>
+#include <QInputDialog>
 #include <QResizeEvent>
 #include <QSvgRenderer>
 #include <QMessageBox>
-#include <QInputDialog>
+#include <QPainter>
+#include <QPixmap>
+
 #include <SDL.h>
-#include <iostream>
 
 using namespace UserInterface::Widget;
 
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.hpp b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.hpp
index 0f80ed65..db43e78c 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.hpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.hpp
@@ -10,22 +10,22 @@
 #ifndef CONTROLLERWIDGET_H
 #define CONTROLLERWIDGET_H
 
-#include "MappingButton.hpp"
 #include "ControllerImageWidget.hpp"
+#include "MappingButton.hpp"
 
-#include "UserInterface/EventFilter.hpp"
 #include "UserInterface/OptionsDialog.hpp"
 #include "UserInterface/HotkeysDialog.hpp"
+#include "UserInterface/EventFilter.hpp"
 
 using namespace UserInterface::Widget;
 
 #include "ui_ControllerWidget.h"
 #include "common.hpp"
 
-#include <RMG-Core/Core.hpp>
-
 #include <SDL.h>
 
+#include <RMG-Core/Settings.hpp>
+
 namespace UserInterface
 {
 namespace Widget
diff --git a/Source/RMG-Input/Utilities/QtKeyToSdl2Key.cpp b/Source/RMG-Input/Utilities/QtKeyToSdl2Key.cpp
index 0c3c0659..56cd9fc2 100644
--- a/Source/RMG-Input/Utilities/QtKeyToSdl2Key.cpp
+++ b/Source/RMG-Input/Utilities/QtKeyToSdl2Key.cpp
@@ -1,3 +1,12 @@
+/*
+ * Rosalie's Mupen GUI - https://github.com/Rosalie241/RMG
+ *  Copyright (C) 2020 Rosalie Wanders <rosalie@mailbox.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
 #include "QtKeyToSdl2Key.hpp"
 
 #include <SDL2/SDL.h>
diff --git a/Source/RMG-Input/VRU.cpp b/Source/RMG-Input/VRU.cpp
index 92175b37..6b8c10bd 100644
--- a/Source/RMG-Input/VRU.cpp
+++ b/Source/RMG-Input/VRU.cpp
@@ -8,27 +8,28 @@
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 #include "main.hpp"
-#define CORE_PLUGIN
-#define M64P_PLUGIN_PROTOTYPES 1
 
-#include <RMG-Core/Core.hpp>
+#define M64P_PLUGIN_PROTOTYPES 1
+#include <RMG-Core/m64p/api/m64p_types.h>
 #include <RMG-Core/osal/osal_dynlib.hpp>
 
-#include <../3rdParty/vosk-api/include/vosk_api.h>
+#include <RMG-Core/Directories.hpp>
+#include <RMG-Core/Archive.hpp>
+#include <RMG-Core/Error.hpp>
 
-#include <iostream>
+#include <3rdParty/vosk-api/include/vosk_api.h>
 
-#include <QByteArray>
 #include <QStringDecoder>
-#include <QStringList>
 #include <QJsonDocument>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QStringList>
+#include <QByteArray>
+#include <QJsonArray>
 
 #include <SDL.h>
 
-#include "VRU.hpp"
 #include "VRUwords.hpp"
+#include "VRU.hpp"
 
 //
 // Local Enums
diff --git a/Source/RMG-Input/main.cpp b/Source/RMG-Input/main.cpp
index ea63095c..1ddd3976 100644
--- a/Source/RMG-Input/main.cpp
+++ b/Source/RMG-Input/main.cpp
@@ -11,17 +11,32 @@
 #define M64P_PLUGIN_PROTOTYPES 1
 #define INPUT_PLUGIN_API_VERSION 0x020100
 
-#include <UserInterface/MainDialog.hpp>
-#include "Thread/SDLThread.hpp"
-#include "Thread/HotkeysThread.hpp"
+#include "UserInterface/MainDialog.hpp"
 #include "Utilities/InputDevice.hpp"
+#include "Thread/HotkeysThread.hpp"
+#include "Thread/SDLThread.hpp"
 #include "common.hpp"
 #include "main.hpp"
 #ifdef VRU
 #include "VRU.hpp"
 #endif // VRU
 
-#include <RMG-Core/Core.hpp>
+#define M64P_PLUGIN_PROTOTYPES 1
+#include <RMG-Core/m64p/api/m64p_common.h>
+#include <RMG-Core/m64p/api/m64p_plugin.h>
+#include <RMG-Core/m64p/api/m64p_custom.h>
+#include <RMG-Core/m64p/api/m64p_types.h>
+
+#include <RMG-Core/SpeedLimiter.hpp>
+#include <RMG-Core/Directories.hpp>
+#include <RMG-Core/SpeedFactor.hpp>
+#include <RMG-Core/Screenshot.hpp>
+#include <RMG-Core/Emulation.hpp>
+#include <RMG-Core/SaveState.hpp>
+#include <RMG-Core/Settings.hpp>
+#include <RMG-Core/Netplay.hpp>
+#include <RMG-Core/Cheats.hpp>
+#include <RMG-Core/Video.hpp>
 
 #include <QGuiApplication>
 #include <QApplication>