From a14c88ba67a51b0a563a5fc800cd089e82ffacaf Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 23 Jan 2026 21:30:01 +0100 Subject: [PATCH] Remove unused imports Yellow squiggly lines begone! Done automatically on .cpp files through `run-clang-tidy`, with manual corrections to the mistakes. If an import is directly used, but is technically unnecessary since it's recursively imported by something else, it is *not* removed. The tool doesn't touch .h files, so I did some of them by hand while fixing errors due to old recursive imports. Not everything is removed, but the cleanup should be substantial enough. Because this done on Linux, code that isn't used on it is mostly untouched. (Hopefully no open PR is depending on these imports...) --- Source/Core/AudioCommon/AlsaSoundStream.cpp | 1 - Source/Core/AudioCommon/CubebStream.cpp | 2 -- Source/Core/AudioCommon/CubebStream.h | 2 ++ Source/Core/AudioCommon/OpenALStream.h | 6 +++--- Source/Core/AudioCommon/WaveFile.cpp | 1 - Source/Core/Common/Assembler/AssemblerShared.h | 1 - .../Core/Common/Assembler/CaseInsensitiveDict.h | 4 ++-- Source/Core/Common/Assembler/GekkoAssembler.cpp | 1 - Source/Core/Common/Assembler/GekkoIRGen.cpp | 1 - Source/Core/Common/Assembler/GekkoIRGen.h | 1 - Source/Core/Common/Assembler/GekkoLexer.cpp | 1 - Source/Core/Common/Assembler/GekkoLexer.h | 1 - Source/Core/Common/Assembler/GekkoParser.cpp | 2 -- Source/Core/Common/CommonFuncs.cpp | 1 - Source/Core/Common/CommonFuncs.h | 4 ++-- Source/Core/Common/Config/Config.h | 1 - Source/Core/Common/Config/Layer.cpp | 6 ------ Source/Core/Common/Crypto/AES.cpp | 1 - Source/Core/Common/Crypto/HMAC.cpp | 2 +- Source/Core/Common/Crypto/ec.cpp | 2 -- Source/Core/Common/Debug/MemoryPatches.cpp | 1 - Source/Core/Common/Debug/MemoryPatches.h | 1 - Source/Core/Common/DynamicLibrary.cpp | 2 -- Source/Core/Common/FatFsUtil.cpp | 1 - Source/Core/Common/FileSearch.cpp | 6 +----- Source/Core/Common/FileUtil.cpp | 12 +++--------- Source/Core/Common/FileUtil.h | 2 -- Source/Core/Common/GL/GLInterface/EGL.cpp | 1 - Source/Core/Common/GL/GLUtil.cpp | 3 --- Source/Core/Common/GL/GLX11Window.cpp | 2 -- Source/Core/Common/Hash.cpp | 2 -- Source/Core/Common/IOFile.cpp | 1 - Source/Core/Common/IniFile.h | 2 -- Source/Core/Common/JitRegister.cpp | 3 --- Source/Core/Common/Logging/Log.h | 1 - Source/Core/Common/Logging/LogManager.cpp | 5 +---- Source/Core/Common/Matrix.cpp | 1 - Source/Core/Common/MemArenaUnix.cpp | 2 -- Source/Core/Common/MemoryUtil.cpp | 7 +++---- Source/Core/Common/MsgHandler.cpp | 6 ++---- Source/Core/Common/MsgHandler.h | 2 -- Source/Core/Common/Network.cpp | 2 -- Source/Core/Common/Profiler.cpp | 2 -- Source/Core/Common/QoSSession.cpp | 2 -- Source/Core/Common/Random.cpp | 1 + Source/Core/Common/Random.h | 3 --- Source/Core/Common/SettingsHandler.cpp | 1 - Source/Core/Common/SocketContext.cpp | 3 ++- Source/Core/Common/SpanUtils.h | 2 +- Source/Core/Common/Thread.cpp | 3 ++- Source/Core/Common/Timer.cpp | 2 -- Source/Core/Common/TraversalClient.h | 1 - Source/Core/Common/TraversalServer.cpp | 6 +----- Source/Core/Common/UPnP.cpp | 1 - Source/Core/Common/x64CPUDetect.cpp | 5 +++-- Source/Core/Common/x64FPURoundMode.cpp | 3 --- Source/Core/Core/AchievementManager.cpp | 3 --- Source/Core/Core/ActionReplay.cpp | 1 - Source/Core/Core/Boot/Boot.cpp | 3 +-- Source/Core/Core/Boot/Boot_WiiWAD.cpp | 3 --- Source/Core/Core/BootManager.cpp | 10 ---------- Source/Core/Core/Config/AchievementSettings.cpp | 2 -- Source/Core/Core/Config/DefaultLocale.cpp | 1 - Source/Core/Core/Config/GraphicsSettings.cpp | 1 - Source/Core/Core/Config/NetplaySettings.cpp | 2 -- Source/Core/Core/Config/SessionSettings.cpp | 2 -- .../Core/Core/ConfigLoaders/BaseConfigLoader.cpp | 2 -- .../Core/Core/ConfigLoaders/MovieConfigLoader.cpp | 2 -- .../Core/ConfigLoaders/NetPlayConfigLoader.cpp | 1 - Source/Core/Core/Core.cpp | 2 -- Source/Core/Core/DSP/DSPAssembler.cpp | 2 -- Source/Core/Core/DSP/DSPCodeUtil.cpp | 3 --- Source/Core/Core/DSP/DSPDisassembler.cpp | 1 - Source/Core/Core/DSP/DSPHWInterface.cpp | 5 ----- Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp | 2 -- .../Core/DSP/Interpreter/DSPIntMultiplier.cpp | 2 -- Source/Core/Core/DSP/LabelMap.cpp | 3 ++- Source/Core/Core/Debugger/BranchWatch.cpp | 2 -- Source/Core/Core/Debugger/CodeTrace.cpp | 1 - Source/Core/Core/Debugger/Debugger_SymbolMap.cpp | 2 -- Source/Core/Core/Debugger/OSThread.cpp | 1 - Source/Core/Core/Debugger/RSO.cpp | 1 - Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 1 - Source/Core/Core/FifoPlayer/FifoRecorder.cpp | 2 -- Source/Core/Core/FreeLookManager.h | 1 - Source/Core/Core/GeckoCode.cpp | 1 - Source/Core/Core/GeckoCodeConfig.cpp | 2 -- Source/Core/Core/HLE/HLE.cpp | 2 -- Source/Core/Core/HLE/HLE_Misc.cpp | 1 - Source/Core/Core/HLE/HLE_OS.cpp | 1 - Source/Core/Core/HW/CPU.cpp | 1 - Source/Core/Core/HW/DSPHLE/MailHandler.cpp | 1 - Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp | 1 - Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp | 1 - Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp | 1 - Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp | 2 -- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 1 - Source/Core/Core/HW/DSPLLE/DSPHost.cpp | 2 -- Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 3 --- Source/Core/Core/HW/DVD/DVDInterface.cpp | 1 - Source/Core/Core/HW/DVD/FileMonitor.cpp | 1 - Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp | 2 -- .../Core/Core/HW/EXI/BBA/TAPServerConnection.cpp | 15 ++++++--------- Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h | 1 + Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp | 5 ----- Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp | 5 ----- Source/Core/Core/HW/EXI/EXI_Device.cpp | 1 - Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp | 1 - Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp | 1 - Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp | 1 - Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h | 1 - Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp | 1 - Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp | 1 - Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp | 2 -- Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp | 3 --- Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp | 6 ------ Source/Core/Core/HW/EXI/EXI_DeviceModem.h | 4 ---- Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp | 2 -- Source/Core/Core/HW/GBAPadEmu.cpp | 1 - Source/Core/Core/HW/GCKeyboard.cpp | 4 ---- Source/Core/Core/HW/GCKeyboardEmu.cpp | 1 - Source/Core/Core/HW/GCMemcard/GCMemcard.cpp | 2 -- Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp | 1 - Source/Core/Core/HW/GCPad.cpp | 3 --- Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp | 2 -- Source/Core/Core/HW/HW.cpp | 1 - Source/Core/Core/HW/MemoryInterface.cpp | 1 - Source/Core/Core/HW/ProcessorInterface.cpp | 1 - Source/Core/Core/HW/SI/SI_DeviceGBA.cpp | 3 --- Source/Core/Core/HW/SI/SI_DeviceGCController.cpp | 3 --- .../Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp | 3 --- Source/Core/Core/HW/SystemTimers.cpp | 4 ---- Source/Core/Core/HW/WiiSave.cpp | 1 - Source/Core/Core/HW/Wiimote.cpp | 1 - Source/Core/Core/HW/WiimoteCommon/DataReport.cpp | 1 - Source/Core/Core/HW/WiimoteEmu/Camera.cpp | 2 -- Source/Core/Core/HW/WiimoteEmu/Camera.h | 3 +-- Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp | 1 - Source/Core/Core/HW/WiimoteEmu/Dynamics.h | 6 +----- Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp | 2 +- .../Core/HW/WiimoteEmu/Extension/Extension.cpp | 2 -- .../Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp | 1 - .../Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp | 1 - .../Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp | 1 - .../Core/HW/WiimoteEmu/Extension/Turntable.cpp | 1 - .../Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp | 2 -- Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp | 2 -- Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp | 2 -- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 2 ++ Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h | 2 +- Source/Core/Core/HW/WiimoteReal/IOLinux.cpp | 2 -- Source/Core/Core/HotkeyManager.cpp | 4 ---- Source/Core/Core/HotkeyManager.h | 1 - Source/Core/Core/IOS/Crypto/AesDevice.cpp | 3 --- Source/Core/Core/IOS/Crypto/Sha.cpp | 3 --- Source/Core/Core/IOS/DI/DI.cpp | 1 - Source/Core/Core/IOS/Device.cpp | 1 - Source/Core/Core/IOS/DeviceStub.h | 3 --- Source/Core/Core/IOS/DolphinDevice.cpp | 2 -- Source/Core/Core/IOS/ES/Formats.cpp | 1 - Source/Core/Core/IOS/ES/NandUtils.cpp | 3 --- Source/Core/Core/IOS/ES/TitleInformation.cpp | 1 - Source/Core/Core/IOS/ES/Views.cpp | 1 - Source/Core/Core/IOS/IOS.cpp | 1 - Source/Core/Core/IOS/IOS.h | 1 - Source/Core/Core/IOS/MIOS.cpp | 3 --- Source/Core/Core/IOS/Network/IP/Top.cpp | 4 ---- .../Core/IOS/Network/KD/Mail/WC24FriendList.h | 2 -- Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h | 2 -- Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp | 1 - Source/Core/Core/IOS/Network/KD/NetKDRequest.h | 1 - Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp | 3 --- Source/Core/Core/IOS/Network/MACUtils.cpp | 1 - Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp | 1 - Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h | 1 - Source/Core/Core/IOS/Network/SSL.cpp | 1 - Source/Core/Core/IOS/Network/Socket.cpp | 1 - Source/Core/Core/IOS/Network/Socket.h | 6 ------ Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp | 2 -- Source/Core/Core/IOS/STM/STM.h | 2 -- Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp | 1 - .../IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp | 1 - .../IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp | 2 -- .../Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp | 3 --- Source/Core/Core/IOS/USB/Common.h | 1 - Source/Core/Core/IOS/USB/Emulated/Infinity.cpp | 2 -- Source/Core/Core/IOS/USB/Emulated/Infinity.h | 1 - .../IOS/USB/Emulated/Skylanders/Skylander.cpp | 4 ---- .../USB/Emulated/Skylanders/SkylanderCrypto.cpp | 1 - .../USB/Emulated/Skylanders/SkylanderFigure.cpp | 1 - Source/Core/Core/IOS/USB/LibusbDevice.cpp | 2 -- Source/Core/Core/IOS/USB/LibusbDevice.h | 1 - Source/Core/Core/IOS/USB/OH0/OH0.cpp | 4 ---- Source/Core/Core/IOS/USB/OH0/OH0.h | 1 - Source/Core/Core/IOS/USB/USBV0.h | 1 - Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp | 1 - Source/Core/Core/MemTools.cpp | 13 +++++++------ Source/Core/Core/MemoryWatcher.cpp | 1 - Source/Core/Core/Movie.cpp | 2 -- Source/Core/Core/Movie.h | 1 - Source/Core/Core/NetPlayClient.cpp | 10 +--------- Source/Core/Core/NetPlayProto.h | 1 - Source/Core/Core/NetPlayServer.cpp | 1 - Source/Core/Core/NetPlayServer.h | 1 - Source/Core/Core/NetworkCaptureLogger.cpp | 2 -- Source/Core/Core/NetworkCaptureLogger.h | 1 - Source/Core/Core/PowerPC/BreakPoints.cpp | 2 +- .../CachedInterpreter/CachedInterpreter.cpp | 1 - .../CachedInterpreterEmitter.cpp | 1 - .../CachedInterpreter_Disassembler.cpp | 1 - Source/Core/Core/PowerPC/Expression.cpp | 3 +-- Source/Core/Core/PowerPC/GDBStub.cpp | 5 ----- .../Core/Core/PowerPC/Interpreter/Interpreter.cpp | 3 --- .../Interpreter/Interpreter_FloatingPoint.cpp | 1 - .../PowerPC/Interpreter/Interpreter_Integer.cpp | 1 - .../Interpreter/Interpreter_LoadStorePaired.cpp | 1 - .../PowerPC/Interpreter/Interpreter_Paired.cpp | 1 - Source/Core/Core/PowerPC/Jit64/Jit.cpp | 1 - Source/Core/Core/PowerPC/Jit64/Jit.h | 1 - Source/Core/Core/PowerPC/Jit64/JitAsm.cpp | 1 - Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp | 1 - .../Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp | 4 ---- Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp | 4 ---- .../Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 2 +- .../Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp | 1 - Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp | 2 -- .../Core/PowerPC/Jit64/RegCache/JitRegCache.cpp | 2 -- .../Core/PowerPC/Jit64/RegCache/JitRegCache.h | 1 - .../Core/PowerPC/Jit64Common/ConstantPool.cpp | 1 + .../Core/PowerPC/Jit64Common/EmuCodeBlock.cpp | 1 - .../Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp | 2 -- .../Core/PowerPC/Jit64Common/TrampolineCache.cpp | 6 ------ Source/Core/Core/PowerPC/JitInterface.cpp | 4 ---- Source/Core/Core/PowerPC/PPCAnalyst.cpp | 3 --- Source/Core/Core/PowerPC/PPCCache.cpp | 1 - Source/Core/Core/PowerPC/PPCTables.cpp | 4 ---- Source/Core/Core/PowerPC/PowerPC.cpp | 2 -- .../Core/Core/PowerPC/SignatureDB/SignatureDB.cpp | 1 - Source/Core/Core/State.cpp | 1 - Source/Core/Core/SysConf.cpp | 3 --- Source/Core/Core/TitleDatabase.cpp | 3 --- Source/Core/Core/USBUtils.cpp | 3 ++- Source/Core/Core/WiiRoot.cpp | 1 - Source/Core/Core/WiiUtils.h | 1 - Source/Core/DiscIO/CompressedBlob.cpp | 1 - Source/Core/DiscIO/DiscExtractor.h | 1 - Source/Core/DiscIO/DiscScrubber.cpp | 4 ---- Source/Core/DiscIO/DiscScrubber.h | 2 -- Source/Core/DiscIO/DiscUtils.cpp | 1 - Source/Core/DiscIO/Enums.cpp | 1 - Source/Core/DiscIO/FileSystemGCWii.cpp | 4 ---- Source/Core/DiscIO/FileSystemGCWii.h | 2 -- Source/Core/DiscIO/Filesystem.h | 2 -- Source/Core/DiscIO/RiivolutionPatcher.cpp | 2 -- Source/Core/DiscIO/VolumeDisc.cpp | 1 - Source/Core/DiscIO/VolumeGC.cpp | 3 --- Source/Core/DiscIO/VolumeVerifier.cpp | 2 -- Source/Core/DiscIO/VolumeWad.cpp | 3 --- Source/Core/DiscIO/VolumeWii.cpp | 1 - Source/Core/DiscIO/WIACompression.cpp | 1 - Source/Core/DiscIO/WiiEncryptionCache.h | 1 - Source/Core/DiscIO/WiiSaveBanner.cpp | 2 -- Source/Core/DolphinNoGUI/MainNoGUI.cpp | 3 --- Source/Core/DolphinNoGUI/PlatformFBDev.cpp | 8 -------- Source/Core/DolphinNoGUI/PlatformX11.cpp | 2 -- .../DolphinQt/Achievements/AchievementBox.cpp | 3 --- .../Core/DolphinQt/Achievements/AchievementBox.h | 2 +- .../Achievements/AchievementHeaderWidget.cpp | 2 -- .../Achievements/AchievementHeaderWidget.h | 2 -- .../Achievements/AchievementLeaderboardWidget.cpp | 4 ---- .../Achievements/AchievementProgressWidget.cpp | 6 ------ .../Achievements/AchievementSettingsWidget.cpp | 4 +--- Source/Core/DolphinQt/CheatSearchWidget.cpp | 9 --------- .../DolphinQt/Config/CommonControllersWidget.cpp | 1 - .../DolphinQt/Config/CommonControllersWidget.h | 2 -- Source/Core/DolphinQt/Config/FreeLookWidget.cpp | 3 --- .../Config/GamecubeControllersWidget.cpp | 1 - .../Graphics/ColorCorrectionConfigWindow.cpp | 2 -- .../Graphics/PostProcessingConfigWindow.cpp | 1 - Source/Core/DolphinQt/Config/InfoWidget.cpp | 1 - Source/Core/DolphinQt/Config/LogConfigWidget.cpp | 3 --- Source/Core/DolphinQt/Config/LogWidget.cpp | 2 -- Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp | 1 - .../Config/Mapping/GCPadWiiUConfigDialog.cpp | 1 - .../DolphinQt/Config/Mapping/MappingIndicator.cpp | 1 + .../DolphinQt/Config/Mapping/MappingNumeric.cpp | 3 --- .../Mapping/WiimoteEmuExtensionMotionInput.h | 2 -- .../Mapping/WiimoteEmuExtensionMotionSimulation.h | 2 -- Source/Core/DolphinQt/Config/PatchesWidget.cpp | 1 - Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp | 1 - .../Core/DolphinQt/Debugger/BranchWatchDialog.cpp | 1 - .../DolphinQt/Debugger/BranchWatchTableModel.cpp | 1 - .../Core/DolphinQt/Debugger/BreakpointDialog.cpp | 1 - Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp | 1 - Source/Core/DolphinQt/Debugger/JITWidget.cpp | 1 - .../Core/DolphinQt/Debugger/MemoryViewWidget.cpp | 3 --- Source/Core/DolphinQt/Debugger/MemoryWidget.cpp | 3 --- Source/Core/DolphinQt/Debugger/MemoryWidget.h | 2 -- Source/Core/DolphinQt/Debugger/NetworkWidget.cpp | 1 - Source/Core/DolphinQt/Debugger/NetworkWidget.h | 2 -- Source/Core/DolphinQt/DiscordHandler.cpp | 1 - Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp | 1 - Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp | 2 -- .../Core/DolphinQt/GCMemcardCreateNewDialog.cpp | 1 - Source/Core/DolphinQt/GCMemcardManager.cpp | 2 -- Source/Core/DolphinQt/GameList/GameList.cpp | 7 ++----- Source/Core/DolphinQt/Host.cpp | 3 --- Source/Core/DolphinQt/HotkeyScheduler.cpp | 7 +------ Source/Core/DolphinQt/Main.cpp | 2 ++ Source/Core/DolphinQt/MainWindow.cpp | 8 -------- Source/Core/DolphinQt/MenuBar.cpp | 9 ++------- .../DolphinQt/NetPlay/ChunkedProgressDialog.cpp | 2 -- .../DolphinQt/NetPlay/ChunkedProgressDialog.h | 1 - Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp | 1 - Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 6 ++---- Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp | 1 - Source/Core/DolphinQt/RenderWidget.cpp | 4 ---- Source/Core/DolphinQt/Resources.cpp | 2 -- Source/Core/DolphinQt/Settings.cpp | 3 --- Source/Core/DolphinQt/Settings.h | 2 +- Source/Core/DolphinQt/Settings/AudioPane.cpp | 3 --- Source/Core/DolphinQt/Settings/GameCubePane.cpp | 4 ++++ Source/Core/DolphinQt/Settings/GeneralPane.cpp | 3 --- Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp | 2 -- Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp | 2 -- Source/Core/DolphinQt/TAS/TASControlState.cpp | 2 -- Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp | 1 - Source/Core/DolphinQt/ToolBar.cpp | 1 - Source/Core/DolphinQt/Translation.cpp | 1 - Source/Core/DolphinQt/WiiUpdate.cpp | 2 -- Source/Core/DolphinTool/ConvertCommand.cpp | 2 -- Source/Core/DolphinTool/ExtractCommand.cpp | 1 - Source/Core/DolphinTool/HeaderCommand.cpp | 2 -- Source/Core/DolphinTool/ToolHeadlessPlatform.cpp | 8 -------- Source/Core/DolphinTool/ToolMain.cpp | 9 ++++----- Source/Core/DolphinTool/VerifyCommand.cpp | 2 -- .../ControllerEmu/ControlGroup/AnalogStick.cpp | 3 --- .../ControllerEmu/ControlGroup/Buttons.cpp | 4 ---- .../ControllerEmu/ControlGroup/Buttons.h | 2 -- .../ControllerEmu/ControlGroup/Cursor.cpp | 1 - .../ControllerEmu/ControlGroup/Cursor.h | 2 +- .../ControllerEmu/ControlGroup/Force.cpp | 2 -- .../ControllerEmu/ControlGroup/IMUCursor.cpp | 3 --- .../ControllerEmu/ControlGroup/MixedTriggers.cpp | 2 -- .../ControlGroup/ModifySettingsButton.cpp | 4 ---- .../ControllerEmu/ControlGroup/Slider.cpp | 4 ---- .../ControllerEmu/ControlGroup/Tilt.cpp | 2 -- .../ControllerEmu/ControlGroup/Triggers.cpp | 3 --- .../ControllerInterface/CoreDevice.cpp | 1 - .../DualShockUDPClient/DualShockUDPClient.cpp | 1 - .../DualShockUDPClient/DualShockUDPClient.h | 3 ++- .../DualShockUDPClient/DualShockUDPProto.h | 1 + .../ControllerInterface/Pipes/Pipes.cpp | 1 - .../ControllerInterface/SteamDeck/SteamDeck.cpp | 2 -- .../DynamicInputTextures/DITConfiguration.cpp | 3 --- .../DynamicInputTextures/DITSpecification.cpp | 1 - Source/Core/InputCommon/GCAdapter.cpp | 1 - Source/Core/InputCommon/InputConfig.cpp | 3 --- Source/Core/UICommon/AutoUpdate.cpp | 7 +++---- Source/Core/UICommon/DiscordPresence.cpp | 4 ---- Source/Core/UICommon/GameFile.cpp | 3 --- Source/Core/UICommon/NetPlayIndex.cpp | 1 - Source/Core/UICommon/UICommon.cpp | 5 ----- Source/Core/UICommon/X11Utils.cpp | 6 ------ Source/Core/VideoBackends/OGL/OGLBoundingBox.h | 2 +- Source/Core/VideoBackends/OGL/OGLConfig.cpp | 3 --- Source/Core/VideoBackends/OGL/OGLConfig.h | 2 -- Source/Core/VideoBackends/OGL/OGLGfx.cpp | 4 +--- Source/Core/VideoBackends/OGL/OGLMain.cpp | 1 - .../VideoBackends/OGL/OGLNativeVertexFormat.cpp | 1 - Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp | 1 - Source/Core/VideoBackends/OGL/OGLPipeline.cpp | 2 -- Source/Core/VideoBackends/OGL/OGLPipeline.h | 1 - Source/Core/VideoBackends/OGL/OGLShader.h | 3 +-- Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp | 2 -- Source/Core/VideoBackends/OGL/OGLStreamBuffer.h | 2 +- Source/Core/VideoBackends/OGL/OGLTexture.cpp | 2 +- Source/Core/VideoBackends/OGL/OGLTexture.h | 2 +- .../Core/VideoBackends/OGL/OGLVertexManager.cpp | 5 +---- Source/Core/VideoBackends/OGL/OGLVertexManager.h | 2 +- .../Core/VideoBackends/OGL/ProgramShaderCache.cpp | 4 ++-- .../Core/VideoBackends/OGL/ProgramShaderCache.h | 2 +- Source/Core/VideoBackends/OGL/SamplerCache.h | 2 +- Source/Core/VideoBackends/Software/SWTexture.cpp | 2 -- .../VideoBackends/Software/SWVertexLoader.cpp | 3 --- Source/Core/VideoBackends/Software/SWmain.cpp | 1 - .../VideoBackends/Software/TextureSampler.cpp | 1 - .../VideoBackends/Vulkan/CommandBufferManager.cpp | 1 - Source/Core/VideoBackends/Vulkan/ObjectCache.cpp | 7 ------- .../Core/VideoBackends/Vulkan/StagingBuffer.cpp | 1 - Source/Core/VideoBackends/Vulkan/StateTracker.cpp | 1 - .../Core/VideoBackends/Vulkan/VKBoundingBox.cpp | 2 -- Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp | 3 --- Source/Core/VideoBackends/Vulkan/VKPipeline.cpp | 2 -- Source/Core/VideoBackends/Vulkan/VKShader.cpp | 1 - .../Core/VideoBackends/Vulkan/VKStreamBuffer.cpp | 4 ---- Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp | 1 - .../Core/VideoBackends/Vulkan/VKVertexFormat.cpp | 1 - .../Core/VideoBackends/Vulkan/VKVertexManager.cpp | 4 ---- Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp | 10 ++++------ Source/Core/VideoCommon/AbstractGfx.cpp | 1 - .../Core/VideoCommon/AbstractStagingTexture.cpp | 1 - .../Core/VideoCommon/Assets/CustomAssetCache.cpp | 2 -- .../Assets/DirectFilesystemAssetLibrary.cpp | 1 - Source/Core/VideoCommon/Assets/MaterialAsset.h | 1 - Source/Core/VideoCommon/Assets/MeshAsset.cpp | 2 -- Source/Core/VideoCommon/CPMemory.cpp | 2 -- Source/Core/VideoCommon/CPUCull.cpp | 2 -- Source/Core/VideoCommon/CommandProcessor.cpp | 1 - Source/Core/VideoCommon/DriverDetails.cpp | 1 - Source/Core/VideoCommon/EFBInterface.cpp | 3 --- Source/Core/VideoCommon/GeometryShaderGen.cpp | 2 -- Source/Core/VideoCommon/GeometryShaderManager.cpp | 2 -- .../GraphicsModSystem/Config/GraphicsMod.cpp | 1 - .../GraphicsModSystem/Config/GraphicsModGroup.cpp | 4 +--- .../Runtime/Actions/CustomPipelineAction.cpp | 15 --------------- .../Runtime/CustomShaderCache.cpp | 1 + .../GraphicsModSystem/Runtime/CustomShaderCache.h | 6 ++---- .../Runtime/GraphicsModActionData.h | 3 +-- .../Runtime/GraphicsModManager.cpp | 2 +- .../Runtime/GraphicsModManager.h | 4 ++-- Source/Core/VideoCommon/IndexGenerator.cpp | 2 -- Source/Core/VideoCommon/LightingShaderGen.cpp | 1 - Source/Core/VideoCommon/OpcodeDecoding.cpp | 1 - Source/Core/VideoCommon/PerformanceTracker.cpp | 1 - Source/Core/VideoCommon/PipelineUtils.cpp | 1 - Source/Core/VideoCommon/PixelShaderGen.cpp | 7 ------- Source/Core/VideoCommon/ShaderCompileUtils.cpp | 1 - Source/Core/VideoCommon/ShaderGenCommon.cpp | 2 -- Source/Core/VideoCommon/Spirv.cpp | 4 ++-- .../VideoCommon/TextureConverterShaderGen.cpp | 1 - Source/Core/VideoCommon/TextureDecoder_Common.cpp | 1 - Source/Core/VideoCommon/TextureDecoder_x64.cpp | 4 ---- Source/Core/VideoCommon/UberShaderPixel.cpp | 1 - Source/Core/VideoCommon/UberShaderVertex.cpp | 1 - Source/Core/VideoCommon/VertexLoaderBase.cpp | 4 ---- Source/Core/VideoCommon/VertexLoaderManager.cpp | 1 - Source/Core/VideoCommon/VertexLoaderX64.cpp | 2 -- Source/Core/VideoCommon/VideoState.cpp | 2 -- Source/UnitTests/Common/BusyLoopTest.cpp | 1 - Source/UnitTests/Common/x64EmitterTest.cpp | 1 - Source/UnitTests/Core/PageFaultTest.cpp | 2 -- Source/UnitTests/Core/PatchAllowlistTest.cpp | 3 --- .../PowerPC/Jit64Common/ConvertDoubleToSingle.cpp | 7 +------ .../UnitTests/Core/PowerPC/Jit64Common/Fres.cpp | 1 - .../Core/PowerPC/Jit64Common/Frsqrte.cpp | 2 -- Source/UnitTests/UnitTestsMain.cpp | 4 ---- Source/UnitTests/VideoCommon/VertexLoaderTest.cpp | 2 -- 448 files changed, 115 insertions(+), 936 deletions(-) diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index b9e817331c7..5a60f9d45ae 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -5,7 +5,6 @@ #include -#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/Thread.h" diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp index 1f7fb5cf450..dd6a35f13e9 100644 --- a/Source/Core/AudioCommon/CubebStream.cpp +++ b/Source/Core/AudioCommon/CubebStream.cpp @@ -7,9 +7,7 @@ #include "AudioCommon/CubebUtils.h" #include "Common/CommonTypes.h" -#include "Common/Event.h" #include "Common/Logging/Log.h" -#include "Common/ScopeGuard.h" #include "Core/Config/MainSettings.h" #ifdef _WIN32 diff --git a/Source/Core/AudioCommon/CubebStream.h b/Source/Core/AudioCommon/CubebStream.h index 723abff51ac..db5d14b33e2 100644 --- a/Source/Core/AudioCommon/CubebStream.h +++ b/Source/Core/AudioCommon/CubebStream.h @@ -7,7 +7,9 @@ #include #include "AudioCommon/SoundStream.h" +#ifdef _WIN32 #include "Common/WorkQueueThread.h" +#endif #ifdef HAVE_CUBEB #include diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 909626b671c..1630c039608 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -3,15 +3,15 @@ #pragma once -#include - #include "AudioCommon/SoundStream.h" -#include "Common/Event.h" #ifdef _WIN32 #include #include #include +#include + +#include "Common/Event.h" // OpenAL requires a minimum of two buffers, three or more recommended #define OAL_BUFFERS 3 diff --git a/Source/Core/AudioCommon/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp index 89cdced4de7..042b9d7a7ff 100644 --- a/Source/Core/AudioCommon/WaveFile.cpp +++ b/Source/Core/AudioCommon/WaveFile.cpp @@ -16,7 +16,6 @@ #include "Common/StringUtil.h" #include "Common/Swap.h" #include "Core/Config/MainSettings.h" -#include "Core/ConfigManager.h" constexpr size_t WaveFileWriter::BUFFER_SIZE; diff --git a/Source/Core/Common/Assembler/AssemblerShared.h b/Source/Core/Common/Assembler/AssemblerShared.h index 23bf5be0ce3..0bcce3e48cb 100644 --- a/Source/Core/Common/Assembler/AssemblerShared.h +++ b/Source/Core/Common/Assembler/AssemblerShared.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include #include diff --git a/Source/Core/Common/Assembler/CaseInsensitiveDict.h b/Source/Core/Common/Assembler/CaseInsensitiveDict.h index 5dffbb63352..050dd7e6804 100644 --- a/Source/Core/Common/Assembler/CaseInsensitiveDict.h +++ b/Source/Core/Common/Assembler/CaseInsensitiveDict.h @@ -4,10 +4,10 @@ #pragma once #include +#include +#include #include -#include #include -#include #include #include diff --git a/Source/Core/Common/Assembler/GekkoAssembler.cpp b/Source/Core/Common/Assembler/GekkoAssembler.cpp index 4ee97c59d9c..b58c56021fa 100644 --- a/Source/Core/Common/Assembler/GekkoAssembler.cpp +++ b/Source/Core/Common/Assembler/GekkoAssembler.cpp @@ -3,7 +3,6 @@ #include "Common/Assembler/GekkoAssembler.h" -#include #include #include #include diff --git a/Source/Core/Common/Assembler/GekkoIRGen.cpp b/Source/Core/Common/Assembler/GekkoIRGen.cpp index c35024619de..b32c0fd582f 100644 --- a/Source/Core/Common/Assembler/GekkoIRGen.cpp +++ b/Source/Core/Common/Assembler/GekkoIRGen.cpp @@ -17,7 +17,6 @@ #include "Common/Assembler/AssemblerShared.h" #include "Common/Assembler/GekkoParser.h" #include "Common/Assert.h" -#include "Common/BitUtils.h" namespace Common::GekkoAssembler::detail { diff --git a/Source/Core/Common/Assembler/GekkoIRGen.h b/Source/Core/Common/Assembler/GekkoIRGen.h index 4a1a56fa668..00bf9dbdb53 100644 --- a/Source/Core/Common/Assembler/GekkoIRGen.h +++ b/Source/Core/Common/Assembler/GekkoIRGen.h @@ -7,7 +7,6 @@ #include #include "Common/Assembler/AssemblerShared.h" -#include "Common/Assembler/GekkoLexer.h" #include "Common/CommonTypes.h" namespace Common::GekkoAssembler::detail diff --git a/Source/Core/Common/Assembler/GekkoLexer.cpp b/Source/Core/Common/Assembler/GekkoLexer.cpp index 2b643601e1d..4cfb1c6243c 100644 --- a/Source/Core/Common/Assembler/GekkoLexer.cpp +++ b/Source/Core/Common/Assembler/GekkoLexer.cpp @@ -3,7 +3,6 @@ #include "Common/Assembler/GekkoLexer.h" -#include "Common/Assert.h" #include "Common/StringUtil.h" #include diff --git a/Source/Core/Common/Assembler/GekkoLexer.h b/Source/Core/Common/Assembler/GekkoLexer.h index bd99fa511b4..f20a951e97b 100644 --- a/Source/Core/Common/Assembler/GekkoLexer.h +++ b/Source/Core/Common/Assembler/GekkoLexer.h @@ -8,7 +8,6 @@ #include #include #include -#include #include #include "Common/Assembler/AssemblerShared.h" diff --git a/Source/Core/Common/Assembler/GekkoParser.cpp b/Source/Core/Common/Assembler/GekkoParser.cpp index ddd3f65e1f7..d76aad9be89 100644 --- a/Source/Core/Common/Assembler/GekkoParser.cpp +++ b/Source/Core/Common/Assembler/GekkoParser.cpp @@ -3,9 +3,7 @@ #include "Common/Assembler/GekkoParser.h" -#include #include -#include #include diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp index 9d0b3c97b7d..2c70ced6ca8 100644 --- a/Source/Core/Common/CommonFuncs.cpp +++ b/Source/Core/Common/CommonFuncs.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #ifdef _WIN32 #include diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 87370371021..a2c20c67e38 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -3,11 +3,11 @@ #pragma once +#ifdef _WIN32 #include +#endif #include -#include "Common/CommonTypes.h" - #ifndef _WIN32 // go to debugger mode diff --git a/Source/Core/Common/Config/Config.h b/Source/Core/Common/Config/Config.h index 1e0b32551b1..d8a2a9a691d 100644 --- a/Source/Core/Common/Config/Config.h +++ b/Source/Core/Common/Config/Config.h @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/Source/Core/Common/Config/Layer.cpp b/Source/Core/Common/Config/Layer.cpp index 5520e02d2e0..09cee1dfeb3 100644 --- a/Source/Core/Common/Config/Layer.cpp +++ b/Source/Core/Common/Config/Layer.cpp @@ -3,12 +3,6 @@ #include "Common/Config/Layer.h" -#include -#include -#include - -#include "Common/Config/Config.h" - namespace Config { ConfigLayerLoader::ConfigLayerLoader(LayerType layer) : m_layer(layer) diff --git a/Source/Core/Common/Crypto/AES.cpp b/Source/Core/Common/Crypto/AES.cpp index e0ffa5591d3..a83812ff2eb 100644 --- a/Source/Core/Common/Crypto/AES.cpp +++ b/Source/Core/Common/Crypto/AES.cpp @@ -4,7 +4,6 @@ #include "Common/Crypto/AES.h" #include -#include #include #include diff --git a/Source/Core/Common/Crypto/HMAC.cpp b/Source/Core/Common/Crypto/HMAC.cpp index 660817ea757..6313f44e500 100644 --- a/Source/Core/Common/Crypto/HMAC.cpp +++ b/Source/Core/Common/Crypto/HMAC.cpp @@ -1,7 +1,7 @@ // Copyright 2023 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include "mbedtls/md.h" #include "Common/Crypto/HMAC.h" #include "Common/ScopeGuard.h" diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index cdfe228f814..c8b85eb3877 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -8,9 +8,7 @@ #include #include "Common/Crypto/bn.h" -#include "Common/Inline.h" #include "Common/Random.h" -#include "Common/StringUtil.h" namespace Common::ec { diff --git a/Source/Core/Common/Debug/MemoryPatches.cpp b/Source/Core/Common/Debug/MemoryPatches.cpp index 0becba1ddea..b9f6e14901f 100644 --- a/Source/Core/Common/Debug/MemoryPatches.cpp +++ b/Source/Core/Common/Debug/MemoryPatches.cpp @@ -4,7 +4,6 @@ #include "Common/Debug/MemoryPatches.h" #include -#include #include namespace Common::Debug diff --git a/Source/Core/Common/Debug/MemoryPatches.h b/Source/Core/Common/Debug/MemoryPatches.h index 607bb831a03..187934beca7 100644 --- a/Source/Core/Common/Debug/MemoryPatches.h +++ b/Source/Core/Common/Debug/MemoryPatches.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/Common/DynamicLibrary.cpp b/Source/Core/Common/DynamicLibrary.cpp index 73c25ce2a28..e9686859d37 100644 --- a/Source/Core/Common/DynamicLibrary.cpp +++ b/Source/Core/Common/DynamicLibrary.cpp @@ -7,8 +7,6 @@ #include -#include "Common/Assert.h" - #ifdef _WIN32 #include #else diff --git a/Source/Core/Common/FatFsUtil.cpp b/Source/Core/Common/FatFsUtil.cpp index 80e2c424b44..004d84b688b 100644 --- a/Source/Core/Common/FatFsUtil.cpp +++ b/Source/Core/Common/FatFsUtil.cpp @@ -4,7 +4,6 @@ #include "Common/FatFsUtil.h" #include -#include #include #include #include diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index 1eecb1d36dd..ebaa9f37b0f 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -13,14 +13,10 @@ #ifdef _MSC_VER #include -#else -#ifdef ANDROID +#elifdef ANDROID #include "jni/AndroidCommon/AndroidCommon.h" #endif -#include -#endif - namespace fs = std::filesystem; namespace Common diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index bcfd74256d9..05be18b6100 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -3,28 +3,24 @@ #include "Common/FileUtil.h" -#include -#include #include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include -#include "Common/Assert.h" -#include "Common/Common.h" #include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" +#ifdef ANDROID +#include "Common/Assert.h" +#endif #ifdef __APPLE__ #include "Common/DynamicLibrary.h" #endif @@ -41,8 +37,6 @@ #include // guid stuff #include #else -#include -#include #include #include #include diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index 37548acfed0..49f68477682 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -3,9 +3,7 @@ #pragma once -#include #include -#include #include #include #include diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp index 30230e7d082..a0bf6dcbab1 100644 --- a/Source/Core/Common/GL/GLInterface/EGL.cpp +++ b/Source/Core/Common/GL/GLInterface/EGL.cpp @@ -4,7 +4,6 @@ #include "Common/GL/GLInterface/EGL.h" #include -#include #include #include diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp index 9f65e7158b3..f447d55d3fb 100644 --- a/Source/Core/Common/GL/GLUtil.cpp +++ b/Source/Core/Common/GL/GLUtil.cpp @@ -3,9 +3,6 @@ #include "Common/GL/GLUtil.h" -#include - -#include "Common/Assert.h" #include "Common/GL/GLContext.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Common/GL/GLX11Window.cpp b/Source/Core/Common/GL/GLX11Window.cpp index d8f072d1a72..1fb8c1935ce 100644 --- a/Source/Core/Common/GL/GLX11Window.cpp +++ b/Source/Core/Common/GL/GLX11Window.cpp @@ -3,8 +3,6 @@ #include "Common/GL/GLX11Window.h" -#include "Common/GL/GLContext.h" - GLX11Window::GLX11Window(Display* display, Window parent_window, Colormap color_map, Window window, int width, int height) : m_display(display), m_parent_window(parent_window), m_color_map(color_map), m_window(window), diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index 8cb697b6956..a3984745f54 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -9,9 +9,7 @@ #include -#include "Common/BitUtils.h" #include "Common/CPUDetect.h" -#include "Common/CommonFuncs.h" #include "Common/Intrinsics.h" #ifdef _M_ARM_64 diff --git a/Source/Core/Common/IOFile.cpp b/Source/Core/Common/IOFile.cpp index cf7762ea680..9402da1a942 100644 --- a/Source/Core/Common/IOFile.cpp +++ b/Source/Core/Common/IOFile.cpp @@ -3,7 +3,6 @@ #include "Common/IOFile.h" -#include #include #include diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h index 31a7ee0e6b0..181175101f2 100644 --- a/Source/Core/Common/IniFile.h +++ b/Source/Core/Common/IniFile.h @@ -3,14 +3,12 @@ #pragma once -#include #include #include #include #include #include -#include "Common/CommonTypes.h" #include "Common/StringUtil.h" namespace Common diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp index 4d8ba45fc67..94da2afdb02 100644 --- a/Source/Core/Common/JitRegister.cpp +++ b/Source/Core/Common/JitRegister.cpp @@ -3,17 +3,14 @@ #include "Common/JitRegister.h" -#include #include #include -#include #include #include #include "Common/CommonTypes.h" #include "Common/IOFile.h" -#include "Common/StringUtil.h" #ifdef _WIN32 #include diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index c4f38e72f60..9e55f779cd7 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -5,7 +5,6 @@ #include #include -#include #include "Common/FormatUtil.h" namespace Common::Log diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index a1302a81710..0755dc92ab0 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -6,18 +6,15 @@ #include #include #include -#include #include -#include +#include #include #include -#include #include #include #include -#include "Common/CommonPaths.h" #include "Common/Config/Config.h" #include "Common/FileUtil.h" #include "Common/Logging/ConsoleListener.h" diff --git a/Source/Core/Common/Matrix.cpp b/Source/Core/Common/Matrix.cpp index 44463ef1eff..9c754871116 100644 --- a/Source/Core/Common/Matrix.cpp +++ b/Source/Core/Common/Matrix.cpp @@ -3,7 +3,6 @@ #include "Common/Matrix.h" -#include #include #include "Common/MathUtil.h" diff --git a/Source/Core/Common/MemArenaUnix.cpp b/Source/Core/Common/MemArenaUnix.cpp index 83026f76b8b..c25d2357f9c 100644 --- a/Source/Core/Common/MemArenaUnix.cpp +++ b/Source/Core/Common/MemArenaUnix.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include @@ -21,7 +20,6 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" namespace Common { diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index f4759c41a05..0d66890d2b8 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -5,10 +5,8 @@ #include #include -#include #include "Common/CommonFuncs.h" -#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" @@ -16,10 +14,11 @@ #include #include "Common/StringUtil.h" #else -#include #include #include -#include +#if defined(_M_ARM_64) && defined(__APPLE__) +#include +#endif #if defined __APPLE__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ #include #elif defined __HAIKU__ diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp index 660782ad9da..f6201c651fc 100644 --- a/Source/Core/Common/MsgHandler.cpp +++ b/Source/Core/Common/MsgHandler.cpp @@ -3,21 +3,19 @@ #include "Common/MsgHandler.h" -#include #include #include #ifdef _WIN32 #include #else -#include #include #endif -#include "Common/Common.h" -#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" +#ifdef _WIN32 #include "Common/StringUtil.h" +#endif namespace Common { diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h index 0220c781863..4fc7196a970 100644 --- a/Source/Core/Common/MsgHandler.h +++ b/Source/Core/Common/MsgHandler.h @@ -3,13 +3,11 @@ #pragma once -#include #include #include #include -#include "Common/FormatUtil.h" #include "Common/Logging/Log.h" namespace Common diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index aed767a85e4..0ed2360267c 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -11,8 +11,6 @@ #ifndef _WIN32 #include #include -#include -#include #else #include #endif diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp index 34aafd38fdf..3a8eeb2746a 100644 --- a/Source/Core/Common/Profiler.cpp +++ b/Source/Core/Common/Profiler.cpp @@ -5,8 +5,6 @@ #include #include -#include -#include #include #include #include diff --git a/Source/Core/Common/QoSSession.cpp b/Source/Core/Common/QoSSession.cpp index e2e3914e531..2bcecea2bfd 100644 --- a/Source/Core/Common/QoSSession.cpp +++ b/Source/Core/Common/QoSSession.cpp @@ -8,8 +8,6 @@ #pragma comment(lib, "qwave") #endif -#include "Core/ConfigManager.h" - namespace Common { #if defined(_WIN32) diff --git a/Source/Core/Common/Random.cpp b/Source/Core/Common/Random.cpp index 0c859eaa126..9ecb6bcc1ca 100644 --- a/Source/Core/Common/Random.cpp +++ b/Source/Core/Common/Random.cpp @@ -7,6 +7,7 @@ #include #include "Common/Assert.h" +#include "Common/CommonTypes.h" namespace Common::Random { diff --git a/Source/Core/Common/Random.h b/Source/Core/Common/Random.h index 86192f840f2..e899743c41f 100644 --- a/Source/Core/Common/Random.h +++ b/Source/Core/Common/Random.h @@ -4,11 +4,8 @@ #pragma once #include -#include #include -#include "Common/CommonTypes.h" - namespace Common::Random { /// Fill `buffer` with random bytes using a cryptographically secure pseudo-random number generator. diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp index b0faf6f6f03..7f2f4367989 100644 --- a/Source/Core/Common/SettingsHandler.cpp +++ b/Source/Core/Common/SettingsHandler.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include diff --git a/Source/Core/Common/SocketContext.cpp b/Source/Core/Common/SocketContext.cpp index f9c630c4344..dcc637891a6 100644 --- a/Source/Core/Common/SocketContext.cpp +++ b/Source/Core/Common/SocketContext.cpp @@ -2,9 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "Common/SocketContext.h" - +#ifdef _WIN32 #include "Common/Logging/Log.h" #include "Common/Network.h" +#endif namespace Common { diff --git a/Source/Core/Common/SpanUtils.h b/Source/Core/Common/SpanUtils.h index d09193b3142..eef3567f4ca 100644 --- a/Source/Core/Common/SpanUtils.h +++ b/Source/Core/Common/SpanUtils.h @@ -5,8 +5,8 @@ #include #include +#include #include -#include #include "Common/CommonTypes.h" diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp index 4c8a61b386a..258559bc4f7 100644 --- a/Source/Core/Common/Thread.cpp +++ b/Source/Core/Common/Thread.cpp @@ -26,9 +26,10 @@ #pragma comment(lib, "libittnotify.lib") #endif -#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" +#ifdef _WIN32 #include "Common/StringUtil.h" +#endif namespace Common { diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 0e260b833cf..957073426b2 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -10,8 +10,6 @@ #ifdef _WIN32 #include #include -#else -#include #endif #include "Common/CommonTypes.h" diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h index efe0e2f7d1f..759edd653a3 100644 --- a/Source/Core/Common/TraversalClient.h +++ b/Source/Core/Common/TraversalClient.h @@ -12,7 +12,6 @@ #include "Common/CommonTypes.h" #include "Common/ENet.h" -#include "Common/Thread.h" #include "Common/TraversalProto.h" namespace Common diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp index 3d449256d1e..0a9b6c0d0bc 100644 --- a/Source/Core/Common/TraversalServer.cpp +++ b/Source/Core/Common/TraversalServer.cpp @@ -7,18 +7,14 @@ #include #include #include -#include #include #include #include -#include #include -#include #include -#include #include -#include +#include #ifdef HAVE_LIBSYSTEMD #include diff --git a/Source/Core/Common/UPnP.cpp b/Source/Core/Common/UPnP.cpp index be5474706b3..81807f1e3c1 100644 --- a/Source/Core/Common/UPnP.cpp +++ b/Source/Core/Common/UPnP.cpp @@ -16,7 +16,6 @@ #include #include #include -#include static UPNPUrls s_urls; static IGDdatas s_data; diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index d256b4188a2..d1e9d53273f 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -17,9 +17,10 @@ #include #include "Common/CommonTypes.h" -#include "Common/Intrinsics.h" -#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#ifdef _WIN32 +#include "Common/MsgHandler.h" +#endif #ifndef _WIN32 diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp index 06b66ec5273..fdd13d9cf44 100644 --- a/Source/Core/Common/x64FPURoundMode.cpp +++ b/Source/Core/Common/x64FPURoundMode.cpp @@ -3,9 +3,6 @@ #include "Common/FPURoundMode.h" -#include - -#include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/Intrinsics.h" diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp index 57530ec9009..0e1ddde839c 100644 --- a/Source/Core/Core/AchievementManager.cpp +++ b/Source/Core/Core/AchievementManager.cpp @@ -5,13 +5,10 @@ #include "Core/AchievementManager.h" -#include #include #include -#include - #include "Common/BitUtils.h" #include "Common/CommonPaths.h" #include "Common/Config/Config.h" diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp index f5089acaae1..9dbb0450a82 100644 --- a/Source/Core/Core/ActionReplay.cpp +++ b/Source/Core/Core/ActionReplay.cpp @@ -33,7 +33,6 @@ #include #include "Common/CommonTypes.h" -#include "Common/Config/Config.h" #include "Common/IniFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index afd67162b0c..1f87d062818 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -5,8 +5,8 @@ #include #include -#include #include +#include #include #include #include @@ -17,7 +17,6 @@ #include -#include "Common/Align.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Config/Config.h" diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp index 8b3d7803350..c4b5419a698 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp @@ -1,13 +1,10 @@ // Copyright 2009 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include - #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Core/Boot/Boot.h" -#include "Core/CommonTitles.h" #include "Core/IOS/ES/ES.h" #include "Core/IOS/ES/Formats.h" #include "Core/IOS/IOS.h" diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index fc93d01a1eb..ae49a14b92f 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -17,17 +17,11 @@ #include "Core/BootManager.h" -#include -#include -#include - #include #include "Common/CommonTypes.h" #include "Common/Config/Config.h" #include "Common/FileUtil.h" -#include "Common/IniFile.h" -#include "Common/Logging/Log.h" #include "Core/AchievementManager.h" #include "Core/Boot/Boot.h" @@ -41,17 +35,13 @@ #include "Core/HW/SI/SI.h" #include "Core/HW/SI/SI_Device.h" #include "Core/HW/Sram.h" -#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/Movie.h" #include "Core/NetPlayProto.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/System.h" #include "Core/WiiRoot.h" #include "DiscIO/Enums.h" -#include "VideoCommon/VideoBackendBase.h" - namespace BootManager { // Boot the ISO or file diff --git a/Source/Core/Core/Config/AchievementSettings.cpp b/Source/Core/Core/Config/AchievementSettings.cpp index f3b3e43ebcf..538461e474e 100644 --- a/Source/Core/Core/Config/AchievementSettings.cpp +++ b/Source/Core/Core/Config/AchievementSettings.cpp @@ -6,8 +6,6 @@ #include -#include "Common/Config/Config.h" - namespace Config { // Configuration Information diff --git a/Source/Core/Core/Config/DefaultLocale.cpp b/Source/Core/Core/Config/DefaultLocale.cpp index fe1f3455543..79c4c677872 100644 --- a/Source/Core/Core/Config/DefaultLocale.cpp +++ b/Source/Core/Core/Config/DefaultLocale.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp index 53090bec8a3..b401df3da91 100644 --- a/Source/Core/Core/Config/GraphicsSettings.cpp +++ b/Source/Core/Core/Config/GraphicsSettings.cpp @@ -5,7 +5,6 @@ #include -#include "Common/Config/Config.h" #include "VideoCommon/VideoConfig.h" namespace Config diff --git a/Source/Core/Core/Config/NetplaySettings.cpp b/Source/Core/Core/Config/NetplaySettings.cpp index 094c0e7211f..de872290237 100644 --- a/Source/Core/Core/Config/NetplaySettings.cpp +++ b/Source/Core/Core/Config/NetplaySettings.cpp @@ -3,8 +3,6 @@ #include "Core/Config/NetplaySettings.h" -#include "Common/Config/Config.h" - namespace Config { static constexpr u16 DEFAULT_LISTEN_PORT = 2626; diff --git a/Source/Core/Core/Config/SessionSettings.cpp b/Source/Core/Core/Config/SessionSettings.cpp index 7ccd3873609..0e3deacd624 100644 --- a/Source/Core/Core/Config/SessionSettings.cpp +++ b/Source/Core/Core/Config/SessionSettings.cpp @@ -4,8 +4,6 @@ #include "Core/Config/SessionSettings.h" #include "Common/CPUDetect.h" -#include "Common/CommonTypes.h" -#include "Common/Config/Config.h" namespace Config { diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp index d41c73958da..811eb9974ee 100644 --- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp @@ -6,11 +6,9 @@ #include #include #include -#include #include #include #include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp index 37071de27b9..b310fb31a44 100644 --- a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp @@ -14,9 +14,7 @@ #include "Core/Config/MainSettings.h" #include "Core/Config/SYSCONFSettings.h" #include "Core/Config/SessionSettings.h" -#include "Core/ConfigManager.h" #include "Core/Movie.h" -#include "VideoCommon/VideoConfig.h" namespace PowerPC { diff --git a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp index 7966cb32d27..8ead83f8cc3 100644 --- a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp @@ -8,7 +8,6 @@ #include #include "Common/CommonPaths.h" -#include "Common/Config/Config.h" #include "Common/FileUtil.h" #include "Core/Config/AchievementSettings.h" diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 75ba7380b4d..95be762ba01 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -27,7 +26,6 @@ #include "Common/CPUDetect.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/FPURoundMode.h" #include "Common/FatFsUtil.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp index 01ef9a81e58..d2008090a54 100644 --- a/Source/Core/Core/DSP/DSPAssembler.cpp +++ b/Source/Core/Core/DSP/DSPAssembler.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -20,7 +19,6 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" -#include "Common/StringUtil.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPDisassembler.h" diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp index 074dd86c3ae..7b9b5d3b0a6 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp @@ -4,7 +4,6 @@ #include "Core/DSP/DSPCodeUtil.h" #include -#include #include #include @@ -13,9 +12,7 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IOFile.h" -#include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Common/Swap.h" #include "Core/DSP/DSPAssembler.h" diff --git a/Source/Core/Core/DSP/DSPDisassembler.cpp b/Source/Core/Core/DSP/DSPDisassembler.cpp index bca1d53e19a..75f235b38fe 100644 --- a/Source/Core/Core/DSP/DSPDisassembler.cpp +++ b/Source/Core/Core/DSP/DSPDisassembler.cpp @@ -4,7 +4,6 @@ #include "Core/DSP/DSPDisassembler.h" -#include #include #include #include diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp index 8e1170f5cd9..9ef08545171 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/DSP/DSPHWInterface.cpp @@ -5,15 +5,10 @@ #include "Core/DSP/DSPCore.h" #include -#include -#include -#include "Common/CPUDetect.h" #include "Common/CommonTypes.h" -#include "Common/Intrinsics.h" #include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" -#include "Common/Swap.h" #include "Core/DSP/DSPAccelerator.h" #include "Core/DSP/DSPHost.h" diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp index 4c3af7ec85d..c212c535f90 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp @@ -6,8 +6,6 @@ #include "Core/DSP/Interpreter/DSPInterpreter.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPTables.h" -#include "Core/DSP/Interpreter/DSPIntUtil.h" namespace DSP::Interpreter { diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp index 9f9450514e8..2b237f4e894 100644 --- a/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp @@ -7,9 +7,7 @@ #include "Core/DSP/Interpreter/DSPInterpreter.h" -#include "Core/DSP/DSPTables.h" #include "Core/DSP/Interpreter/DSPIntCCUtil.h" -#include "Core/DSP/Interpreter/DSPIntUtil.h" namespace DSP::Interpreter { diff --git a/Source/Core/Core/DSP/LabelMap.cpp b/Source/Core/Core/DSP/LabelMap.cpp index 0e4f7d39edd..1dfdfdaf6a1 100644 --- a/Source/Core/Core/DSP/LabelMap.cpp +++ b/Source/Core/Core/DSP/LabelMap.cpp @@ -7,7 +7,8 @@ #include #include -#include "Common/Logging/Log.h" +#include + #include "Core/DSP/DSPTables.h" namespace DSP diff --git a/Source/Core/Core/Debugger/BranchWatch.cpp b/Source/Core/Core/Debugger/BranchWatch.cpp index 8393d8fcec9..5f5084562c9 100644 --- a/Source/Core/Core/Debugger/BranchWatch.cpp +++ b/Source/Core/Core/Debugger/BranchWatch.cpp @@ -8,8 +8,6 @@ #include #include -#include - #include "Common/Assert.h" #include "Common/BitField.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/Debugger/CodeTrace.cpp b/Source/Core/Core/Debugger/CodeTrace.cpp index 1277005f306..466fdfd7a7e 100644 --- a/Source/Core/Core/Debugger/CodeTrace.cpp +++ b/Source/Core/Core/Debugger/CodeTrace.cpp @@ -8,7 +8,6 @@ #include #include "Common/Contains.h" -#include "Common/Event.h" #include "Core/Core.h" #include "Core/Debugger/PPCDebugInterface.h" #include "Core/HW/CPU.h" diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp index 76bfd0c7809..e9b1c6ebd9c 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp @@ -3,14 +3,12 @@ #include "Core/Debugger/Debugger_SymbolMap.h" -#include #include #include #include #include "Common/CommonTypes.h" -#include "Common/StringUtil.h" #include "Core/Core.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/Debugger/OSThread.cpp b/Source/Core/Core/Debugger/OSThread.cpp index b5fd60e3a1d..9f992a00c80 100644 --- a/Source/Core/Core/Debugger/OSThread.cpp +++ b/Source/Core/Core/Debugger/OSThread.cpp @@ -3,7 +3,6 @@ #include "Core/Debugger/OSThread.h" -#include #include #include "Core/PowerPC/MMU.h" diff --git a/Source/Core/Core/Debugger/RSO.cpp b/Source/Core/Core/Debugger/RSO.cpp index 81183344d44..6dfb8baa0b4 100644 --- a/Source/Core/Core/Debugger/RSO.cpp +++ b/Source/Core/Core/Debugger/RSO.cpp @@ -9,7 +9,6 @@ #include #include -#include "Common/CommonFuncs.h" #include "Common/Logging/Log.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PPCSymbolDB.h" diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index 3e0c9aa5f02..f0c62d4e3f2 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include "Common/Assert.h" diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp index 207e12fb7a1..571766eb114 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp @@ -8,7 +8,6 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/Thread.h" #include "Core/HW/Memmap.h" #include "Core/System.h" @@ -19,7 +18,6 @@ #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VideoEvents.h" #include "VideoCommon/XFMemory.h" -#include "VideoCommon/XFStructs.h" class FifoRecorder::FifoRecordAnalyzer : public OpcodeDecoder::Callback { diff --git a/Source/Core/Core/FreeLookManager.h b/Source/Core/Core/FreeLookManager.h index 1cf8b7f1244..c03f5b58263 100644 --- a/Source/Core/Core/FreeLookManager.h +++ b/Source/Core/Core/FreeLookManager.h @@ -6,7 +6,6 @@ #include #include -#include "Common/CommonTypes.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" class CameraControllerInput; diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 45b8db279ad..79b8449e92b 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -12,7 +12,6 @@ #include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/Config/Config.h" #include "Common/FileUtil.h" #include "Core/AchievementManager.h" diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp index 58e15775f74..c4a74c86680 100644 --- a/Source/Core/Core/GeckoCodeConfig.cpp +++ b/Source/Core/Core/GeckoCodeConfig.cpp @@ -3,7 +3,6 @@ #include "Core/GeckoCodeConfig.h" -#include #include #include #include @@ -11,7 +10,6 @@ #include "Common/HttpRequest.h" #include "Common/IniFile.h" -#include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/CheatCodes.h" diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp index 934e58e5e66..31b6c2d1ed1 100644 --- a/Source/Core/Core/HLE/HLE.cpp +++ b/Source/Core/Core/HLE/HLE.cpp @@ -8,7 +8,6 @@ #include #include "Common/CommonTypes.h" -#include "Common/Config/Config.h" #include "Core/Config/MainSettings.h" #include "Core/Core.h" @@ -17,7 +16,6 @@ #include "Core/HLE/HLE_OS.h" #include "Core/HW/Memmap.h" #include "Core/Host.h" -#include "Core/IOS/ES/ES.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" #include "Core/System.h" diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp index 6f2a2fc389a..c9f160ad97b 100644 --- a/Source/Core/Core/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/HLE/HLE_Misc.cpp @@ -3,7 +3,6 @@ #include "Core/HLE/HLE_Misc.h" -#include "Common/Common.h" #include "Common/CommonTypes.h" #include "Core/Core.h" #include "Core/GeckoCode.h" diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index 43f5796bb48..5aa5a905c6b 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -11,7 +11,6 @@ #include #include -#include "Common/BitUtils.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index 558b2098ab0..abd632d66cc 100644 --- a/Source/Core/Core/HW/CPU.cpp +++ b/Source/Core/Core/HW/CPU.cpp @@ -8,7 +8,6 @@ #include #include "AudioCommon/AudioCommon.h" -#include "Common/CommonTypes.h" #include "Common/Event.h" #include "Common/Thread.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp index db783a51e74..192de92be6d 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp @@ -6,7 +6,6 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" #include "Core/HW/DSP.h" namespace DSP::HLE diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp index 973ee7e4ec9..f11a9d8db64 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp @@ -10,7 +10,6 @@ #include "Common/ChunkFile.h" #include "Common/Logging/Log.h" -#include "Common/Swap.h" #include "Core/DSP/DSPAccelerator.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPHLE/DSPHLE.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp index 6beeace5831..93cad8d7587 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp @@ -3,7 +3,6 @@ #include "Core/HW/DSPHLE/UCodes/AX.h" -#include #include #include #include diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp index 04dee941ca0..01bced1bf34 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp @@ -5,7 +5,6 @@ #include "Core/HW/DSPHLE/UCodes/AXWii.h" -#include #include #include "Common/ChunkFile.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp index e971063a219..f2082896369 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp @@ -3,8 +3,6 @@ #include "Core/HW/DSPHLE/UCodes/ROM.h" -#include - #ifdef _WIN32 #include #endif diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp index 58410c06247..168756a84bc 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp @@ -5,7 +5,6 @@ #include #include -#include #ifdef _WIN32 #include diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp index 75f321518f4..e3b71bb8569 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -12,11 +12,9 @@ #include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPCodeUtil.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/x64/DSPEmitter.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPLLE/DSPSymbols.h" #include "Core/HW/Memmap.h" -#include "Core/Host.h" #include "Core/System.h" #include "VideoCommon/OnScreenDisplay.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index ca18e45999b..7495d20fd89 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -13,10 +13,8 @@ #include "Common/Event.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" -#include "Common/MemoryUtil.h" #include "Common/Thread.h" #include "Core/Config/MainSettings.h" -#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/DSP/DSPAccelerator.h" #include "Core/DSP/DSPCaptureLogger.h" @@ -26,7 +24,6 @@ #include "Core/DSP/Interpreter/DSPInterpreter.h" #include "Core/DSP/Jit/DSPEmitterBase.h" #include "Core/HW/Memmap.h" -#include "Core/Host.h" namespace DSP::LLE { diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp index 49cafccb70a..efb279cfac0 100644 --- a/Source/Core/Core/HW/DVD/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVD/DVDInterface.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/Source/Core/Core/HW/DVD/FileMonitor.cpp b/Source/Core/Core/HW/DVD/FileMonitor.cpp index b469b425702..f7e5e8019ec 100644 --- a/Source/Core/Core/HW/DVD/FileMonitor.cpp +++ b/Source/Core/Core/HW/DVD/FileMonitor.cpp @@ -3,7 +3,6 @@ #include "Core/HW/DVD/FileMonitor.h" -#include #include #include #include diff --git a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp index 305ab6ee0c9..ed9cd5b488e 100644 --- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp +++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp @@ -13,7 +13,6 @@ #else #include #include -#include #endif #include "Common/BitUtils.h" @@ -21,7 +20,6 @@ #include "Common/MsgHandler.h" #include "Common/Network.h" #include "Common/ScopeGuard.h" -#include "Core/HW/EXI/EXI_Device.h" #include "Core/HW/EXI/EXI_DeviceEthernet.h" namespace diff --git a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp index 2bc9b4ed810..f2bd89e6b2e 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp +++ b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp @@ -1,28 +1,25 @@ // Copyright 2020 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include +#include #include -#include "Core/HW/EXI/EXI_DeviceEthernet.h" -#include "SFML/Network/IpAddress.hpp" #ifdef _WIN32 #include #include #else -#include +#include #include -#include #include #include #endif -#include -#include - -#include "Common/CommonFuncs.h" #include "Common/Logging/Log.h" +#include "Common/Network.h" #include "Common/StringUtil.h" -#include "Core/HW/EXI/EXI_Device.h" +#include "Core/HW/EXI/BBA/TAPServerConnection.h" +#include "SFML/Network/IpAddress.hpp" namespace ExpansionInterface { diff --git a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h index dbb8c6ee7a5..20b32dd985f 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h +++ b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h @@ -7,6 +7,7 @@ #include #include +#include "Common/CommonTypes.h" #include "Common/Flag.h" #include "Common/SocketContext.h" diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp index 81ea396149c..a147cc70736 100644 --- a/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp +++ b/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp @@ -9,20 +9,15 @@ #include #endif -#include - #include "Common/Logging/Log.h" #include "Common/StringUtil.h" -#include "Core/HW/EXI/EXI_Device.h" #ifdef __linux__ #include #include #include -#include #include #include -#include #endif namespace ExpansionInterface diff --git a/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp b/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp index 236d872992b..07b7bad783b 100644 --- a/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp +++ b/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp @@ -1,18 +1,13 @@ // Copyright 2008 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "Common/Assert.h" #include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" #include "Common/StringUtil.h" -#include "Core/HW/EXI/EXI_Device.h" #include "Core/HW/EXI/EXI_DeviceEthernet.h" #include "SFML/Network/IpAddress.hpp" #include "VideoCommon/OnScreenDisplay.h" -#include - #include #include diff --git a/Source/Core/Core/HW/EXI/EXI_Device.cpp b/Source/Core/Core/HW/EXI/EXI_Device.cpp index c1300a363f1..e5ee2d70c54 100644 --- a/Source/Core/Core/HW/EXI/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI/EXI_Device.cpp @@ -6,7 +6,6 @@ #include #include "Common/CommonTypes.h" -#include "Common/MsgHandler.h" #include "Core/HW/EXI/EXI_DeviceAD16.h" #include "Core/HW/EXI/EXI_DeviceAGP.h" #include "Core/HW/EXI/EXI_DeviceBaseboard.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp index 8b7e62d305d..a2aba8a887b 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp @@ -4,7 +4,6 @@ #include "Core/HW/EXI/EXI_DeviceAGP.h" #include -#include #include #include diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp index a9200ac85a5..7df13f5020d 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp @@ -3,7 +3,6 @@ #include "Core/HW/EXI/EXI_DeviceBaseboard.h" -#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp index 311f1e2226f..c49c6e32b9c 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp @@ -3,7 +3,6 @@ #include "Core/HW/EXI/EXI_DeviceEthernet.h" -#include #include #include #include diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h index cb6ac688bf4..78b20f5a444 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h @@ -21,7 +21,6 @@ #include "Common/Flag.h" #include "Common/Network.h" -#include "Common/SocketContext.h" #include "Core/HW/EXI/BBA/BuiltIn.h" #include "Core/HW/EXI/BBA/TAPServerConnection.h" #include "Core/HW/EXI/EXI_Device.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp index 14942bf0c87..a7bf363b7b2 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp @@ -12,7 +12,6 @@ #include -#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/Thread.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp index dcce1614109..82650ff1a01 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp @@ -14,7 +14,6 @@ #include "Common/FileUtil.h" #include "Common/IOFile.h" #include "Common/Logging/Log.h" -#include "Common/MemoryUtil.h" #include "Common/StringUtil.h" #include "Common/Swap.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp index 13a06da652e..4870e503ba3 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp @@ -4,7 +4,6 @@ #include "Core/HW/EXI/EXI_DeviceMemoryCard.h" #include -#include #include #include #include @@ -18,7 +17,6 @@ #include "Common/Config/Config.h" #include "Common/EnumMap.h" #include "Common/FileUtil.h" -#include "Common/IniFile.h" #include "Common/Logging/Log.h" #include "Core/CommonTitles.h" #include "Core/Config/MainSettings.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp index 0c336073002..2d3d66feabd 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp @@ -10,11 +10,8 @@ #include #include "AudioCommon/CubebUtils.h" -#include "Common/Common.h" #include "Common/CommonTypes.h" -#include "Common/Event.h" #include "Common/Logging/Log.h" -#include "Common/ScopeGuard.h" #include "Core/CoreTiming.h" #include "Core/HW/EXI/EXI.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp index 9d8bae9d2ee..528fbbb4538 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp @@ -3,20 +3,14 @@ #include "Core/HW/EXI/EXI_DeviceModem.h" -#include - #include #include #include -#include #include -#include "Common/BitUtils.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/Network.h" -#include "Common/StringUtil.h" #include "Core/Config/MainSettings.h" #include "Core/CoreTiming.h" #include "Core/HW/EXI/EXI.h" diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceModem.h b/Source/Core/Core/HW/EXI/EXI_DeviceModem.h index 5c2cd0b4a37..b6e79c54cf2 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceModem.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceModem.h @@ -4,11 +4,7 @@ #pragma once #include -#include -#include -#include "Common/Flag.h" -#include "Common/Network.h" #include "Core/HW/EXI/BBA/TAPServerConnection.h" #include "Core/HW/EXI/EXI_Device.h" diff --git a/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp b/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp index 5723146b24e..b38104ed186 100644 --- a/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp +++ b/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp @@ -3,8 +3,6 @@ #include "Core/HW/EXI/EXI_DeviceModem.h" -#include "Common/Logging/Log.h" - namespace ExpansionInterface { diff --git a/Source/Core/Core/HW/GBAPadEmu.cpp b/Source/Core/Core/HW/GBAPadEmu.cpp index 8c1b9ec8d76..e61a3dbb114 100644 --- a/Source/Core/Core/HW/GBAPadEmu.cpp +++ b/Source/Core/Core/HW/GBAPadEmu.cpp @@ -7,7 +7,6 @@ #include "Core/HW/GBAPad.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/GCPadStatus.h" diff --git a/Source/Core/Core/HW/GCKeyboard.cpp b/Source/Core/Core/HW/GCKeyboard.cpp index e677e1d6db6..79fd5279492 100644 --- a/Source/Core/Core/HW/GCKeyboard.cpp +++ b/Source/Core/Core/HW/GCKeyboard.cpp @@ -3,15 +3,11 @@ #include "Core/HW/GCKeyboard.h" -#include - #include "Common/Common.h" -#include "Common/CommonTypes.h" #include "Core/HW/GCKeyboardEmu.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" -#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/InputConfig.h" #include "InputCommon/KeyboardStatus.h" diff --git a/Source/Core/Core/HW/GCKeyboardEmu.cpp b/Source/Core/Core/HW/GCKeyboardEmu.cpp index 0146b942ab9..ba022fb6f96 100644 --- a/Source/Core/Core/HW/GCKeyboardEmu.cpp +++ b/Source/Core/Core/HW/GCKeyboardEmu.cpp @@ -8,7 +8,6 @@ #include "Core/HW/GCKeyboard.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp index 21f3059658b..69a31eb7443 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp @@ -11,8 +11,6 @@ #include "Common/Assert.h" #include "Common/BitUtils.h" #include "Common/ColorUtil.h" -#include "Common/CommonFuncs.h" -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/IOFile.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp index d8a2202b165..549cda4dc02 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp @@ -13,7 +13,6 @@ #include #include "Common/ChunkFile.h" -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IOFile.h" diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp index 15b5f8b6daf..188882c58af 100644 --- a/Source/Core/Core/HW/GCPad.cpp +++ b/Source/Core/Core/HW/GCPad.cpp @@ -3,12 +3,9 @@ #include "Core/HW/GCPad.h" -#include - #include "Common/Common.h" #include "Core/HW/GCPadEmu.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" -#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/GCPadStatus.h" #include "InputCommon/InputConfig.h" diff --git a/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp b/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp index 669f8571242..3527ecc7784 100644 --- a/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp +++ b/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp @@ -3,8 +3,6 @@ #include "Core/HW/HSP/HSP_DeviceNull.h" -#include - #include "Core/HW/HSP/HSP.h" namespace HSP diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp index 524feab884d..72b8233a886 100644 --- a/Source/Core/Core/HW/HW.cpp +++ b/Source/Core/Core/HW/HW.cpp @@ -4,7 +4,6 @@ #include "Core/HW/HW.h" #include "Common/ChunkFile.h" -#include "Common/CommonTypes.h" #include "Core/Config/MainSettings.h" #include "Core/Core.h" diff --git a/Source/Core/Core/HW/MemoryInterface.cpp b/Source/Core/Core/HW/MemoryInterface.cpp index 4841b083b4c..27f01772875 100644 --- a/Source/Core/Core/HW/MemoryInterface.cpp +++ b/Source/Core/Core/HW/MemoryInterface.cpp @@ -7,7 +7,6 @@ #include #include -#include "Common/BitField.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp index d805d2fa0e4..7b999ac0de5 100644 --- a/Source/Core/Core/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/HW/ProcessorInterface.cpp @@ -3,7 +3,6 @@ #include "Core/HW/ProcessorInterface.h" -#include #include #include "Common/Assert.h" diff --git a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp index f9be6953a91..ef8b9080268 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp @@ -10,12 +10,9 @@ #include #include -#include - #include "Common/CommonTypes.h" #include "Common/Flag.h" #include "Common/Logging/Log.h" -#include "Common/Swap.h" #include "Common/Thread.h" #include "Core/CoreTiming.h" #include "Core/HW/SI/SI_Device.h" diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp index 2cf31c0a33a..1f7a7b631b7 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp @@ -3,13 +3,10 @@ #include "Core/HW/SI/SI_DeviceGCController.h" -#include - #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/Swap.h" #include "Core/Config/MainSettings.h" #include "Core/CoreTiming.h" #include "Core/HW/GCPad.h" diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp index 3c9281a2bed..70cd90c2058 100644 --- a/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp @@ -4,12 +4,9 @@ #include "Core/HW/SI/SI_DeviceGCSteeringWheel.h" #include -#include -#include #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/Swap.h" #include "Core/HW/GCPad.h" namespace SerialInterface diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index c318ca08d41..2b89d22d161 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -44,10 +44,6 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule: #include "Core/HW/SystemTimers.h" -#include -#include -#include - #include "AudioCommon/Mixer.h" #include "Common/CommonTypes.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/HW/WiiSave.cpp b/Source/Core/Core/HW/WiiSave.cpp index b636fb0b2cf..051a0a89361 100644 --- a/Source/Core/Core/HW/WiiSave.cpp +++ b/Source/Core/Core/HW/WiiSave.cpp @@ -30,7 +30,6 @@ #include "Common/Lazy.h" #include "Common/Logging/Log.h" #include "Common/NandPaths.h" -#include "Common/StringUtil.h" #include "Common/Swap.h" #include "Core/CommonTitles.h" #include "Core/HW/WiiSaveStructs.h" diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp index b8c138091e8..63e2cbf4d22 100644 --- a/Source/Core/Core/HW/Wiimote.cpp +++ b/Source/Core/Core/HW/Wiimote.cpp @@ -18,7 +18,6 @@ #include "Core/IOS/USB/Bluetooth/BTEmu.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" #include "Core/Movie.h" -#include "Core/NetPlayClient.h" #include "Core/System.h" #include "Core/WiiUtils.h" diff --git a/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp b/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp index 9bac2e93485..5d53506e56b 100644 --- a/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp +++ b/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp @@ -5,7 +5,6 @@ #include "Common/Assert.h" #include "Common/BitUtils.h" -#include "Common/MathUtil.h" namespace WiimoteCommon { diff --git a/Source/Core/Core/HW/WiimoteEmu/Camera.cpp b/Source/Core/Core/HW/WiimoteEmu/Camera.cpp index 1dcdb779520..c42afb2119a 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Camera.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Camera.cpp @@ -11,8 +11,6 @@ #include "Common/MathUtil.h" #include "Common/Matrix.h" -#include "Core/HW/WiimoteCommon/WiimoteReport.h" - namespace WiimoteEmu { void CameraLogic::Reset() diff --git a/Source/Core/Core/HW/WiimoteEmu/Camera.h b/Source/Core/Core/HW/WiimoteEmu/Camera.h index 23e21cc84e4..5f020343586 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Camera.h +++ b/Source/Core/Core/HW/WiimoteEmu/Camera.h @@ -5,9 +5,8 @@ #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Core/HW/WiimoteEmu/Dynamics.h" +#include "Common/Matrix.h" #include "Core/HW/WiimoteEmu/I2CBus.h" -#include "InputCommon/ControllerEmu/ControlGroup/Cursor.h" namespace Common { diff --git a/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp b/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp index c4095e6c44b..ebf24f735c0 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp @@ -10,7 +10,6 @@ #include "Common/MathUtil.h" #include "Core/Config/SYSCONFSettings.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/Cursor.h" #include "InputCommon/ControllerEmu/ControlGroup/Force.h" #include "InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Dynamics.h b/Source/Core/Core/HW/WiimoteEmu/Dynamics.h index 08b3cbda9a0..8f35c306da2 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Dynamics.h +++ b/Source/Core/Core/HW/WiimoteEmu/Dynamics.h @@ -3,19 +3,15 @@ #pragma once -#include - #include "Common/MathUtil.h" #include "Common/Matrix.h" -#include "Core/HW/WiimoteCommon/DataReport.h" -#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" +#include "Core/HW/WiimoteCommon/WiimoteReport.h" #include "InputCommon/ControllerEmu/ControlGroup/Cursor.h" #include "InputCommon/ControllerEmu/ControlGroup/Force.h" #include "InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h" #include "InputCommon/ControllerEmu/ControlGroup/IMUCursor.h" #include "InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h" #include "InputCommon/ControllerEmu/ControlGroup/Tilt.h" -#include "InputCommon/ControllerEmu/ControllerEmu.h" namespace WiimoteEmu { diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index 6f1ad61e50d..22fbe7d2347 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -3,7 +3,6 @@ #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include #include #include @@ -16,6 +15,7 @@ #include "Core/Core.h" #include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteCommon/DataReport.h" #include "Core/HW/WiimoteCommon/WiimoteHid.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp index f990ce334a0..90a9965aa34 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp @@ -3,8 +3,6 @@ #include "Core/HW/WiimoteEmu/Extension/Extension.h" -#include - #include "Common/CommonTypes.h" #include "Core/HW/Wiimote.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp index 27e9e931963..0a1abf38449 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp @@ -4,7 +4,6 @@ #include "Core/HW/WiimoteEmu/Extension/Guitar.h" #include -#include #include #include "Common/Assert.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp index b4cf363b79f..67456021af2 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp @@ -4,7 +4,6 @@ #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h" #include -#include #include "Common/Assert.h" #include "Common/Common.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp index 1efe6829a6f..49aba90ea3d 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp @@ -4,7 +4,6 @@ #include "Core/HW/WiimoteEmu/Extension/TaTaCon.h" #include -#include #include "Common/Assert.h" #include "Common/Common.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp index 64a292ced3a..852179fef00 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp @@ -4,7 +4,6 @@ #include "Core/HW/WiimoteEmu/Extension/Turntable.h" #include -#include #include "Common/Assert.h" #include "Common/Common.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp index 49ecd041803..10dd776f343 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp @@ -6,14 +6,12 @@ #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/Triggers.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp b/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp index 97e73ea4bc9..b039aa51fe2 100644 --- a/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp @@ -3,8 +3,6 @@ #include "Core/HW/WiimoteEmu/ExtensionPort.h" -#include "Common/ChunkFile.h" - namespace WiimoteEmu { ExtensionPort::ExtensionPort(I2CBus* i2c_bus) : m_i2c_bus(*i2c_bus) diff --git a/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp b/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp index 1c231f79444..9a96673d32a 100644 --- a/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp @@ -3,8 +3,6 @@ #include "Core/HW/WiimoteEmu/I2CBus.h" -#include - namespace WiimoteEmu { void I2CBus::AddSlave(I2CSlave* slave) diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index 98f52a09f14..7fc81f63216 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -4,6 +4,7 @@ #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include +#include #include #include #include @@ -22,6 +23,7 @@ #include "Core/Core.h" #include "Core/HW/Wiimote.h" +#include "Core/HW/WiimoteCommon/DataReport.h" #include "Core/HW/WiimoteCommon/WiimoteConstants.h" #include "Core/HW/WiimoteCommon/WiimoteHid.h" #include "Core/HW/WiimoteEmu/DesiredWiimoteState.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 94da0a563c7..1e07e2abca4 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -11,11 +11,11 @@ #include "Common/Common.h" #include "Common/Config/Config.h" +#include "Core/HW/WiimoteCommon/WiimoteHid.h" #include "Core/HW/WiimoteCommon/WiimoteReport.h" #include "Core/HW/WiimoteEmu/Camera.h" #include "Core/HW/WiimoteEmu/Dynamics.h" -#include "Core/HW/WiimoteEmu/Encryption.h" #include "Core/HW/WiimoteEmu/ExtensionPort.h" #include "Core/HW/WiimoteEmu/I2CBus.h" #include "Core/HW/WiimoteEmu/MotionPlus.h" diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp index 7f992af360e..c37aa42fc99 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp @@ -11,10 +11,8 @@ #include #include -#include #include #include -#include #include diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 8a115bb6e26..92c6f2b831b 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -14,14 +14,10 @@ #include "Common/Assert.h" #include "Common/Common.h" #include "Common/CommonTypes.h" -#include "Common/FileUtil.h" -#include "Common/IniFile.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/GCPadStatus.h" // clang-format off constexpr std::array s_hotkey_labels{{ diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index cdcc149309f..7fb4fb77ac8 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -12,7 +12,6 @@ namespace ControllerEmu { -class ControllerEmu; class Buttons; } // namespace ControllerEmu diff --git a/Source/Core/Core/IOS/Crypto/AesDevice.cpp b/Source/Core/Core/IOS/Crypto/AesDevice.cpp index caf78798258..4d88b11a58c 100644 --- a/Source/Core/Core/IOS/Crypto/AesDevice.cpp +++ b/Source/Core/Core/IOS/Crypto/AesDevice.cpp @@ -5,13 +5,10 @@ #include #include -#include #include #include #include -#include "Common/Assert.h" -#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Crypto/AES.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/IOS/Crypto/Sha.cpp b/Source/Core/Core/IOS/Crypto/Sha.cpp index a39927157ca..0395be0d2df 100644 --- a/Source/Core/Core/IOS/Crypto/Sha.cpp +++ b/Source/Core/Core/IOS/Crypto/Sha.cpp @@ -6,14 +6,11 @@ #include #include #include -#include #include #include #include -#include "Common/Assert.h" -#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Core/HW/MMIO.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/IOS/DI/DI.cpp b/Source/Core/Core/IOS/DI/DI.cpp index 6f4ea1f8e66..4a32c443249 100644 --- a/Source/Core/Core/IOS/DI/DI.cpp +++ b/Source/Core/Core/IOS/DI/DI.cpp @@ -6,7 +6,6 @@ #include #include -#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/IOS/Device.cpp b/Source/Core/Core/IOS/Device.cpp index bf75bff1b51..933d7a2081b 100644 --- a/Source/Core/Core/IOS/Device.cpp +++ b/Source/Core/Core/IOS/Device.cpp @@ -6,7 +6,6 @@ #include #include -#include "Common/Assert.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/IOS/DeviceStub.h b/Source/Core/Core/IOS/DeviceStub.h index ba065af5335..6e65e03ef91 100644 --- a/Source/Core/Core/IOS/DeviceStub.h +++ b/Source/Core/Core/IOS/DeviceStub.h @@ -3,9 +3,6 @@ #pragma once -#include - -#include "Common/CommonTypes.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" diff --git a/Source/Core/Core/IOS/DolphinDevice.cpp b/Source/Core/Core/IOS/DolphinDevice.cpp index c240b922b72..42e0dcad86f 100644 --- a/Source/Core/Core/IOS/DolphinDevice.cpp +++ b/Source/Core/Core/IOS/DolphinDevice.cpp @@ -9,8 +9,6 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/IOFile.h" -#include "Common/Logging/Log.h" -#include "Common/NandPaths.h" #include "Common/SettingsHandler.h" #include "Common/Timer.h" #include "Common/Version.h" diff --git a/Source/Core/Core/IOS/ES/Formats.cpp b/Source/Core/Core/IOS/ES/Formats.cpp index 29f68adcf69..93d4e6606e3 100644 --- a/Source/Core/Core/IOS/ES/Formats.cpp +++ b/Source/Core/Core/IOS/ES/Formats.cpp @@ -21,7 +21,6 @@ #include "Common/CommonTypes.h" #include "Common/Crypto/SHA1.h" #include "Common/Logging/Log.h" -#include "Common/NandPaths.h" #include "Common/Projection.h" #include "Common/StringUtil.h" #include "Common/Swap.h" diff --git a/Source/Core/Core/IOS/ES/NandUtils.cpp b/Source/Core/Core/IOS/ES/NandUtils.cpp index de05ec0a361..ee26f37e145 100644 --- a/Source/Core/Core/IOS/ES/NandUtils.cpp +++ b/Source/Core/Core/IOS/ES/NandUtils.cpp @@ -5,8 +5,6 @@ #include #include -#include -#include #include #include #include @@ -17,7 +15,6 @@ #include "Common/Crypto/SHA1.h" #include "Common/Logging/Log.h" #include "Common/NandPaths.h" -#include "Common/ScopeGuard.h" #include "Common/StringUtil.h" #include "Core/IOS/ES/Formats.h" #include "Core/IOS/FS/FileSystemProxy.h" diff --git a/Source/Core/Core/IOS/ES/TitleInformation.cpp b/Source/Core/Core/IOS/ES/TitleInformation.cpp index 368325295bc..4e312505f78 100644 --- a/Source/Core/Core/IOS/ES/TitleInformation.cpp +++ b/Source/Core/Core/IOS/ES/TitleInformation.cpp @@ -4,7 +4,6 @@ #include "Core/IOS/ES/ES.h" #include -#include #include #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/IOS/ES/Views.cpp b/Source/Core/Core/IOS/ES/Views.cpp index 988e19d86c9..bcb2be8634a 100644 --- a/Source/Core/Core/IOS/ES/Views.cpp +++ b/Source/Core/Core/IOS/ES/Views.cpp @@ -9,7 +9,6 @@ #include #include "Common/Logging/Log.h" -#include "Common/NandPaths.h" #include "Core/CommonTitles.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/IOS/IOS.cpp b/Source/Core/Core/IOS/IOS.cpp index 70e63ace228..d3986775b67 100644 --- a/Source/Core/Core/IOS/IOS.cpp +++ b/Source/Core/Core/IOS/IOS.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/Source/Core/Core/IOS/IOS.h b/Source/Core/Core/IOS/IOS.h index de67d539809..a79c1bdf518 100644 --- a/Source/Core/Core/IOS/IOS.h +++ b/Source/Core/Core/IOS/IOS.h @@ -10,7 +10,6 @@ #include #include #include -#include #include "Common/CommonTypes.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/Core/IOS/MIOS.cpp b/Source/Core/Core/IOS/MIOS.cpp index 56c27c6a789..4cf5b60c3d0 100644 --- a/Source/Core/Core/IOS/MIOS.cpp +++ b/Source/Core/Core/IOS/MIOS.cpp @@ -4,14 +4,11 @@ #include "Core/IOS/MIOS.h" #include -#include #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" -#include "Common/Swap.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/IOS/Network/IP/Top.cpp b/Source/Core/Core/IOS/Network/IP/Top.cpp index 42f17c4ada2..e9677d5ef9b 100644 --- a/Source/Core/Core/IOS/Network/IP/Top.cpp +++ b/Source/Core/Core/IOS/Network/IP/Top.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -21,12 +20,10 @@ #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/Network.h" #include "Common/ScopeGuard.h" -#include "Common/StringUtil.h" #include "Core/Core.h" #include "Core/HW/Memmap.h" @@ -49,7 +46,6 @@ #include #include #include -#include #include #endif diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h index ee3fe047fcf..99d899f8e35 100644 --- a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h +++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h @@ -10,8 +10,6 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/Logging/Log.h" -#include "Common/Swap.h" #include "Core/IOS/Network/KD/NWC24Config.h" namespace IOS::HLE diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h index d839b2b1027..d6de3b70250 100644 --- a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h +++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h @@ -12,8 +12,6 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/Logging/Log.h" -#include "Common/Swap.h" #include "Core/IOS/Network/KD/Mail/MailCommon.h" #include "Core/IOS/Network/KD/Mail/WC24FriendList.h" #include "Core/IOS/Network/KD/NWC24Config.h" diff --git a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp index d0d49fef9b4..97edbbcef93 100644 --- a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp +++ b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp @@ -13,7 +13,6 @@ #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Crypto/HMAC.h" -#include "Common/FileUtil.h" #include "Common/Logging/Log.h" #include "Common/NandPaths.h" #include "Common/Projection.h" diff --git a/Source/Core/Core/IOS/Network/KD/NetKDRequest.h b/Source/Core/Core/IOS/Network/KD/NetKDRequest.h index 9ae50fa81f8..e41b554d5d8 100644 --- a/Source/Core/Core/IOS/Network/KD/NetKDRequest.h +++ b/Source/Core/Core/IOS/Network/KD/NetKDRequest.h @@ -8,7 +8,6 @@ #include #include -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Event.h" #include "Common/HttpRequest.h" diff --git a/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp b/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp index 530d9adb298..702aaddae01 100644 --- a/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp +++ b/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp @@ -4,13 +4,10 @@ #include "Core/IOS/Network/KD/VFF/VFFUtil.h" #include -#include #include #include #include -#include - // Does not compile if diskio.h is included first. // clang-format off #include "ff.h" diff --git a/Source/Core/Core/IOS/Network/MACUtils.cpp b/Source/Core/Core/IOS/Network/MACUtils.cpp index d9db1a8c842..2ab6445e3fc 100644 --- a/Source/Core/Core/IOS/Network/MACUtils.cpp +++ b/Source/Core/Core/IOS/Network/MACUtils.cpp @@ -6,7 +6,6 @@ #include #include -#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/Network.h" diff --git a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp index 22ad09d01df..ca294e6d739 100644 --- a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp +++ b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp @@ -5,7 +5,6 @@ #include -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h index 20dc11430ce..ae5245ee85b 100644 --- a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h +++ b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h @@ -3,7 +3,6 @@ #pragma once -#include #include "Common/CommonTypes.h" namespace Memory diff --git a/Source/Core/Core/IOS/Network/SSL.cpp b/Source/Core/Core/IOS/Network/SSL.cpp index 36caab63057..d3146084d79 100644 --- a/Source/Core/Core/IOS/Network/SSL.cpp +++ b/Source/Core/Core/IOS/Network/SSL.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/Source/Core/Core/IOS/Network/Socket.cpp b/Source/Core/Core/IOS/Network/Socket.cpp index 46ee116311f..b2f72945e39 100644 --- a/Source/Core/Core/IOS/Network/Socket.cpp +++ b/Source/Core/Core/IOS/Network/Socket.cpp @@ -16,7 +16,6 @@ #include #endif -#include "Common/BitUtils.h" #include "Common/FileUtil.h" #include "Common/IOFile.h" #include "Common/Network.h" diff --git a/Source/Core/Core/IOS/Network/Socket.h b/Source/Core/Core/IOS/Network/Socket.h index d339c0282ab..a529f28e144 100644 --- a/Source/Core/Core/IOS/Network/Socket.h +++ b/Source/Core/Core/IOS/Network/Socket.h @@ -26,27 +26,21 @@ typedef pollfd pollfd_t; #else #include #endif -#include #include #include #include -#include typedef struct pollfd pollfd_t; #else -#include #include #include #include #include #endif -#include #include -#include #include #include -#include #include #include #include diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp index 6047c880881..fc61db694ce 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp @@ -4,7 +4,6 @@ #include "Core/IOS/SDIO/SDIOSlot0.h" #include -#include #include #include @@ -17,7 +16,6 @@ #include "Core/CPUThreadConfigCallback.h" #include "Core/Config/MainSettings.h" -#include "Core/Config/SessionSettings.h" #include "Core/Core.h" #include "Core/HW/Memmap.h" #include "Core/IOS/IOS.h" diff --git a/Source/Core/Core/IOS/STM/STM.h b/Source/Core/Core/IOS/STM/STM.h index f249c66d95f..a0daad9b866 100644 --- a/Source/Core/Core/IOS/STM/STM.h +++ b/Source/Core/Core/IOS/STM/STM.h @@ -3,8 +3,6 @@ #pragma once -#include - #include "Common/CommonTypes.h" #include "Core/IOS/Device.h" #include "Core/IOS/IOS.h" diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp index 79cfe6a4b7e..51151b739a7 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp @@ -3,7 +3,6 @@ #include "Core/IOS/USB/Bluetooth/BTBase.h" -#include #include #include diff --git a/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp b/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp index 5c0d1477924..cb8bd3e38e1 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include "Common/BitUtils.h" diff --git a/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp b/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp index 255cef65ee1..30bcad24d99 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp @@ -10,8 +10,6 @@ #include -#include - #include "Common/BitUtils.h" #include "Common/FileUtil.h" #include "Common/HttpRequest.h" diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp index 8b556da6d70..069cd0dc9cc 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp @@ -4,9 +4,7 @@ #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" #include -#include #include -#include #include @@ -15,7 +13,6 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Common/Swap.h" #include "Core/Core.h" #include "Core/HW/WII_IPC.h" diff --git a/Source/Core/Core/IOS/USB/Common.h b/Source/Core/Core/IOS/USB/Common.h index ae9d753c74c..84d0b312587 100644 --- a/Source/Core/Core/IOS/USB/Common.h +++ b/Source/Core/Core/IOS/USB/Common.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include #include diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp index 45863864042..442c0ef59df 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -15,7 +14,6 @@ #include "Common/Logging/Log.h" #include "Common/Random.h" #include "Common/StringUtil.h" -#include "Common/Timer.h" #include "Core/Core.h" #include "Core/HW/Memmap.h" #include "Core/System.h" diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.h b/Source/Core/Core/IOS/USB/Emulated/Infinity.h index ebf9dd7894c..7ec67035fad 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Infinity.h +++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include #include diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp index 77fb56cd13a..14017eecb5c 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp @@ -9,12 +9,8 @@ #include "AudioCommon/AudioCommon.h" #include "Common/Logging/Log.h" -#include "Common/Random.h" -#include "Common/StringUtil.h" -#include "Common/Timer.h" #include "Core/Core.h" #include "Core/HW/Memmap.h" -#include "Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.h" #include "Core/System.h" namespace IOS::HLE::USB diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp index 3361498b805..904b31553eb 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp @@ -5,7 +5,6 @@ #include #include -#include #include "Common/BitUtils.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp index 9bfa31c9280..60edb515ed7 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp @@ -3,7 +3,6 @@ #include "Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.h" -#include #include #include #include diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.cpp b/Source/Core/Core/IOS/USB/LibusbDevice.cpp index adc23515557..9df0c90cd78 100644 --- a/Source/Core/Core/IOS/USB/LibusbDevice.cpp +++ b/Source/Core/Core/IOS/USB/LibusbDevice.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -19,7 +18,6 @@ #include "Common/Assert.h" #include "Common/Config/Config.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "Core/Config/MainSettings.h" #include "Core/HW/Memmap.h" #include "Core/IOS/Device.h" diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.h b/Source/Core/Core/IOS/USB/LibusbDevice.h index 1e0207b9de3..e36175493c6 100644 --- a/Source/Core/Core/IOS/USB/LibusbDevice.h +++ b/Source/Core/Core/IOS/USB/LibusbDevice.h @@ -4,7 +4,6 @@ #pragma once #if defined(__LIBUSB__) -#include #include #include #include diff --git a/Source/Core/Core/IOS/USB/OH0/OH0.cpp b/Source/Core/Core/IOS/USB/OH0/OH0.cpp index f1b500fc091..0b6051499b2 100644 --- a/Source/Core/Core/IOS/USB/OH0/OH0.cpp +++ b/Source/Core/Core/IOS/USB/OH0/OH0.cpp @@ -4,10 +4,6 @@ #include "Core/IOS/USB/OH0/OH0.h" #include -#include -#include -#include -#include #include #include "Common/ChunkFile.h" diff --git a/Source/Core/Core/IOS/USB/OH0/OH0.h b/Source/Core/Core/IOS/USB/OH0/OH0.h index 19f501a1fc1..d002c79d122 100644 --- a/Source/Core/Core/IOS/USB/OH0/OH0.h +++ b/Source/Core/Core/IOS/USB/OH0/OH0.h @@ -9,7 +9,6 @@ #include #include #include -#include #include "Common/CommonTypes.h" #include "Core/IOS/Device.h" diff --git a/Source/Core/Core/IOS/USB/USBV0.h b/Source/Core/Core/IOS/USB/USBV0.h index 089969a74e1..8f57ce83ed2 100644 --- a/Source/Core/Core/IOS/USB/USBV0.h +++ b/Source/Core/Core/IOS/USB/USBV0.h @@ -3,7 +3,6 @@ #pragma once -#include "Common/CommonTypes.h" #include "Core/IOS/USB/Common.h" // Used by early USB interfaces, such as /dev/usb/oh0 (except in IOS57, 58, 59) and /dev/usb/oh1. diff --git a/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp b/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp index 930fda33b7c..3150dbad0f4 100644 --- a/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp +++ b/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp @@ -4,7 +4,6 @@ #include "Core/IOS/USB/USB_HID/HIDv5.h" #include -#include #include #include diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp index f9e7eef64d3..f66aca2e0ea 100644 --- a/Source/Core/Core/MemTools.cpp +++ b/Source/Core/Core/MemTools.cpp @@ -3,16 +3,10 @@ #include "Core/MemTools.h" -#include #include -#include -#include -#include "Common/Assert.h" #include "Common/CommonFuncs.h" -#include "Common/CommonTypes.h" #include "Common/MsgHandler.h" -#include "Common/Thread.h" #include "Core/MachineContext.h" #include "Core/PowerPC/JitInterface.h" @@ -25,6 +19,13 @@ #include // Needed for _POSIX_VERSION #endif +#ifdef _WIN32 +#include "Common/Assert.h" +#endif +#if defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE) +#include "Common/Thread.h" +#endif + #if defined(__APPLE__) #ifdef _M_X86_64 #define THREAD_STATE64_COUNT x86_THREAD_STATE64_COUNT diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp index 770906b7e11..0a89450eb04 100644 --- a/Source/Core/Core/MemoryWatcher.cpp +++ b/Source/Core/Core/MemoryWatcher.cpp @@ -10,7 +10,6 @@ #include #include "Common/FileUtil.h" -#include "Core/HW/SystemTimers.h" #include "Core/PowerPC/MMU.h" MemoryWatcher::MemoryWatcher() diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index c62130e18c9..deaa8088b88 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -5,11 +5,9 @@ #include #include -#include #include #include #include -#include #include #include #include diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index e842ec9d7b7..02329df0306 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include #include diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 3f4344ad881..cb6ad2293e8 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -31,7 +30,6 @@ #include "Common/NandPaths.h" #include "Common/QoSSession.h" #include "Common/SFMLHelper.h" -#include "Common/StringUtil.h" #include "Common/Timer.h" #include "Common/Version.h" @@ -58,26 +56,20 @@ #include "Core/HW/Sram.h" #include "Core/HW/WiiSave.h" #include "Core/HW/WiiSaveStructs.h" +#include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/DesiredWiimoteState.h" -#include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/IOS/FS/FileSystem.h" #include "Core/IOS/FS/HostBackend/FS.h" -#include "Core/IOS/USB/Bluetooth/BTEmu.h" #include "Core/IOS/Uids.h" #include "Core/Movie.h" #include "Core/NetPlayCommon.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/SyncIdentifier.h" #include "Core/System.h" #include "DiscIO/Blob.h" -#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h" #include "InputCommon/GCAdapter.h" -#include "InputCommon/InputConfig.h" #include "UICommon/GameFile.h" #include "VideoCommon/OnScreenDisplay.h" -#include "VideoCommon/VideoConfig.h" namespace NetPlay { diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index d085a7cf2e7..d7df4e279a3 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -5,7 +5,6 @@ #include #include -#include #include "Common/CommonTypes.h" #include "Common/EnumMap.h" diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 006f699c08a..d26cc399c14 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -73,7 +73,6 @@ #if !defined(_WIN32) #include -#include #ifdef __HAIKU__ #define _BSD_SOURCE #include diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h index 168a2730745..ebd2669ed50 100644 --- a/Source/Core/Core/NetPlayServer.h +++ b/Source/Core/Core/NetPlayServer.h @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/Source/Core/Core/NetworkCaptureLogger.cpp b/Source/Core/Core/NetworkCaptureLogger.cpp index b6706fc59f9..5c8b77dd11b 100644 --- a/Source/Core/Core/NetworkCaptureLogger.cpp +++ b/Source/Core/Core/NetworkCaptureLogger.cpp @@ -4,9 +4,7 @@ #include "Core/NetworkCaptureLogger.h" #include -#include #include -#include #include #include diff --git a/Source/Core/Core/NetworkCaptureLogger.h b/Source/Core/Core/NetworkCaptureLogger.h index 3cdece97dca..27489ec089c 100644 --- a/Source/Core/Core/NetworkCaptureLogger.h +++ b/Source/Core/Core/NetworkCaptureLogger.h @@ -3,7 +3,6 @@ #pragma once -#include #include #include #include diff --git a/Source/Core/Core/PowerPC/BreakPoints.cpp b/Source/Core/Core/PowerPC/BreakPoints.cpp index c806c906ff3..3cf564663ec 100644 --- a/Source/Core/Core/PowerPC/BreakPoints.cpp +++ b/Source/Core/Core/PowerPC/BreakPoints.cpp @@ -18,7 +18,7 @@ #include "Core/PowerPC/Expression.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/MMU.h" -#include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/System.h" BreakPoints::BreakPoints(Core::System& system) : m_system(system) diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp index e8cde761d8a..3ec24a30162 100644 --- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp +++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp index ffd10425940..08fb70e6837 100644 --- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp +++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp @@ -7,7 +7,6 @@ #include #include "Common/Assert.h" -#include "Common/MsgHandler.h" void CachedInterpreterEmitter::Write(AnyCallback callback, const void* operands, std::size_t size) { diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp index bc62f9204cc..665329729eb 100644 --- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp +++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include "Core/HLE/HLE.h" diff --git a/Source/Core/Core/PowerPC/Expression.cpp b/Source/Core/Core/PowerPC/Expression.cpp index dd477a5f430..7b1669ed2d2 100644 --- a/Source/Core/Core/PowerPC/Expression.cpp +++ b/Source/Core/Core/PowerPC/Expression.cpp @@ -5,8 +5,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp index fb5a9a99c11..ecf3ff09da0 100644 --- a/Source/Core/Core/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/PowerPC/GDBStub.cpp @@ -7,9 +7,6 @@ #include #include -#include -#include -#include #include #ifdef _WIN32 #include @@ -26,10 +23,8 @@ typedef SSIZE_T ssize_t; #endif #include "Common/Assert.h" -#include "Common/Event.h" #include "Common/Logging/Log.h" #include "Common/SocketContext.h" -#include "Common/StringUtil.h" #include "Core/Core.h" #include "Core/HW/CPU.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index d38ba08809a..5ff6fa08cb2 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -12,15 +12,12 @@ #include "Common/CommonTypes.h" #include "Common/GekkoDisassembler.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "Core/Config/MainSettings.h" #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HLE/HLE.h" #include "Core/HW/CPU.h" -#include "Core/Host.h" -#include "Core/PowerPC/GDBStub.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PPCTables.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index 9af5767df64..641a2330b9b 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -4,7 +4,6 @@ #include "Core/PowerPC/Interpreter/Interpreter.h" #include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp index f1fef874fd5..975f4080686 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp @@ -5,7 +5,6 @@ #include -#include "Common/BitUtils.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp index 990656f5d91..df195de6833 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp @@ -11,7 +11,6 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/MathUtil.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/MMU.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp index 85d919195bc..0e0a0eec066 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp @@ -5,7 +5,6 @@ #include -#include "Common/CommonTypes.h" #include "Common/FloatUtils.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 484be2bb286..0a7341501a6 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -22,7 +22,6 @@ #include "Common/HostDisassembler.h" #include "Common/IOFile.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "Common/Swap.h" #include "Common/x64ABI.h" #include "Core/Core.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index a14bc1dace0..fde8691b481 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -22,7 +22,6 @@ #include #include "Common/CommonTypes.h" -#include "Common/x64ABI.h" #include "Common/x64Emitter.h" #include "Core/PowerPC/Jit64/JitAsm.h" #include "Core/PowerPC/Jit64/RegCache/FPURegCache.h" diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp index b7735595125..7594d0e90e3 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp @@ -16,7 +16,6 @@ #include "Core/HW/Memmap.h" #include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/System.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp index bd611e2c7b5..81e7ad8a091 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp @@ -6,7 +6,6 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" -#include "Core/CoreTiming.h" #include "Core/Debugger/BranchWatch.h" #include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index 4cffa573c70..86f9e491787 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -3,7 +3,6 @@ #include "Core/PowerPC/Jit64/Jit.h" -#include #include #include #include @@ -15,12 +14,9 @@ #include "Common/SmallVector.h" #include "Common/x64Emitter.h" #include "Core/Config/SessionSettings.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/PPCAnalyst.h" -#include "Core/PowerPC/PowerPC.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp index 21db558bdb0..90fd0097872 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp @@ -8,22 +8,18 @@ #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/CPUDetect.h" #include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Common/SmallVector.h" #include "Common/x64Emitter.h" -#include "Core/CoreTiming.h" #include "Core/PowerPC/ConditionRegister.h" #include "Core/PowerPC/Interpreter/ExceptionUtils.h" -#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/JitCommon/DivUtils.h" #include "Core/PowerPC/PPCAnalyst.h" -#include "Core/PowerPC/PowerPC.h" using namespace Gen; using namespace JitCommon; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 7b347a37428..4d64010838f 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -7,7 +7,7 @@ #include "Common/CommonTypes.h" #include "Common/x64Emitter.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" -#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" +#include "Core/PowerPC/Jit64Common/Jit64Constants.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp index 78b00b99f0b..8dfee9239be 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -10,7 +10,6 @@ #include "Common/x64Emitter.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" -#include "Core/PowerPC/JitCommon/JitAsmCommon.h" #include "Core/PowerPC/PowerPC.h" using namespace Gen; diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp index 8e44eb78b40..2e1b05cb427 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp @@ -5,8 +5,6 @@ #include -#include "Common/CPUDetect.h" -#include "Common/CommonTypes.h" #include "Common/MsgHandler.h" #include "Common/x64Emitter.h" #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h" diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp index 3359a2a977c..4de0cea6213 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp @@ -12,13 +12,11 @@ #include "Common/Assert.h" #include "Common/BitSet.h" #include "Common/CommonTypes.h" -#include "Common/MsgHandler.h" #include "Common/VariantUtil.h" #include "Common/x64Emitter.h" #include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/RegCache/CachedReg.h" #include "Core/PowerPC/Jit64/RegCache/RCMode.h" -#include "Core/PowerPC/PowerPC.h" using namespace Gen; using namespace PowerPC; diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h index 4d74285a513..41bdeb08c3f 100644 --- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h @@ -11,7 +11,6 @@ #include "Common/x64Emitter.h" #include "Core/PowerPC/Jit64/RegCache/CachedReg.h" -#include "Core/PowerPC/PPCAnalyst.h" class Jit64; enum class RCMode; diff --git a/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp b/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp index 8aaa164f43b..519936aa644 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp @@ -8,6 +8,7 @@ #include #include "Common/Assert.h" +#include "Common/CommonTypes.h" ConstantPool::ConstantPool() = default; diff --git a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp index d1415c09c40..1019aa7d0a7 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp @@ -4,7 +4,6 @@ #include "Core/PowerPC/Jit64Common/EmuCodeBlock.h" #include -#include #include "Common/Assert.h" #include "Common/CPUDetect.h" diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp index 437c6c01795..4e7e6fe0762 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp @@ -14,10 +14,8 @@ #include "Common/x64ABI.h" #include "Common/x64Emitter.h" #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64Common/Jit64Constants.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" -#include "Core/PowerPC/PowerPC.h" #define QUANTIZED_REGS_TO_SAVE \ (ABI_ALL_CALLER_SAVED & ~BitSet32{RSCRATCH, RSCRATCH2, RSCRATCH_EXTRA, XMM0 + 16, XMM1 + 16}) diff --git a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp index f43535ab7d4..df16c177a23 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp @@ -3,17 +3,11 @@ #include "Core/PowerPC/Jit64Common/TrampolineCache.h" -#include - #include "Common/CommonTypes.h" #include "Common/JitRegister.h" #include "Common/MsgHandler.h" #include "Common/x64Emitter.h" -#include "Core/PowerPC/Jit64/Jit.h" -#include "Core/PowerPC/Jit64Common/Jit64Constants.h" -#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" #include "Core/PowerPC/Jit64Common/TrampolineInfo.h" -#include "Core/PowerPC/PowerPC.h" #ifdef _WIN32 #include diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index 52e62cf1fcf..fec6e5992ae 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -3,16 +3,12 @@ #include "Core/PowerPC/JitInterface.h" -#include #include #include -#include - #include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/MsgHandler.h" #include "Core/Core.h" #include "Core/PowerPC/CPUCoreBase.h" diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp index 49338af10b7..8c35ad49230 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include @@ -14,8 +13,6 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" -#include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HLE/HLE.h" diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp index 3d351f97d10..8935c5c19d8 100644 --- a/Source/Core/Core/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/PowerPC/PPCCache.cpp @@ -9,7 +9,6 @@ #include "Common/ChunkFile.h" #include "Common/Swap.h" #include "Core/Config/MainSettings.h" -#include "Core/DolphinAnalytics.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index 6673f145137..5e17d459eb2 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include @@ -17,9 +16,6 @@ #include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/Projection.h" -#include "Common/StringUtil.h" - -#include "Core/PowerPC/PowerPC.h" namespace PPCTables { diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index 59f1e3d1bf2..87a047670e4 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -6,8 +6,6 @@ #include #include #include -#include -#include #include "Common/Assert.h" #include "Common/ChunkFile.h" diff --git a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp index c67000b9bb3..eb5541c44a0 100644 --- a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp @@ -8,7 +8,6 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PPCSymbolDB.h" diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index ffd811bd6c7..2e6a7945846 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -40,7 +40,6 @@ #include "Core/HW/HW.h" #include "Core/HW/Memmap.h" #include "Core/HW/Wiimote.h" -#include "Core/Host.h" #include "Core/Movie.h" #include "Core/NetPlayProto.h" #include "Core/PowerPC/PowerPC.h" diff --git a/Source/Core/Core/SysConf.cpp b/Source/Core/Core/SysConf.cpp index d990b9f9a97..9381f274f39 100644 --- a/Source/Core/Core/SysConf.cpp +++ b/Source/Core/Core/SysConf.cpp @@ -7,10 +7,7 @@ #include #include -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/FileUtil.h" -#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/Swap.h" #include "Core/IOS/FS/FileSystem.h" diff --git a/Source/Core/Core/TitleDatabase.cpp b/Source/Core/Core/TitleDatabase.cpp index 4609cfddb10..523b8b500e9 100644 --- a/Source/Core/Core/TitleDatabase.cpp +++ b/Source/Core/Core/TitleDatabase.cpp @@ -5,11 +5,9 @@ #include #include -#include #include #include #include -#include #include @@ -17,7 +15,6 @@ #include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Core/Config/MainSettings.h" -#include "Core/IOS/ES/Formats.h" #include "DiscIO/Enums.h" namespace Core diff --git a/Source/Core/Core/USBUtils.cpp b/Source/Core/Core/USBUtils.cpp index 79b3a1958c4..29fe3f862d1 100644 --- a/Source/Core/Core/USBUtils.cpp +++ b/Source/Core/Core/USBUtils.cpp @@ -14,7 +14,6 @@ #include #include -#include #ifdef HAVE_LIBUDEV #include #endif @@ -28,6 +27,8 @@ // initguid.h must be included before usbiodef.h #include +#include + #include "Common/StringUtil.h" #include "Common/WindowsDevice.h" #endif diff --git a/Source/Core/Core/WiiRoot.cpp b/Source/Core/Core/WiiRoot.cpp index e3f0ae41850..0f3397f536a 100644 --- a/Source/Core/Core/WiiRoot.cpp +++ b/Source/Core/Core/WiiRoot.cpp @@ -18,7 +18,6 @@ #include "Common/StringUtil.h" #include "Core/Boot/Boot.h" #include "Core/CommonTitles.h" -#include "Core/Config/SessionSettings.h" #include "Core/ConfigManager.h" #include "Core/HW/WiiSave.h" #include "Core/IOS/ES/ES.h" diff --git a/Source/Core/Core/WiiUtils.h b/Source/Core/Core/WiiUtils.h index c8f86d7253c..8dbcb21faf1 100644 --- a/Source/Core/Core/WiiUtils.h +++ b/Source/Core/Core/WiiUtils.h @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 9c58b08dc5a..ed0d313963e 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -26,7 +26,6 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "DiscIO/Blob.h" -#include "DiscIO/DiscScrubber.h" #include "DiscIO/MultithreadedCompressor.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/DiscExtractor.h b/Source/Core/DiscIO/DiscExtractor.h index 50c02d42154..57a3b1830bb 100644 --- a/Source/Core/DiscIO/DiscExtractor.h +++ b/Source/Core/DiscIO/DiscExtractor.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index b6688170a89..83f140557fc 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -3,15 +3,11 @@ #include "DiscIO/DiscScrubber.h" -#include #include -#include #include -#include #include #include "Common/Align.h" -#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/DiscIO/DiscScrubber.h b/Source/Core/DiscIO/DiscScrubber.h index cf69615fdd0..2000b3060c4 100644 --- a/Source/Core/DiscIO/DiscScrubber.h +++ b/Source/Core/DiscIO/DiscScrubber.h @@ -7,8 +7,6 @@ #pragma once -#include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/DiscIO/DiscUtils.cpp b/Source/Core/DiscIO/DiscUtils.cpp index aa97304adaa..a22b97a4664 100644 --- a/Source/Core/DiscIO/DiscUtils.cpp +++ b/Source/Core/DiscIO/DiscUtils.cpp @@ -4,7 +4,6 @@ #include "DiscIO/DiscUtils.h" #include -#include #include #include #include diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp index 7a467f7c22b..e995479cfff 100644 --- a/Source/Core/DiscIO/Enums.cpp +++ b/Source/Core/DiscIO/Enums.cpp @@ -6,7 +6,6 @@ #include #include -#include "Common/Assert.h" #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 7680c47abb4..2dca65cf736 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -14,11 +13,8 @@ #include #include -#include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" -#include "Common/IOFile.h" #include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "DiscIO/DiscUtils.h" #include "DiscIO/Filesystem.h" diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h index b25f2e295ee..48b122a7072 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.h +++ b/Source/Core/DiscIO/FileSystemGCWii.h @@ -3,10 +3,8 @@ #pragma once -#include #include #include -#include #include #include #include diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index dd85b6282d8..a4164f754ac 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -5,10 +5,8 @@ #include #include -#include #include #include -#include #include "Common/CommonTypes.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/DiscIO/RiivolutionPatcher.cpp b/Source/Core/DiscIO/RiivolutionPatcher.cpp index 04d07b2c95e..da162aae1f2 100644 --- a/Source/Core/DiscIO/RiivolutionPatcher.cpp +++ b/Source/Core/DiscIO/RiivolutionPatcher.cpp @@ -4,7 +4,6 @@ #include "DiscIO/RiivolutionPatcher.h" #include -#include #include #include #include @@ -18,7 +17,6 @@ #include "Core/Core.h" #include "Core/HLE/HLE.h" #include "Core/HW/Memmap.h" -#include "Core/IOS/FS/FileSystem.h" #include "Core/PowerPC/MMU.h" #include "Core/System.h" #include "DiscIO/DirectoryBlob.h" diff --git a/Source/Core/DiscIO/VolumeDisc.cpp b/Source/Core/DiscIO/VolumeDisc.cpp index b32ddc6d178..882bd3ac96f 100644 --- a/Source/Core/DiscIO/VolumeDisc.cpp +++ b/Source/Core/DiscIO/VolumeDisc.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "Common/CommonTypes.h" #include "Common/Crypto/SHA1.h" diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 8cc255570ae..ad3d8ec74e1 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -3,7 +3,6 @@ #include "DiscIO/VolumeGC.h" -#include #include #include #include @@ -16,8 +15,6 @@ #include "Common/CommonTypes.h" #include "Common/Crypto/SHA1.h" #include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "DiscIO/Blob.h" #include "DiscIO/DiscExtractor.h" diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 40e71d48ddd..7fd4ce27689 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -5,12 +5,10 @@ #include #include -#include #include #include #include #include -#include #include #include diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 61848a42180..ff98b557914 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -4,8 +4,6 @@ #include "DiscIO/VolumeWad.h" #include -#include -#include #include #include #include @@ -19,7 +17,6 @@ #include "Common/Crypto/AES.h" #include "Common/Crypto/SHA1.h" #include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Core/IOS/IOSC.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp index 3ba84337889..8ee8396d41d 100644 --- a/Source/Core/DiscIO/VolumeWii.cpp +++ b/Source/Core/DiscIO/VolumeWii.cpp @@ -22,7 +22,6 @@ #include "Common/Crypto/AES.h" #include "Common/Crypto/SHA1.h" #include "Common/Logging/Log.h" -#include "Common/Swap.h" #include "DiscIO/Blob.h" #include "DiscIO/DiscExtractor.h" diff --git a/Source/Core/DiscIO/WIACompression.cpp b/Source/Core/DiscIO/WIACompression.cpp index cb8fdee3890..ec2ef6de990 100644 --- a/Source/Core/DiscIO/WIACompression.cpp +++ b/Source/Core/DiscIO/WIACompression.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include diff --git a/Source/Core/DiscIO/WiiEncryptionCache.h b/Source/Core/DiscIO/WiiEncryptionCache.h index 3516d3b5387..d08f36f0c7c 100644 --- a/Source/Core/DiscIO/WiiEncryptionCache.h +++ b/Source/Core/DiscIO/WiiEncryptionCache.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/DiscIO/WiiSaveBanner.cpp b/Source/Core/DiscIO/WiiSaveBanner.cpp index 203b0332717..54afc5b4019 100644 --- a/Source/Core/DiscIO/WiiSaveBanner.cpp +++ b/Source/Core/DiscIO/WiiSaveBanner.cpp @@ -3,14 +3,12 @@ #include "DiscIO/WiiSaveBanner.h" -#include #include #include #include #include "Common/ColorUtil.h" #include "Common/CommonTypes.h" -#include "Common/FileUtil.h" #include "Common/IOFile.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index 9c8f938836f..1e1ff6e39fa 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -16,7 +16,6 @@ #endif #include "Common/ScopeGuard.h" -#include "Common/StringUtil.h" #include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/Core.h" @@ -30,8 +29,6 @@ #endif #include "UICommon/UICommon.h" -#include "VideoCommon/VideoBackendBase.h" - static std::unique_ptr s_platform; static void signal_handler(int) diff --git a/Source/Core/DolphinNoGUI/PlatformFBDev.cpp b/Source/Core/DolphinNoGUI/PlatformFBDev.cpp index 53312bfa087..249ef20a03c 100644 --- a/Source/Core/DolphinNoGUI/PlatformFBDev.cpp +++ b/Source/Core/DolphinNoGUI/PlatformFBDev.cpp @@ -5,23 +5,15 @@ #include "DolphinNoGUI/Platform.h" -#include "Common/MsgHandler.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/State.h" #include "Core/System.h" -#include #include #include #include -#include -#include -#include -#include -#include -#include #include namespace diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp index 8fed2c8c87b..090fadf77e8 100644 --- a/Source/Core/DolphinNoGUI/PlatformX11.cpp +++ b/Source/Core/DolphinNoGUI/PlatformX11.cpp @@ -17,8 +17,6 @@ static constexpr auto X_None = None; #include "Core/State.h" #include "Core/System.h" -#include -#include #include #include diff --git a/Source/Core/DolphinQt/Achievements/AchievementBox.cpp b/Source/Core/DolphinQt/Achievements/AchievementBox.cpp index 39eefb04846..463e4e6e0b9 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementBox.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementBox.cpp @@ -13,10 +13,7 @@ #include #include -#include - #include "Core/AchievementManager.h" -#include "Core/Config/AchievementSettings.h" #include "DolphinQt/QtUtils/FromStdString.h" diff --git a/Source/Core/DolphinQt/Achievements/AchievementBox.h b/Source/Core/DolphinQt/Achievements/AchievementBox.h index 7d6e163641a..060fe564e03 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementBox.h +++ b/Source/Core/DolphinQt/Achievements/AchievementBox.h @@ -6,7 +6,7 @@ #ifdef USE_RETRO_ACHIEVEMENTS #include -#include "Core/AchievementManager.h" +#include "rcheevos/include/rc_client.h" class QLabel; class QProgressBar; diff --git a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp index 79ed1e15f02..582017c1609 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp @@ -15,10 +15,8 @@ #include "Core/AchievementManager.h" #include "Core/Config/AchievementSettings.h" -#include "Core/Core.h" #include "DolphinQt/QtUtils/FromStdString.h" -#include "DolphinQt/Settings.h" AchievementHeaderWidget::AchievementHeaderWidget(QWidget* parent) : QWidget(parent) { diff --git a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h index 65731f8d18a..1d337c5d372 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h +++ b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h @@ -6,8 +6,6 @@ #ifdef USE_RETRO_ACHIEVEMENTS #include -#include "Core/AchievementManager.h" - class QGroupBox; class QLabel; class QProgressBar; diff --git a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp index 092e892bb7c..4b33a903071 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp @@ -12,12 +12,8 @@ #include "Common/CommonTypes.h" #include "Core/AchievementManager.h" -#include "Core/Config/AchievementSettings.h" -#include "Core/Config/MainSettings.h" -#include "Core/Core.h" #include "DolphinQt/QtUtils/ClearLayoutRecursively.h" -#include "DolphinQt/Settings.h" AchievementLeaderboardWidget::AchievementLeaderboardWidget(QWidget* parent) : QWidget(parent) { diff --git a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp index 9a69cdb66b7..70b42144e34 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp @@ -11,16 +11,10 @@ #include #include -#include - #include "Core/AchievementManager.h" -#include "Core/Config/AchievementSettings.h" -#include "Core/Config/MainSettings.h" -#include "Core/Core.h" #include "DolphinQt/Achievements/AchievementBox.h" #include "DolphinQt/QtUtils/ClearLayoutRecursively.h" -#include "DolphinQt/Settings.h" AchievementProgressWidget::AchievementProgressWidget(QWidget* parent) : QWidget(parent) { diff --git a/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp index 152b4f0371f..0e4ce1feccd 100644 --- a/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp +++ b/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp @@ -6,13 +6,12 @@ #include #include +#include #include #include #include "Core/AchievementManager.h" #include "Core/Config/AchievementSettings.h" -#include "Core/Config/FreeLookSettings.h" -#include "Core/Config/MainSettings.h" #include "Core/Config/UISettings.h" #include "Core/Core.h" #include "Core/Movie.h" @@ -22,7 +21,6 @@ #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h" #include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" -#include "DolphinQt/QtUtils/NonDefaultQPushButton.h" #include "DolphinQt/QtUtils/SignalBlocking.h" #include "DolphinQt/Settings.h" diff --git a/Source/Core/DolphinQt/CheatSearchWidget.cpp b/Source/Core/DolphinQt/CheatSearchWidget.cpp index d2524bc3aa1..629d8dbafbc 100644 --- a/Source/Core/DolphinQt/CheatSearchWidget.cpp +++ b/Source/Core/DolphinQt/CheatSearchWidget.cpp @@ -3,7 +3,6 @@ #include "DolphinQt/CheatSearchWidget.h" -#include #include #include #include @@ -27,17 +26,11 @@ #include -#include "Common/Align.h" -#include "Common/BitUtils.h" -#include "Common/StringUtil.h" -#include "Common/Swap.h" - #include "Core/ActionReplay.h" #include "Core/CheatGeneration.h" #include "Core/CheatSearch.h" #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/System.h" #include "DolphinQt/Config/CheatCodeEditor.h" @@ -45,8 +38,6 @@ #include "DolphinQt/QtUtils/WrapInScrollArea.h" #include "DolphinQt/Settings.h" -#include "UICommon/GameFile.h" - constexpr size_t TABLE_MAX_ROWS = 1000; constexpr int ADDRESS_TABLE_ADDRESS_ROLE = Qt::UserRole; diff --git a/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp b/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp index e988509f6a1..7a5e1256afd 100644 --- a/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp +++ b/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp @@ -9,7 +9,6 @@ #include #include "Core/Config/MainSettings.h" -#include "Core/Core.h" #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h" #include "DolphinQt/QtUtils/NonDefaultQPushButton.h" diff --git a/Source/Core/DolphinQt/Config/CommonControllersWidget.h b/Source/Core/DolphinQt/Config/CommonControllersWidget.h index 90129bbf69d..42d23f74a4d 100644 --- a/Source/Core/DolphinQt/Config/CommonControllersWidget.h +++ b/Source/Core/DolphinQt/Config/CommonControllersWidget.h @@ -5,8 +5,6 @@ #include -#include - class QCheckBox; class QGroupBox; class QVBoxLayout; diff --git a/Source/Core/DolphinQt/Config/FreeLookWidget.cpp b/Source/Core/DolphinQt/Config/FreeLookWidget.cpp index a28091f61fc..7d622a75294 100644 --- a/Source/Core/DolphinQt/Config/FreeLookWidget.cpp +++ b/Source/Core/DolphinQt/Config/FreeLookWidget.cpp @@ -9,10 +9,7 @@ #include #include "Core/AchievementManager.h" -#include "Core/Config/AchievementSettings.h" #include "Core/Config/FreeLookSettings.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h" #include "DolphinQt/Config/ConfigControls/ConfigChoice.h" diff --git a/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp b/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp index f45b51e9eef..d23db46eb6a 100644 --- a/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp +++ b/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp @@ -12,7 +12,6 @@ #include #include -#include #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp index 735462a360a..f4dac2574f1 100644 --- a/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp @@ -17,8 +17,6 @@ #include "DolphinQt/Config/ConfigControls/ConfigFloatSlider.h" #include "DolphinQt/QtUtils/WrapInScrollArea.h" -#include "VideoCommon/VideoConfig.h" - ColorCorrectionConfigWindow::ColorCorrectionConfigWindow(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Color Correction Configuration")); diff --git a/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp index 5376e33f093..7070b608878 100644 --- a/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp @@ -22,7 +22,6 @@ #include "VideoCommon/PostProcessing.h" #include "VideoCommon/Present.h" -#include "VideoCommon/VideoConfig.h" using ConfigurationOption = VideoCommon::PostProcessingConfiguration::ConfigurationOption; using OptionType = ConfigurationOption::OptionType; diff --git a/Source/Core/DolphinQt/Config/InfoWidget.cpp b/Source/Core/DolphinQt/Config/InfoWidget.cpp index 53785d3cd09..fb1e3d01129 100644 --- a/Source/Core/DolphinQt/Config/InfoWidget.cpp +++ b/Source/Core/DolphinQt/Config/InfoWidget.cpp @@ -15,7 +15,6 @@ #include "Core/ConfigManager.h" -#include "DiscIO/Blob.h" #include "DiscIO/Enums.h" #include "DiscIO/Volume.h" #include "DiscIO/WiiSaveBanner.h" diff --git a/Source/Core/DolphinQt/Config/LogConfigWidget.cpp b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp index 9b940c99ed5..94a69b5e0dd 100644 --- a/Source/Core/DolphinQt/Config/LogConfigWidget.cpp +++ b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp @@ -12,12 +12,9 @@ #include #include -#include "Common/FileUtil.h" #include "Common/Logging/Log.h" #include "Common/Logging/LogManager.h" -#include "Core/ConfigManager.h" - #include "DolphinQt/Settings.h" LogConfigWidget::LogConfigWidget(QWidget* parent) : QDockWidget(parent) diff --git a/Source/Core/DolphinQt/Config/LogWidget.cpp b/Source/Core/DolphinQt/Config/LogWidget.cpp index 9e53852e60d..d076b3a9acf 100644 --- a/Source/Core/DolphinQt/Config/LogWidget.cpp +++ b/Source/Core/DolphinQt/Config/LogWidget.cpp @@ -12,8 +12,6 @@ #include #include -#include "Core/ConfigManager.h" - #include "DolphinQt/Settings.h" // Delay in ms between calls of UpdateLog() diff --git a/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp index d3c9f8ccfcc..e530f495a50 100644 --- a/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp @@ -9,7 +9,6 @@ #include "Core/HW/GCPad.h" #include "Core/HW/GCPadEmu.h" -#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/InputConfig.h" GCPadEmu::GCPadEmu(MappingWindow* window) : MappingWidget(window) diff --git a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp index 08fa295741c..8a1870d8d4d 100644 --- a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp @@ -10,7 +10,6 @@ #include #include "Core/Config/MainSettings.h" -#include "DolphinQt/QtUtils/QueueOnObject.h" #include "InputCommon/GCAdapter.h" diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp index 4bb3534dde9..b0ebaacca18 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp @@ -23,6 +23,7 @@ #include "InputCommon/ControllerEmu/ControlGroup/Cursor.h" #include "InputCommon/ControllerEmu/ControlGroup/Force.h" #include "InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/ControllerInterface/MappingCommon.h" diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp index c6e05abd4e4..d1d00778d31 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp @@ -7,9 +7,6 @@ #include "DolphinQt/Config/Mapping/MappingWidget.h" -#include "InputCommon/ControllerEmu/ControllerEmu.h" -#include "InputCommon/ControllerInterface/ControllerInterface.h" - MappingDouble::MappingDouble(MappingWidget* parent, ControllerEmu::NumericSetting* setting) : QDoubleSpinBox(parent), m_setting(*setting) { diff --git a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h index d4ce2a3b03f..32a1ae2021a 100644 --- a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h +++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h @@ -5,8 +5,6 @@ #include "DolphinQt/Config/Mapping/MappingWidget.h" -#include "Core/HW/WiimoteEmu/ExtensionPort.h" - class QGroupBox; class QHBoxLayout; diff --git a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h index b5778f90d1b..42cf8ff80e2 100644 --- a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h +++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h @@ -5,8 +5,6 @@ #include "DolphinQt/Config/Mapping/MappingWidget.h" -#include "Core/HW/WiimoteEmu/ExtensionPort.h" - class QGroupBox; class QHBoxLayout; diff --git a/Source/Core/DolphinQt/Config/PatchesWidget.cpp b/Source/Core/DolphinQt/Config/PatchesWidget.cpp index 529e5299c18..168ff0880ec 100644 --- a/Source/Core/DolphinQt/Config/PatchesWidget.cpp +++ b/Source/Core/DolphinQt/Config/PatchesWidget.cpp @@ -9,7 +9,6 @@ #include "Common/FileUtil.h" #include "Common/IniFile.h" -#include "Common/StringUtil.h" #include "Core/ConfigManager.h" #include "Core/PatchEngine.h" diff --git a/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp b/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp index 113c59fa07a..4e74465bca0 100644 --- a/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp +++ b/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp @@ -10,7 +10,6 @@ #include -#include "Common/Assembler/GekkoParser.h" #include "Common/StringUtil.h" #include "DolphinQt/Debugger/GekkoSyntaxHighlight.h" diff --git a/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp b/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp index 98d53767e45..09b52e0ac94 100644 --- a/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp +++ b/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp @@ -29,7 +29,6 @@ #include #include -#include "Common/Assert.h" #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" diff --git a/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp b/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp index eec667868ae..2325f409339 100644 --- a/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp +++ b/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp @@ -3,7 +3,6 @@ #include "DolphinQt/Debugger/BranchWatchTableModel.h" -#include #include #include #include diff --git a/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp b/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp index b7ffee2cf0b..7c30654b694 100644 --- a/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp +++ b/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp @@ -17,7 +17,6 @@ #include "Core/PowerPC/BreakPoints.h" #include "Core/PowerPC/Expression.h" -#include "Core/PowerPC/PowerPC.h" #include "DolphinQt/Debugger/BreakpointWidget.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp index 083ff636ef1..ce02b6baa5a 100644 --- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp @@ -27,7 +27,6 @@ #include "Common/Assert.h" #include "Common/GekkoDisassembler.h" -#include "Common/StringUtil.h" #include "Core/Core.h" #include "Core/Debugger/CodeTrace.h" #include "Core/Debugger/PPCDebugInterface.h" diff --git a/Source/Core/DolphinQt/Debugger/JITWidget.cpp b/Source/Core/DolphinQt/Debugger/JITWidget.cpp index bc60545c133..9a9fdff058b 100644 --- a/Source/Core/DolphinQt/Debugger/JITWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/JITWidget.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include "Common/CommonFuncs.h" diff --git a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp index 53f0eb1398a..a5f5ef6eeaa 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp @@ -19,11 +19,8 @@ #include #include -#include - #include "Common/Align.h" #include "Common/BitUtils.h" -#include "Common/FloatUtils.h" #include "Common/StringUtil.h" #include "Common/Swap.h" #include "Core/Core.h" diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp index 08724775100..575c1facba7 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp @@ -7,8 +7,6 @@ #include #include -#include - #include #include #include @@ -27,7 +25,6 @@ #include #include -#include "Common/BitUtils.h" #include "Common/FileUtil.h" #include "Common/IOFile.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.h b/Source/Core/DolphinQt/Debugger/MemoryWidget.h index e1b0118844c..385ba085db5 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryWidget.h +++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.h @@ -3,8 +3,6 @@ #pragma once -#include - #include #include diff --git a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp index 3d75cca71dd..d7ca4c8dc29 100644 --- a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp @@ -19,7 +19,6 @@ #include #else #include -#include #endif #include "Common/FileUtil.h" diff --git a/Source/Core/DolphinQt/Debugger/NetworkWidget.h b/Source/Core/DolphinQt/Debugger/NetworkWidget.h index c1b1e564d9c..cfcf50a5c7b 100644 --- a/Source/Core/DolphinQt/Debugger/NetworkWidget.h +++ b/Source/Core/DolphinQt/Debugger/NetworkWidget.h @@ -5,8 +5,6 @@ #include -#include "Common/CommonTypes.h" - class QCheckBox; class QCloseEvent; class QComboBox; diff --git a/Source/Core/DolphinQt/DiscordHandler.cpp b/Source/Core/DolphinQt/DiscordHandler.cpp index 49363321dbd..f52d31b2ce8 100644 --- a/Source/Core/DolphinQt/DiscordHandler.cpp +++ b/Source/Core/DolphinQt/DiscordHandler.cpp @@ -6,7 +6,6 @@ #include "DolphinQt/DiscordHandler.h" #include -#include #include diff --git a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp index 5a8b216b0c2..3df9dfcbbc8 100644 --- a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp +++ b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp @@ -30,7 +30,6 @@ #include "VideoCommon/BPMemory.h" #include "VideoCommon/CPMemory.h" #include "VideoCommon/OpcodeDecoding.h" -#include "VideoCommon/VertexLoaderBase.h" #include "VideoCommon/XFStructs.h" // Values range from 0 to number of frames - 1 diff --git a/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp index d1309d709ff..26f89637c18 100644 --- a/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp +++ b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp @@ -17,8 +17,6 @@ #include #include -#include - #include "Core/Core.h" #include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoPlayer.h" diff --git a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp index dc370178304..86b316564a7 100644 --- a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp +++ b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp @@ -11,7 +11,6 @@ #include #include "Common/FileUtil.h" -#include "Common/MsgHandler.h" #include "Common/Timer.h" #include "Core/HW/EXI/EXI_DeviceIPL.h" diff --git a/Source/Core/DolphinQt/GCMemcardManager.cpp b/Source/Core/DolphinQt/GCMemcardManager.cpp index c14a6653f63..63f3538c0c7 100644 --- a/Source/Core/DolphinQt/GCMemcardManager.cpp +++ b/Source/Core/DolphinQt/GCMemcardManager.cpp @@ -30,8 +30,6 @@ #include "Common/CommonPaths.h" #include "Common/Config/Config.h" #include "Common/FileUtil.h" -#include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Common/VariantUtil.h" #include "Core/Config/MainSettings.h" diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp index 9c39962e8ca..c63230aa556 100644 --- a/Source/Core/DolphinQt/GameList/GameList.cpp +++ b/Source/Core/DolphinQt/GameList/GameList.cpp @@ -22,8 +22,6 @@ #include #include -#include - #include #include #include @@ -42,8 +40,9 @@ #include #include -#include "Common/CommonPaths.h" +#ifdef _WIN32 #include "Common/Contains.h" +#endif #include "Common/FileUtil.h" #include "Core/Config/MainSettings.h" @@ -55,7 +54,6 @@ #include "Core/System.h" #include "Core/WiiUtils.h" -#include "DiscIO/Blob.h" #include "DiscIO/Enums.h" #include "DolphinQt/Config/PropertiesDialog.h" @@ -67,7 +65,6 @@ #include "DolphinQt/QtUtils/DoubleClickEventFilter.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/NonAutodismissibleMenu.h" -#include "DolphinQt/QtUtils/ParallelProgressDialog.h" #include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" #include "DolphinQt/WiiUpdate.h" diff --git a/Source/Core/DolphinQt/Host.cpp b/Source/Core/DolphinQt/Host.cpp index 9407e5424b8..ea7b1920c6c 100644 --- a/Source/Core/DolphinQt/Host.cpp +++ b/Source/Core/DolphinQt/Host.cpp @@ -16,15 +16,12 @@ #include #endif -#include "Common/Common.h" - #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Debugger/PPCDebugInterface.h" #include "Core/Host.h" #include "Core/NetPlayProto.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/State.h" #include "Core/System.h" diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index 26a762377ce..e2722e9cfe2 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -18,33 +18,28 @@ #include "Common/Thread.h" #include "Core/AchievementManager.h" -#include "Core/Config/AchievementSettings.h" #include "Core/Config/FreeLookSettings.h" #include "Core/Config/GraphicsSettings.h" #include "Core/Config/MainSettings.h" #include "Core/Config/UISettings.h" #include "Core/Core.h" #include "Core/FreeLookManager.h" -#include "Core/Host.h" #include "Core/HotkeyManager.h" #include "Core/IOS/IOS.h" -#include "Core/IOS/USB/Bluetooth/BTBase.h" -#include "Core/IOS/USB/Bluetooth/BTReal.h" #include "Core/State.h" #include "Core/System.h" #include "Core/WiiUtils.h" #ifdef HAS_LIBMGBA #include "DolphinQt/GBAWidget.h" -#endif #include "DolphinQt/QtUtils/QueueOnObject.h" +#endif #include "DolphinQt/Settings.h" #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "VideoCommon/OnScreenDisplay.h" -#include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" constexpr const char* DUBOIS_ALGORITHM_SHADER = "dubois"; diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp index ce85ee1f0de..b223819e7a3 100644 --- a/Source/Core/DolphinQt/Main.cpp +++ b/Source/Core/DolphinQt/Main.cpp @@ -36,7 +36,9 @@ #include "DolphinQt/QtUtils/AnalyticsPrompt.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/RunOnObject.h" +#ifdef _WIN32 #include "DolphinQt/QtUtils/SetWindowDecorations.h" +#endif #include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" #include "DolphinQt/Translation.h" diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 4b9308f189b..9f25e66ad47 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -45,7 +45,6 @@ #include "Core/BootManager.h" #include "Core/CommonTitles.h" #include "Core/Config/AchievementSettings.h" -#include "Core/Config/FreeLookSettings.h" #include "Core/Config/MainSettings.h" #include "Core/Config/NetplaySettings.h" #include "Core/Config/UISettings.h" @@ -59,10 +58,8 @@ #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SI/SI_Device.h" #include "Core/HW/Wiimote.h" -#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HotkeyManager.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h" -#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" #include "Core/Movie.h" #include "Core/NetPlayClient.h" #include "Core/NetPlayProto.h" @@ -127,19 +124,14 @@ #include "DolphinQt/ToolBar.h" #include "DolphinQt/WiiUpdate.h" -#include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/GCAdapter.h" - #include "UICommon/DiscordPresence.h" #include "UICommon/GameFile.h" #include "UICommon/ResourcePack/Manager.h" -#include "UICommon/ResourcePack/Manifest.h" #include "UICommon/ResourcePack/ResourcePack.h" #include "UICommon/UICommon.h" #include "VideoCommon/NetPlayChatUI.h" -#include "VideoCommon/VideoConfig.h" #ifdef HAVE_XRANDR #include "UICommon/X11Utils.h" diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index 7126ff96547..cef4a6a28c6 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -3,7 +3,6 @@ #include "DolphinQt/MenuBar.h" -#include #include #include @@ -22,11 +21,9 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/IOFile.h" -#include "Common/StringUtil.h" #include "Core/AchievementManager.h" #include "Core/CommonTitles.h" -#include "Core/Config/AchievementSettings.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -35,7 +32,6 @@ #include "Core/HW/AddressSpace.h" #include "Core/HW/Memmap.h" #include "Core/HW/WiiSave.h" -#include "Core/HW/Wiimote.h" #include "Core/IOS/ES/ES.h" #include "Core/IOS/FS/FileSystem.h" #include "Core/IOS/IOS.h" @@ -50,21 +46,20 @@ #include "Core/PowerPC/SignatureDB/SignatureDB.h" #include "Core/State.h" #include "Core/System.h" -#include "Core/TitleDatabase.h" #include "Core/WiiUtils.h" #include "DiscIO/Enums.h" #include "DiscIO/NANDImporter.h" -#include "DiscIO/WiiSaveBanner.h" -#include "DolphinQt/AboutDialog.h" #include "DolphinQt/Host.h" #include "DolphinQt/NANDRepairDialog.h" #include "DolphinQt/QtUtils/DolphinFileDialog.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/NonAutodismissibleMenu.h" #include "DolphinQt/QtUtils/ParallelProgressDialog.h" +#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION #include "DolphinQt/QtUtils/QueueOnObject.h" +#endif #include "DolphinQt/QtUtils/SignalBlocking.h" #include "DolphinQt/Settings.h" #include "DolphinQt/Updater.h" diff --git a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp index 1815344761b..b24c2563ff0 100644 --- a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp @@ -3,9 +3,7 @@ #include "DolphinQt/NetPlay/ChunkedProgressDialog.h" -#include #include -#include #include diff --git a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h index ab81be935ec..0d63e180ccb 100644 --- a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h +++ b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp index 67a35817dbc..c6f11a64e57 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp @@ -22,7 +22,6 @@ #include "Common/Version.h" #include "Core/Config/NetplaySettings.h" -#include "Core/ConfigManager.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/NonDefaultQPushButton.h" diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index c27f8ad4819..d50cee2b9af 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -23,11 +23,11 @@ #include #include -#include +#ifdef HAS_LIBMGBA #include +#endif -#include "Common/CommonPaths.h" #include "Common/Config/Config.h" #include "Common/HttpRequest.h" #include "Common/Logging/Log.h" @@ -35,7 +35,6 @@ #include "Core/Boot/Boot.h" #include "Core/Config/GraphicsSettings.h" -#include "Core/Config/MainSettings.h" #include "Core/Config/NetplaySettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -65,7 +64,6 @@ #include "VideoCommon/NetPlayChatUI.h" #include "VideoCommon/NetPlayGolfUI.h" -#include "VideoCommon/VideoConfig.h" namespace { diff --git a/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp b/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp index c3e6039ccce..70640899345 100644 --- a/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp +++ b/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp @@ -4,7 +4,6 @@ #include "DolphinQt/QtUtils/SignalDaemon.h" #include -#include #include #include diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp index f286b765e13..9b5026d5fb7 100644 --- a/Source/Core/DolphinQt/RenderWidget.cpp +++ b/Source/Core/DolphinQt/RenderWidget.cpp @@ -3,8 +3,6 @@ #include "DolphinQt/RenderWidget.h" -#include - #include #include #include @@ -31,9 +29,7 @@ #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "VideoCommon/OnScreenUI.h" #include "VideoCommon/Present.h" -#include "VideoCommon/VideoConfig.h" #ifdef _WIN32 #include diff --git a/Source/Core/DolphinQt/Resources.cpp b/Source/Core/DolphinQt/Resources.cpp index 015074142d0..b32d7ac7ac6 100644 --- a/Source/Core/DolphinQt/Resources.cpp +++ b/Source/Core/DolphinQt/Resources.cpp @@ -13,8 +13,6 @@ #include "Core/Config/MainSettings.h" -#include "DolphinQt/Settings.h" - bool Resources::m_svg_supported; QList Resources::m_platforms; QList Resources::m_countries; diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp index 3b31ff5703c..3046009fbb7 100644 --- a/Source/Core/DolphinQt/Settings.cpp +++ b/Source/Core/DolphinQt/Settings.cpp @@ -25,7 +25,6 @@ #include "Common/Config/Config.h" #include "Common/Contains.h" #include "Common/FileUtil.h" -#include "Common/StringUtil.h" #include "Core/AchievementManager.h" #include "Core/Config/GraphicsSettings.h" @@ -37,11 +36,9 @@ #include "Core/NetPlayServer.h" #include "Core/System.h" -#include "DolphinQt/Host.h" #include "DolphinQt/QtUtils/QueueOnObject.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -#include "InputCommon/InputConfig.h" #include "VideoCommon/NetPlayChatUI.h" #include "VideoCommon/NetPlayGolfUI.h" diff --git a/Source/Core/DolphinQt/Settings.h b/Source/Core/DolphinQt/Settings.h index e91fb130fa4..97d3b751cd7 100644 --- a/Source/Core/DolphinQt/Settings.h +++ b/Source/Core/DolphinQt/Settings.h @@ -11,9 +11,9 @@ #include #include "Common/Config/Config.h" +#include "Common/HookableEvent.h" #include "Core/Config/MainSettings.h" #include "DiscIO/Enums.h" -#include "InputCommon/ControllerInterface/ControllerInterface.h" namespace Core { diff --git a/Source/Core/DolphinQt/Settings/AudioPane.cpp b/Source/Core/DolphinQt/Settings/AudioPane.cpp index c08b4f552fd..f628d8e06e4 100644 --- a/Source/Core/DolphinQt/Settings/AudioPane.cpp +++ b/Source/Core/DolphinQt/Settings/AudioPane.cpp @@ -19,7 +19,6 @@ #include #include "AudioCommon/AudioCommon.h" -#include "AudioCommon/Enums.h" #include "AudioCommon/WASAPIStream.h" #include "Core/Config/MainSettings.h" @@ -27,10 +26,8 @@ #include "Core/System.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h" #include "DolphinQt/Config/ConfigControls/ConfigChoice.h" -#include "DolphinQt/Config/ConfigControls/ConfigRadio.h" #include "DolphinQt/Config/ConfigControls/ConfigSlider.h" -#include "DolphinQt/Config/SettingsWindow.h" #include "DolphinQt/Settings.h" static QString GetVolumeLabelText(int volume_level) diff --git a/Source/Core/DolphinQt/Settings/GameCubePane.cpp b/Source/Core/DolphinQt/Settings/GameCubePane.cpp index db7fdf59199..772ade109eb 100644 --- a/Source/Core/DolphinQt/Settings/GameCubePane.cpp +++ b/Source/Core/DolphinQt/Settings/GameCubePane.cpp @@ -31,13 +31,17 @@ #include "Core/Core.h" #include "Core/HW/EXI/EXI.h" #include "Core/HW/GCMemcard/GCMemcard.h" +#ifdef HAS_LIBMGBA #include "Core/NetPlayServer.h" +#endif #include "Core/System.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h" #include "DolphinQt/Config/ConfigControls/ConfigChoice.h" +#ifdef HAS_LIBMGBA #include "DolphinQt/Config/ConfigControls/ConfigText.h" #include "DolphinQt/Config/ConfigControls/ConfigUserPath.h" +#endif #include "DolphinQt/Config/Mapping/MappingWindow.h" #include "DolphinQt/GCMemcardManager.h" #include "DolphinQt/QtUtils/DolphinFileDialog.h" diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp index 661f5f13b23..802292f688c 100644 --- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp +++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp @@ -3,8 +3,6 @@ #include "DolphinQt/Settings/GeneralPane.h" -#include - #include #include #include @@ -21,7 +19,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/DolphinAnalytics.h" -#include "Core/PowerPC/PowerPC.h" #include "Core/System.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h" diff --git a/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp b/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp index a9dc7a0a410..afc73a9f780 100644 --- a/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp @@ -11,8 +11,6 @@ #include #include -#include "Common/CommonTypes.h" - #include "Core/HW/GBAPad.h" #include "Core/HW/GBAPadEmu.h" diff --git a/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp b/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp index 67c3d9a3d7a..b544cf0fd28 100644 --- a/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp @@ -11,8 +11,6 @@ #include #include -#include "Common/CommonTypes.h" - #include "Core/HW/GCPad.h" #include "Core/HW/GCPadEmu.h" diff --git a/Source/Core/DolphinQt/TAS/TASControlState.cpp b/Source/Core/DolphinQt/TAS/TASControlState.cpp index a961d8e4377..0706c2ae18d 100644 --- a/Source/Core/DolphinQt/TAS/TASControlState.cpp +++ b/Source/Core/DolphinQt/TAS/TASControlState.cpp @@ -5,8 +5,6 @@ #include -#include "Common/CommonTypes.h" - int TASControlState::GetValue() const { const State ui_thread_state = m_ui_thread_state.load(std::memory_order_relaxed); diff --git a/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp index ce3aa5b8836..c00c6d0206f 100644 --- a/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp @@ -24,7 +24,6 @@ #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h" #include "Core/HW/WiimoteEmu/MotionPlus.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" -#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/System.h" #include "DolphinQt/QtUtils/AspectRatioWidget.h" diff --git a/Source/Core/DolphinQt/ToolBar.cpp b/Source/Core/DolphinQt/ToolBar.cpp index 9c8350f9f84..57ab64d159e 100644 --- a/Source/Core/DolphinQt/ToolBar.cpp +++ b/Source/Core/DolphinQt/ToolBar.cpp @@ -10,7 +10,6 @@ #include #include "Core/Core.h" -#include "Core/NetPlayProto.h" #include "Core/System.h" #include "DolphinQt/Host.h" #include "DolphinQt/Resources.h" diff --git a/Source/Core/DolphinQt/Translation.cpp b/Source/Core/DolphinQt/Translation.cpp index 118634ebf0d..1b93536ac90 100644 --- a/Source/Core/DolphinQt/Translation.cpp +++ b/Source/Core/DolphinQt/Translation.cpp @@ -18,7 +18,6 @@ #include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Core/Config/MainSettings.h" diff --git a/Source/Core/DolphinQt/WiiUpdate.cpp b/Source/Core/DolphinQt/WiiUpdate.cpp index e44cbc296a2..0361b6369ce 100644 --- a/Source/Core/DolphinQt/WiiUpdate.cpp +++ b/Source/Core/DolphinQt/WiiUpdate.cpp @@ -11,10 +11,8 @@ #include #include "Common/Assert.h" -#include "Common/FileUtil.h" #include "Common/Flag.h" -#include "Core/Core.h" #include "Core/WiiUtils.h" #include "DiscIO/NANDImporter.h" diff --git a/Source/Core/DolphinTool/ConvertCommand.cpp b/Source/Core/DolphinTool/ConvertCommand.cpp index 210e608d2ac..a590c3071c8 100644 --- a/Source/Core/DolphinTool/ConvertCommand.cpp +++ b/Source/Core/DolphinTool/ConvertCommand.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include "Common/CommonTypes.h" @@ -19,7 +18,6 @@ #include "DiscIO/DiscUtils.h" #include "DiscIO/ScrubbedBlob.h" #include "DiscIO/Volume.h" -#include "DiscIO/VolumeDisc.h" #include "DiscIO/WIABlob.h" #include "UICommon/UICommon.h" diff --git a/Source/Core/DolphinTool/ExtractCommand.cpp b/Source/Core/DolphinTool/ExtractCommand.cpp index b9beed24c16..e1803a7242d 100644 --- a/Source/Core/DolphinTool/ExtractCommand.cpp +++ b/Source/Core/DolphinTool/ExtractCommand.cpp @@ -4,7 +4,6 @@ #include "DolphinTool/ExtractCommand.h" #include -#include #include #include diff --git a/Source/Core/DolphinTool/HeaderCommand.cpp b/Source/Core/DolphinTool/HeaderCommand.cpp index 3156c67b9b7..71e4772cba8 100644 --- a/Source/Core/DolphinTool/HeaderCommand.cpp +++ b/Source/Core/DolphinTool/HeaderCommand.cpp @@ -9,13 +9,11 @@ #include #include -#include #include #include #include "DiscIO/Blob.h" #include "DiscIO/Volume.h" -#include "DiscIO/VolumeDisc.h" namespace DolphinTool { diff --git a/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp b/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp index 787209bd3e7..9861376574d 100644 --- a/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp +++ b/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp @@ -1,17 +1,9 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include - #include #include -#include "Common/Flag.h" -#include "Common/WindowSystemInfo.h" - -#include "Core/Core.h" -#include "Core/DolphinAnalytics.h" #include "Core/Host.h" // Begin stubs needed to satisfy Core dependencies diff --git a/Source/Core/DolphinTool/ToolMain.cpp b/Source/Core/DolphinTool/ToolMain.cpp index 058bccc7b5b..95cc7c6aaa5 100644 --- a/Source/Core/DolphinTool/ToolMain.cpp +++ b/Source/Core/DolphinTool/ToolMain.cpp @@ -1,24 +1,23 @@ // Copyright 2021 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include #include #include #include #include #include -#include #include -#include "Common/StringUtil.h" -#include "Core/Core.h" - #include "DolphinTool/ConvertCommand.h" #include "DolphinTool/ExtractCommand.h" #include "DolphinTool/HeaderCommand.h" #include "DolphinTool/VerifyCommand.h" +#ifdef _WIN32 +#include "Common/StringUtil.h" +#endif + static void PrintUsage() { fmt::print(std::cerr, "usage: dolphin-tool COMMAND -h\n" diff --git a/Source/Core/DolphinTool/VerifyCommand.cpp b/Source/Core/DolphinTool/VerifyCommand.cpp index fcaa31b8196..975cfde14d5 100644 --- a/Source/Core/DolphinTool/VerifyCommand.cpp +++ b/Source/Core/DolphinTool/VerifyCommand.cpp @@ -8,10 +8,8 @@ #include #include -#include #include -#include "Common/StringUtil.h" #include "Core/AchievementManager.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeVerifier.h" diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp index 7cc204ab100..9ff06d40560 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp @@ -3,15 +3,12 @@ #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h" -#include #include #include "Common/Common.h" #include "Common/MathUtil.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp index a91cf8be859..612310a4704 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp @@ -3,12 +3,8 @@ #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" -#include #include -#include "Common/Common.h" -#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" - namespace ControllerEmu { Buttons::Buttons(const std::string& name_) : Buttons(name_, name_) diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h index 652f64ae5fa..db61f1b8b2a 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h @@ -6,10 +6,8 @@ #include #include -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" -#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp index 0ba4bfa3ea4..169846c9471 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp @@ -14,7 +14,6 @@ #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h index a59826124a9..85a9cf1a75b 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h @@ -6,8 +6,8 @@ #include #include +#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/StickGate.h" -#include "InputCommon/ControllerInterface/CoreDevice.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp index 0f720d3add1..d74c4df5eb1 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp @@ -8,8 +8,6 @@ #include "Common/Common.h" #include "Common/MathUtil.h" -#include "InputCommon/ControlReference/ControlReference.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp index 713ad59cc5d..f9a2b0fba0d 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp @@ -3,15 +3,12 @@ #include "InputCommon/ControllerEmu/ControlGroup/IMUCursor.h" -#include #include #include "Common/Common.h" #include "Common/MathUtil.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" -#include "InputCommon/ControllerEmu/Control/Input.h" namespace ControllerEmu { diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp index e87d5ebadf6..2807603f6f9 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp @@ -6,13 +6,11 @@ #include #include #include -#include #include #include "Common/Common.h" #include "Common/CommonTypes.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp index 570c5451fc6..7a34d1c597b 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp @@ -8,11 +8,7 @@ #include #include -#include "Common/Common.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" -#include "InputCommon/ControllerEmu/Control/Input.h" -#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "VideoCommon/OnScreenDisplay.h" namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp index c764b0214ba..b27449029b4 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -3,14 +3,10 @@ #include "InputCommon/ControllerEmu/ControlGroup/Slider.h" -#include -#include #include #include "Common/Common.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp index a59ffb0eb94..5c604ef3d1d 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp @@ -8,9 +8,7 @@ #include "Common/Common.h" #include "Common/MathUtil.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" -#include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp index 321c9272d01..109915bbe70 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp @@ -5,12 +5,9 @@ #include #include -#include #include #include -#include "Common/Common.h" -#include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" diff --git a/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp index 41ef16c330c..7197aa1fed1 100644 --- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp +++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp @@ -13,7 +13,6 @@ #include #include "Common/MathUtil.h" -#include "Common/Thread.h" namespace ciface::Core { diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp index cac67e1b8aa..2247dabbdaf 100644 --- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp @@ -20,7 +20,6 @@ #include "Common/ScopeGuard.h" #include "Common/StringUtil.h" #include "Common/Thread.h" -#include "Core/CoreTiming.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h" #include "SFML/Network/IpAddress.hpp" diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h index 7f2d62fb583..f913e1521a4 100644 --- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h +++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h @@ -3,7 +3,8 @@ #pragma once -#include "Common/Config/Config.h" +#include "Common/CommonTypes.h" +#include "Common/Config/ConfigInfo.h" #include "InputCommon/ControllerInterface/InputBackend.h" namespace ciface::DualShockUDPClient diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h index 6d0559ca52c..1fa0438a906 100644 --- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h +++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h @@ -9,6 +9,7 @@ #include "Common/CommonTypes.h" #include "Common/Hash.h" +#include "Common/Logging/Log.h" namespace ciface::DualShockUDPClient::Proto { diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp index 50175ebaf7b..20baa74be98 100644 --- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include diff --git a/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp b/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp index f8615d138b9..b78c56afc65 100644 --- a/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp @@ -3,8 +3,6 @@ #include "InputCommon/ControllerInterface/SteamDeck/SteamDeck.h" -#include - #include #include "Common/CommonTypes.h" diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp index 9ccd98dbc24..250881ccc26 100644 --- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp +++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp @@ -4,18 +4,15 @@ #include "InputCommon/DynamicInputTextures/DITConfiguration.h" #include -#include #include #include -#include "Common/CommonPaths.h" #include "Common/IniFile.h" #include "Common/JsonUtil.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" -#include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/DynamicInputTextures/DITSpecification.h" #include "InputCommon/ImageOperations.h" diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp index 70c4651a242..7b2b15a80b0 100644 --- a/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp +++ b/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp @@ -6,7 +6,6 @@ #include #include "Common/FileUtil.h" -#include "Common/IOFile.h" #include "Common/Logging/Log.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 8181b196eee..51263849394 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -11,7 +11,6 @@ #define GCADAPTER_USE_ANDROID_IMPLEMENTATION true #endif -#include #include #include #include diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 6a6495c29c6..641c8d1f3b9 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -5,7 +5,6 @@ #include -#include "Common/Config/Config.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/MsgHandler.h" @@ -13,9 +12,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/Wiimote.h" -#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" -#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/InputProfile.h" diff --git a/Source/Core/UICommon/AutoUpdate.cpp b/Source/Core/UICommon/AutoUpdate.cpp index 20b2d0f95f1..668a991545f 100644 --- a/Source/Core/UICommon/AutoUpdate.cpp +++ b/Source/Core/UICommon/AutoUpdate.cpp @@ -9,9 +9,6 @@ #include #include -#include "Common/CommonFuncs.h" -#include "Common/CommonPaths.h" -#include "Common/FileUtil.h" #include "Common/HttpRequest.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" @@ -21,7 +18,6 @@ #ifdef _WIN32 #include #else -#include #include #endif @@ -31,6 +27,9 @@ #if defined(_WIN32) || defined(__APPLE__) #define OS_SUPPORTS_UPDATER +#include "Common/CommonFuncs.h" +#include "Common/CommonPaths.h" +#include "Common/FileUtil.h" #endif // Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process diff --git a/Source/Core/UICommon/DiscordPresence.cpp b/Source/Core/UICommon/DiscordPresence.cpp index 34f47e52d03..80436f64397 100644 --- a/Source/Core/UICommon/DiscordPresence.cpp +++ b/Source/Core/UICommon/DiscordPresence.cpp @@ -9,17 +9,13 @@ #ifdef USE_DISCORD_PRESENCE -#include #include -#include #include #include #include #include "Common/Hash.h" -#include "Common/HttpRequest.h" -#include "Common/StringUtil.h" #include "Core/AchievementManager.h" #include "Core/Config/AchievementSettings.h" diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp index d548c55fbb6..94ddf1f59c7 100644 --- a/Source/Core/UICommon/GameFile.cpp +++ b/Source/Core/UICommon/GameFile.cpp @@ -7,12 +7,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include @@ -29,7 +27,6 @@ #include "Common/HttpRequest.h" #include "Common/IOFile.h" #include "Common/Image.h" -#include "Common/IniFile.h" #include "Common/MsgHandler.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/UICommon/NetPlayIndex.cpp b/Source/Core/UICommon/NetPlayIndex.cpp index 1c2468030ea..f6f3b577542 100644 --- a/Source/Core/UICommon/NetPlayIndex.cpp +++ b/Source/Core/UICommon/NetPlayIndex.cpp @@ -11,7 +11,6 @@ #include "Common/Common.h" #include "Common/HttpRequest.h" -#include "Common/Thread.h" #include "Common/Version.h" #include "Core/Config/NetplaySettings.h" diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 60077bfcd53..986177a5d2c 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -6,10 +6,8 @@ #include #include #include -#include #include #include -#include #ifdef _WIN32 #include // for SHGetFolderPath @@ -22,11 +20,9 @@ #include "Common/CommonPaths.h" #include "Common/Config/Config.h" #include "Common/FileUtil.h" -#include "Common/IniFile.h" #include "Common/Logging/LogManager.h" #include "Common/MathUtil.h" #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Core/Config/MainSettings.h" #include "Core/ConfigLoaders/BaseConfigLoader.h" @@ -42,7 +38,6 @@ #include "Core/IOS/IOS.h" #include "Core/IOS/STM/STM.h" #include "Core/System.h" -#include "Core/USBUtils.h" #include "Core/WiiRoot.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" diff --git a/Source/Core/UICommon/X11Utils.cpp b/Source/Core/UICommon/X11Utils.cpp index beec343e032..0fbb50149ae 100644 --- a/Source/Core/UICommon/X11Utils.cpp +++ b/Source/Core/UICommon/X11Utils.cpp @@ -3,22 +3,16 @@ #include "UICommon/X11Utils.h" -#include #include #include #include -#include #include -#include -#include #include #include "Common/Contains.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "Core/Config/MainSettings.h" -#include "Core/Core.h" extern char** environ; diff --git a/Source/Core/VideoBackends/OGL/OGLBoundingBox.h b/Source/Core/VideoBackends/OGL/OGLBoundingBox.h index 70de8197d9e..854f2176580 100644 --- a/Source/Core/VideoBackends/OGL/OGLBoundingBox.h +++ b/Source/Core/VideoBackends/OGL/OGLBoundingBox.h @@ -4,7 +4,7 @@ #pragma once #include "Common/CommonTypes.h" -#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" #include "VideoCommon/BoundingBox.h" diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.cpp b/Source/Core/VideoBackends/OGL/OGLConfig.cpp index b24481f790a..1cc404339c1 100644 --- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp +++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp @@ -13,11 +13,8 @@ #include "Common/Assert.h" #include "Common/GL/GLContext.h" #include "Common/GL/GLExtensions/GLExtensions.h" -#include "Common/Logging/LogManager.h" #include "Common/MsgHandler.h" -#include "Core/Config/GraphicsSettings.h" - #include "VideoBackends/OGL/OGLTexture.h" #include "VideoCommon/DriverDetails.h" diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.h b/Source/Core/VideoBackends/OGL/OGLConfig.h index 2b78c35c2b0..6387dc07957 100644 --- a/Source/Core/VideoBackends/OGL/OGLConfig.h +++ b/Source/Core/VideoBackends/OGL/OGLConfig.h @@ -3,8 +3,6 @@ #pragma once -#include "Common/CommonTypes.h" - class GLContext; namespace OGL diff --git a/Source/Core/VideoBackends/OGL/OGLGfx.cpp b/Source/Core/VideoBackends/OGL/OGLGfx.cpp index 064856804f4..27e18a3a037 100644 --- a/Source/Core/VideoBackends/OGL/OGLGfx.cpp +++ b/Source/Core/VideoBackends/OGL/OGLGfx.cpp @@ -5,10 +5,9 @@ #include "Common/GL/GLContext.h" #include "Common/GL/GLExtensions/GLExtensions.h" +#include "Common/GL/GLUtil.h" #include "Common/Logging/LogManager.h" -#include "Core/Config/GraphicsSettings.h" - #include "VideoBackends/OGL/OGLConfig.h" #include "VideoBackends/OGL/OGLPipeline.h" #include "VideoBackends/OGL/OGLShader.h" @@ -18,7 +17,6 @@ #include "VideoCommon/AsyncShaderCompiler.h" #include "VideoCommon/DriverDetails.h" -#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/Present.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/OGLMain.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp index e53999112b0..bb1f9158df6 100644 --- a/Source/Core/VideoBackends/OGL/OGLMain.cpp +++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp @@ -54,7 +54,6 @@ Make AA apply instantly during gameplay if possible #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoCommon/FramebufferManager.h" #include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp index 7e478843b66..921ef61b403 100644 --- a/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp @@ -3,7 +3,6 @@ #include "Common/CommonTypes.h" #include "Common/EnumMap.h" -#include "Common/GL/GLUtil.h" #include "Common/MsgHandler.h" #include "VideoBackends/OGL/OGLGfx.h" diff --git a/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp index 453e234b6c4..022b4de70ef 100644 --- a/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp +++ b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp @@ -8,7 +8,6 @@ #include "Common/CommonTypes.h" #include "Common/GL/GLExtensions/GLExtensions.h" -#include "VideoBackends/OGL/OGLGfx.h" #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp index aabfd4fce12..e2c61264c47 100644 --- a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp +++ b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp @@ -3,8 +3,6 @@ #include "VideoBackends/OGL/OGLPipeline.h" -#include "Common/Assert.h" - #include "VideoBackends/OGL/OGLShader.h" #include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoBackends/OGL/ProgramShaderCache.h" diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.h b/Source/Core/VideoBackends/OGL/OGLPipeline.h index 5f4af831756..f4dddc681c0 100644 --- a/Source/Core/VideoBackends/OGL/OGLPipeline.h +++ b/Source/Core/VideoBackends/OGL/OGLPipeline.h @@ -5,7 +5,6 @@ #include -#include "Common/GL/GLUtil.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoCommon/AbstractPipeline.h" #include "VideoCommon/RenderState.h" diff --git a/Source/Core/VideoBackends/OGL/OGLShader.h b/Source/Core/VideoBackends/OGL/OGLShader.h index 2554c744b85..1626ba2eac3 100644 --- a/Source/Core/VideoBackends/OGL/OGLShader.h +++ b/Source/Core/VideoBackends/OGL/OGLShader.h @@ -3,13 +3,12 @@ #pragma once -#include #include #include #include #include "Common/CommonTypes.h" -#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" #include "VideoCommon/AbstractShader.h" namespace OGL diff --git a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp index a0e18d7287a..2eec58418c7 100644 --- a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp @@ -4,14 +4,12 @@ #include "VideoBackends/OGL/OGLStreamBuffer.h" #include "Common/Align.h" -#include "Common/GL/GLUtil.h" #include "Common/MathUtil.h" #include "Common/MemoryUtil.h" #include "VideoBackends/OGL/OGLConfig.h" #include "VideoCommon/DriverDetails.h" -#include "VideoCommon/OnScreenDisplay.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h index 3b8b7daf89c..efbb8263ae5 100644 --- a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h +++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h @@ -8,7 +8,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.cpp b/Source/Core/VideoBackends/OGL/OGLTexture.cpp index 0d7c78d0bda..036054f517d 100644 --- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp +++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp @@ -5,11 +5,11 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" +#include "Common/GL/GLUtil.h" #include "Common/MsgHandler.h" #include "VideoBackends/OGL/OGLConfig.h" #include "VideoBackends/OGL/OGLGfx.h" -#include "VideoBackends/OGL/SamplerCache.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.h b/Source/Core/VideoBackends/OGL/OGLTexture.h index 4106eeffa75..fd1648be4ca 100644 --- a/Source/Core/VideoBackends/OGL/OGLTexture.h +++ b/Source/Core/VideoBackends/OGL/OGLTexture.h @@ -8,7 +8,7 @@ #include #include -#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" #include "VideoCommon/AbstractFramebuffer.h" #include "VideoCommon/AbstractStagingTexture.h" diff --git a/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp index 9c08b238da5..c5382cf3584 100644 --- a/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp @@ -3,17 +3,14 @@ #include "VideoBackends/OGL/OGLVertexManager.h" -#include #include -#include -#include #include "Common/Align.h" #include "Common/CommonTypes.h" #include "Common/GL/GLExtensions/GLExtensions.h" +#include "Common/GL/GLUtil.h" #include "VideoBackends/OGL/OGLGfx.h" -#include "VideoBackends/OGL/OGLPipeline.h" #include "VideoBackends/OGL/OGLStreamBuffer.h" #include "VideoBackends/OGL/ProgramShaderCache.h" diff --git a/Source/Core/VideoBackends/OGL/OGLVertexManager.h b/Source/Core/VideoBackends/OGL/OGLVertexManager.h index f597b159c5f..55a3ef14adc 100644 --- a/Source/Core/VideoBackends/OGL/OGLVertexManager.h +++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.h @@ -7,7 +7,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/VertexManagerBase.h" diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 3241d217e06..1dfd0268100 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -15,6 +16,7 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/GL/GLContext.h" +#include "Common/GL/GLUtil.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/Version.h" @@ -28,11 +30,9 @@ #include "VideoBackends/OGL/OGLStreamBuffer.h" #include "VideoBackends/OGL/OGLVertexManager.h" -#include "VideoCommon/AsyncShaderCompiler.h" #include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/Statistics.h" -#include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index c9a1b91f10c..1454385c3b1 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -9,7 +9,7 @@ #include #include -#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" #include "VideoCommon/AsyncShaderCompiler.h" namespace OGL diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index 5d87c4daa23..a7c6ae988f4 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -8,7 +8,7 @@ #include #include "Common/CommonTypes.h" -#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" #include "VideoCommon/Constants.h" #include "VideoCommon/RenderState.h" diff --git a/Source/Core/VideoBackends/Software/SWTexture.cpp b/Source/Core/VideoBackends/Software/SWTexture.cpp index 0ada0502f03..85197316a88 100644 --- a/Source/Core/VideoBackends/Software/SWTexture.cpp +++ b/Source/Core/VideoBackends/Software/SWTexture.cpp @@ -5,8 +5,6 @@ #include -#include "Common/Assert.h" - #include "VideoBackends/Software/CopyRegion.h" #include "VideoBackends/Software/SWGfx.h" diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index c7959650843..8759de597af 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -8,7 +8,6 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/Logging/Log.h" #include "Core/System.h" @@ -22,9 +21,7 @@ #include "VideoCommon/DataReader.h" #include "VideoCommon/IndexGenerator.h" #include "VideoCommon/OpcodeDecoding.h" -#include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/Statistics.h" -#include "VideoCommon/VertexLoaderBase.h" #include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 2f51789ae49..66c96f5a161 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -3,7 +3,6 @@ #include "VideoBackends/Software/VideoBackend.h" -#include #include #include #include diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp index ceb6c022566..000dfc632bc 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.cpp +++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp @@ -4,7 +4,6 @@ #include "VideoBackends/Software/TextureSampler.h" #include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp index b325b1428c9..c82417eb8c8 100644 --- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp @@ -8,7 +8,6 @@ #include "Common/Assert.h" #include "Common/MsgHandler.h" -#include "Common/Thread.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/Constants.h" diff --git a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp index 128c24cd1a0..965721decf7 100644 --- a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp @@ -7,19 +7,12 @@ #include #include -#include "Common/Assert.h" -#include "Common/CommonFuncs.h" #include "Common/FileUtil.h" #include "Common/LinearDiskCache.h" #include "Common/MsgHandler.h" -#include "Core/ConfigManager.h" - -#include "VideoBackends/Vulkan/CommandBufferManager.h" -#include "VideoBackends/Vulkan/ShaderCompiler.h" #include "VideoBackends/Vulkan/VKStreamBuffer.h" #include "VideoBackends/Vulkan/VKTexture.h" -#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/Constants.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp b/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp index 4c61b5f6092..8f70ae82359 100644 --- a/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp +++ b/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp @@ -3,7 +3,6 @@ #include "VideoBackends/Vulkan/StagingBuffer.h" -#include #include #include "Common/Assert.h" diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp index 5ba70c58452..623b01f3aef 100644 --- a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp +++ b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp @@ -11,7 +11,6 @@ #include "VideoBackends/Vulkan/VKPipeline.h" #include "VideoBackends/Vulkan/VKShader.h" #include "VideoBackends/Vulkan/VKTexture.h" -#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/Constants.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp index af512935007..de3ad0556db 100644 --- a/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp @@ -5,8 +5,6 @@ #include -#include "Common/Logging/Log.h" - #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" #include "VideoBackends/Vulkan/StagingBuffer.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp index c6aee79327a..9949535d887 100644 --- a/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp @@ -3,12 +3,9 @@ #include "VideoBackends/Vulkan/VKPerfQuery.h" -#include #include -#include #include "Common/Assert.h" -#include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp index ecd79493b7e..6dbd9e5bfc1 100644 --- a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp @@ -15,8 +15,6 @@ #include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" -#include "VideoCommon/DriverDetails.h" - namespace Vulkan { VKPipeline::VKPipeline(const AbstractPipelineConfig& config, VkPipeline pipeline, diff --git a/Source/Core/VideoBackends/Vulkan/VKShader.cpp b/Source/Core/VideoBackends/Vulkan/VKShader.cpp index 17e13fa7952..9132085748a 100644 --- a/Source/Core/VideoBackends/Vulkan/VKShader.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKShader.cpp @@ -4,7 +4,6 @@ #include "VideoBackends/Vulkan/VKShader.h" #include "Common/Align.h" -#include "Common/Assert.h" #include "VideoBackends/Vulkan/ObjectCache.h" #include "VideoBackends/Vulkan/ShaderCompiler.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp index a098302e6fd..69ce9d6e5e9 100644 --- a/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp @@ -3,10 +3,6 @@ #include "VideoBackends/Vulkan/VKStreamBuffer.h" -#include -#include -#include - #include "Common/Align.h" #include "Common/Assert.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp b/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp index 589d9a447ba..370e22d15cc 100644 --- a/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp @@ -7,7 +7,6 @@ #include #include "Common/Assert.h" -#include "Common/CommonFuncs.h" #include "Common/Contains.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp index 8fb49f0afdb..c607bd1eb1d 100644 --- a/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp @@ -6,7 +6,6 @@ #include "Common/Assert.h" #include "Common/EnumMap.h" -#include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" #include "VideoCommon/VertexLoaderManager.h" diff --git a/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp index dea5df2ea9b..18c5ad560c7 100644 --- a/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp @@ -12,20 +12,16 @@ #include "Core/System.h" -#include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/StateTracker.h" #include "VideoBackends/Vulkan/VKGfx.h" #include "VideoBackends/Vulkan/VKStreamBuffer.h" -#include "VideoBackends/Vulkan/VKVertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/IndexGenerator.h" #include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/Statistics.h" -#include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexShaderManager.h" -#include "VideoCommon/VideoConfig.h" namespace Vulkan { diff --git a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp index 46d84689606..a761a81a3ee 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp @@ -4,21 +4,19 @@ #define VMA_IMPLEMENTATION #include "VideoBackends/Vulkan/VulkanLoader.h" -#include -#include -#include - #if defined(ANDROID) #include #include #endif -#include "Common/CommonFuncs.h" #include "Common/DynamicLibrary.h" +#if defined(__APPLE__) +#include "Common/FileUtil.h" +#elif defined(ANDROID) && _M_ARM_64 #include "Common/FileUtil.h" -#include "Common/StringUtil.h" #include "VideoCommon/VideoConfig.h" +#endif #define VULKAN_MODULE_ENTRY_POINT(name, required) PFN_##name name; #define VULKAN_INSTANCE_ENTRY_POINT(name, required) PFN_##name name; diff --git a/Source/Core/VideoCommon/AbstractGfx.cpp b/Source/Core/VideoCommon/AbstractGfx.cpp index 3e31468f783..851dc485fd2 100644 --- a/Source/Core/VideoCommon/AbstractGfx.cpp +++ b/Source/Core/VideoCommon/AbstractGfx.cpp @@ -12,7 +12,6 @@ #include "VideoCommon/ShaderCache.h" #include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VideoConfig.h" -#include "VideoCommon/XFMemory.h" std::unique_ptr g_gfx; diff --git a/Source/Core/VideoCommon/AbstractStagingTexture.cpp b/Source/Core/VideoCommon/AbstractStagingTexture.cpp index fdfb2807fbc..c436226499a 100644 --- a/Source/Core/VideoCommon/AbstractStagingTexture.cpp +++ b/Source/Core/VideoCommon/AbstractStagingTexture.cpp @@ -7,7 +7,6 @@ #include #include "Common/Assert.h" -#include "Common/MsgHandler.h" #include "VideoCommon/AbstractTexture.h" AbstractStagingTexture::AbstractStagingTexture(StagingTextureType type, const TextureConfig& c) diff --git a/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp b/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp index 606f28d5fe7..3b15d5733e9 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp +++ b/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp @@ -9,8 +9,6 @@ #include "UICommon/UICommon.h" #include "VideoCommon/Assets/CustomAsset.h" -#include "VideoCommon/Assets/TextureAsset.h" -#include "VideoCommon/VideoEvents.h" namespace VideoCommon { diff --git a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp index 1945ca0aa70..58b72ef110e 100644 --- a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp +++ b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp @@ -3,7 +3,6 @@ #include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h" -#include #include #include diff --git a/Source/Core/VideoCommon/Assets/MaterialAsset.h b/Source/Core/VideoCommon/Assets/MaterialAsset.h index 0ba786087a5..4be99169d07 100644 --- a/Source/Core/VideoCommon/Assets/MaterialAsset.h +++ b/Source/Core/VideoCommon/Assets/MaterialAsset.h @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/Source/Core/VideoCommon/Assets/MeshAsset.cpp b/Source/Core/VideoCommon/Assets/MeshAsset.cpp index bde8c8aab6d..133184aa33b 100644 --- a/Source/Core/VideoCommon/Assets/MeshAsset.cpp +++ b/Source/Core/VideoCommon/Assets/MeshAsset.cpp @@ -3,7 +3,6 @@ #include "VideoCommon/Assets/MeshAsset.h" -#include #include #include @@ -11,7 +10,6 @@ #include "Common/IOFile.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" #include "VideoCommon/Assets/CustomAssetLibrary.h" namespace VideoCommon diff --git a/Source/Core/VideoCommon/CPMemory.cpp b/Source/Core/VideoCommon/CPMemory.cpp index 2efb000d90a..62c2eec4f3e 100644 --- a/Source/Core/VideoCommon/CPMemory.cpp +++ b/Source/Core/VideoCommon/CPMemory.cpp @@ -7,12 +7,10 @@ #include #include -#include "Common/ChunkFile.h" #include "Common/Logging/Log.h" #include "Core/DolphinAnalytics.h" #include "Core/System.h" #include "VideoCommon/CommandProcessor.h" -#include "VideoCommon/VertexLoaderManager.h" // CP state CPState g_main_cp_state; diff --git a/Source/Core/VideoCommon/CPUCull.cpp b/Source/Core/VideoCommon/CPUCull.cpp index 2ef08810112..d4692353710 100644 --- a/Source/Core/VideoCommon/CPUCull.cpp +++ b/Source/Core/VideoCommon/CPUCull.cpp @@ -12,9 +12,7 @@ #include "VideoCommon/CPMemory.h" #include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VertexShaderManager.h" -#include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" -#include "VideoCommon/XFStateManager.h" // We really want things like c.w * a.x - a.w * c.x to stay symmetric, so they cancel to zero on // degenerate triangles. Make sure the compiler doesn't optimize in fmas where not requested. diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index 8342bfb6fb7..0d912840388 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -4,7 +4,6 @@ #include "VideoCommon/CommandProcessor.h" #include -#include #include #include "Common/Assert.h" diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp index 22d6fff2d0f..705bd66babc 100644 --- a/Source/Core/VideoCommon/DriverDetails.cpp +++ b/Source/Core/VideoCommon/DriverDetails.cpp @@ -5,7 +5,6 @@ #include -#include "Common/Logging/LogManager.h" #include "Core/DolphinAnalytics.h" namespace DriverDetails diff --git a/Source/Core/VideoCommon/EFBInterface.cpp b/Source/Core/VideoCommon/EFBInterface.cpp index 6ce256ff47b..c38774d669a 100644 --- a/Source/Core/VideoCommon/EFBInterface.cpp +++ b/Source/Core/VideoCommon/EFBInterface.cpp @@ -4,11 +4,8 @@ #include "VideoCommon/EFBInterface.h" #include -#include #include -#include - #include "Common/MsgHandler.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index 2d6170ed129..1dbbbd29e99 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -3,8 +3,6 @@ #include "VideoCommon/GeometryShaderGen.h" -#include - #include "Common/CommonTypes.h" #include "Common/EnumMap.h" #include "VideoCommon/DriverDetails.h" diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp index 553b4510663..b7af797203d 100644 --- a/Source/Core/VideoCommon/GeometryShaderManager.cpp +++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp @@ -3,8 +3,6 @@ #include "VideoCommon/GeometryShaderManager.h" -#include - #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "VideoCommon/BPMemory.h" diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp index ef71ba6eb84..c8fe390e4cb 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp @@ -5,7 +5,6 @@ #include -#include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/JsonUtil.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp index 3c234e9ec1e..e3cf5b9a104 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp @@ -3,19 +3,17 @@ #include "VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.h" +#include #include -#include #include #include #include "Common/CommonPaths.h" -#include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/JsonUtil.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" -#include "Core/ConfigManager.h" #include "VideoCommon/GraphicsModSystem/Config/GraphicsMod.h" #include "VideoCommon/GraphicsModSystem/Constants.h" diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp index 7366ad7ff7c..4e22d5b3f88 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp @@ -3,22 +3,7 @@ #include "VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h" -#include -#include -#include - -#include - -#include "Common/FileUtil.h" #include "Common/Logging/Log.h" -#include "Common/StringUtil.h" -#include "Common/VariantUtil.h" -#include "Core/System.h" - -#include "VideoCommon/AbstractGfx.h" -#include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h" -#include "VideoCommon/ShaderGenCommon.h" -#include "VideoCommon/TextureCacheBase.h" std::unique_ptr CustomPipelineAction::Create(std::shared_ptr library) diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp index 0c4cf432271..54b0d786f2b 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp @@ -5,6 +5,7 @@ #include "VideoCommon/AbstractGfx.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VideoEvents.h" CustomShaderCache::CustomShaderCache() { diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h index ff2aba28237..7890cafeb64 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h @@ -3,13 +3,12 @@ #pragma once -#include #include #include #include #include -#include -#include + +#include "Common/HookableEvent.h" #include "VideoCommon/AbstractPipeline.h" #include "VideoCommon/AbstractShader.h" @@ -18,7 +17,6 @@ #include "VideoCommon/PixelShaderGen.h" #include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/UberShaderPixel.h" -#include "VideoCommon/VideoEvents.h" struct CustomShaderInstance { diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h index f7c12fe6e51..a4e883ffc2b 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h @@ -3,7 +3,6 @@ #pragma once -#include #include #include #include @@ -13,7 +12,7 @@ #include "Common/Matrix.h" #include "Common/SmallVector.h" #include "VideoCommon/Assets/TextureAsset.h" -#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/ShaderGenCommon.h" namespace GraphicsModActionData { diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp index 3caaa999fd7..79f19fe3253 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp @@ -18,8 +18,8 @@ #include "VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h" #include "VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.h" -#include "VideoCommon/TextureInfo.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VideoEvents.h" std::unique_ptr g_graphics_mod_manager; diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h index 2d67b4db765..98c121fc5ea 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h @@ -10,10 +10,10 @@ #include #include +#include "Common/HookableEvent.h" + #include "VideoCommon/GraphicsModSystem/Runtime/FBInfo.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h" -#include "VideoCommon/TextureInfo.h" -#include "VideoCommon/VideoEvents.h" #include "VideoCommon/XFMemory.h" class GraphicsModGroupConfig; diff --git a/Source/Core/VideoCommon/IndexGenerator.cpp b/Source/Core/VideoCommon/IndexGenerator.cpp index 91db4209500..4decd2b4103 100644 --- a/Source/Core/VideoCommon/IndexGenerator.cpp +++ b/Source/Core/VideoCommon/IndexGenerator.cpp @@ -3,8 +3,6 @@ #include "VideoCommon/IndexGenerator.h" -#include -#include #include #include "Common/CommonTypes.h" diff --git a/Source/Core/VideoCommon/LightingShaderGen.cpp b/Source/Core/VideoCommon/LightingShaderGen.cpp index be9d10c78ac..6c515b76324 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.cpp +++ b/Source/Core/VideoCommon/LightingShaderGen.cpp @@ -6,7 +6,6 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/XFMemory.h" diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index 768356aea8a..fc6f896cd70 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -29,7 +29,6 @@ #include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/XFMemory.h" #include "VideoCommon/XFStateManager.h" -#include "VideoCommon/XFStructs.h" namespace OpcodeDecoder { diff --git a/Source/Core/VideoCommon/PerformanceTracker.cpp b/Source/Core/VideoCommon/PerformanceTracker.cpp index 7113f388d19..725d6b26e31 100644 --- a/Source/Core/VideoCommon/PerformanceTracker.cpp +++ b/Source/Core/VideoCommon/PerformanceTracker.cpp @@ -12,7 +12,6 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" -#include "Core/Core.h" #include "VideoCommon/VideoConfig.h" static constexpr double SAMPLE_RC_RATIO = 0.25; diff --git a/Source/Core/VideoCommon/PipelineUtils.cpp b/Source/Core/VideoCommon/PipelineUtils.cpp index a63f7f00e82..40d9d08458b 100644 --- a/Source/Core/VideoCommon/PipelineUtils.cpp +++ b/Source/Core/VideoCommon/PipelineUtils.cpp @@ -12,7 +12,6 @@ #include "VideoCommon/GeometryShaderGen.h" #include "VideoCommon/PixelShaderGen.h" #include "VideoCommon/RenderState.h" -#include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/VertexShaderGen.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index f7b554a3fc6..5ce120e9ff5 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -3,11 +3,6 @@ #include "VideoCommon/PixelShaderGen.h" -#include -#include -#include -#include - #include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/EnumMap.h" @@ -16,9 +11,7 @@ #include "VideoCommon/BoundingBox.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/LightingShaderGen.h" -#include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/RenderState.h" -#include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" // for texture projection mode diff --git a/Source/Core/VideoCommon/ShaderCompileUtils.cpp b/Source/Core/VideoCommon/ShaderCompileUtils.cpp index ea17162ce9b..297d86ea922 100644 --- a/Source/Core/VideoCommon/ShaderCompileUtils.cpp +++ b/Source/Core/VideoCommon/ShaderCompileUtils.cpp @@ -3,7 +3,6 @@ #include "VideoCommon/ShaderCompileUtils.h" -#include #include #include "Common/FileUtil.h" diff --git a/Source/Core/VideoCommon/ShaderGenCommon.cpp b/Source/Core/VideoCommon/ShaderGenCommon.cpp index 26463f44765..e848beb6934 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.cpp +++ b/Source/Core/VideoCommon/ShaderGenCommon.cpp @@ -5,12 +5,10 @@ #include -#include "Common/Assert.h" #include "Common/FileUtil.h" #include "Core/ConfigManager.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" -#include "VideoCommon/XFMemory.h" ShaderHostConfig ShaderHostConfig::GetCurrent() { diff --git a/Source/Core/VideoCommon/Spirv.cpp b/Source/Core/VideoCommon/Spirv.cpp index fce9b272bee..9fcef18d134 100644 --- a/Source/Core/VideoCommon/Spirv.cpp +++ b/Source/Core/VideoCommon/Spirv.cpp @@ -3,13 +3,13 @@ #include "VideoCommon/Spirv.h" +#include + #include -#include #include "Common/FileUtil.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Common/Version.h" #include "VideoCommon/VideoBackendBase.h" diff --git a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp index 9dcc4385e11..a8827fdc6f6 100644 --- a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp +++ b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp @@ -3,7 +3,6 @@ #include "VideoCommon/TextureConverterShaderGen.h" -#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/TextureCacheBase.h" diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp index d4139c02d9c..3506514a54e 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 25eebf2cba2..39183615619 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -3,10 +3,6 @@ #include "VideoCommon/TextureDecoder.h" -#include -#include -#include - #ifdef CHECK #include "Common/Assert.h" #endif diff --git a/Source/Core/VideoCommon/UberShaderPixel.cpp b/Source/Core/VideoCommon/UberShaderPixel.cpp index cbce3ff5a8a..45292e41d02 100644 --- a/Source/Core/VideoCommon/UberShaderPixel.cpp +++ b/Source/Core/VideoCommon/UberShaderPixel.cpp @@ -7,7 +7,6 @@ #include "VideoCommon/BPMemory.h" #include "VideoCommon/DriverDetails.h" -#include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/PixelShaderGen.h" #include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/UberShaderCommon.h" diff --git a/Source/Core/VideoCommon/UberShaderVertex.cpp b/Source/Core/VideoCommon/UberShaderVertex.cpp index 6ea8abe0952..6f79564edda 100644 --- a/Source/Core/VideoCommon/UberShaderVertex.cpp +++ b/Source/Core/VideoCommon/UberShaderVertex.cpp @@ -6,7 +6,6 @@ #include #include "VideoCommon/ConstantManager.h" -#include "VideoCommon/DriverDetails.h" #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/UberShaderCommon.h" #include "VideoCommon/VertexShaderGen.h" diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 36b6a2a67f1..98eb651796f 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -7,16 +7,12 @@ #include #include #include -#include #include -#include #include #include "Common/Assert.h" -#include "Common/BitUtils.h" #include "Common/CommonTypes.h" -#include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "VideoCommon/VertexLoader.h" diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index 32094b46e07..ce137015691 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -25,7 +25,6 @@ #include "VideoCommon/BPMemory.h" #include "VideoCommon/CPMemory.h" #include "VideoCommon/DataReader.h" -#include "VideoCommon/IndexGenerator.h" #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoaderBase.h" diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp index 70ea700fdb2..fd3692a9a11 100644 --- a/Source/Core/VideoCommon/VertexLoaderX64.cpp +++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp @@ -5,11 +5,9 @@ #include #include -#include #include "Common/BitSet.h" #include "Common/CPUDetect.h" -#include "Common/Common.h" #include "Common/CommonTypes.h" #include "Common/Intrinsics.h" #include "Common/JitRegister.h" diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp index d5f53f4963b..4b1892ad8f1 100644 --- a/Source/Core/VideoCommon/VideoState.cpp +++ b/Source/Core/VideoCommon/VideoState.cpp @@ -3,8 +3,6 @@ #include "VideoCommon/VideoState.h" -#include - #include "Common/ChunkFile.h" #include "Core/System.h" #include "VideoCommon/BPMemory.h" diff --git a/Source/UnitTests/Common/BusyLoopTest.cpp b/Source/UnitTests/Common/BusyLoopTest.cpp index 8cb62ca1afc..27d04b407c6 100644 --- a/Source/UnitTests/Common/BusyLoopTest.cpp +++ b/Source/UnitTests/Common/BusyLoopTest.cpp @@ -1,7 +1,6 @@ // Copyright 2014 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include #include #include diff --git a/Source/UnitTests/Common/x64EmitterTest.cpp b/Source/UnitTests/Common/x64EmitterTest.cpp index f38bb7c1b96..ef060e0a935 100644 --- a/Source/UnitTests/Common/x64EmitterTest.cpp +++ b/Source/UnitTests/Common/x64EmitterTest.cpp @@ -4,7 +4,6 @@ #include #include // From Bochs, fallback included in Externals. #include -#include #include #include diff --git a/Source/UnitTests/Core/PageFaultTest.cpp b/Source/UnitTests/Core/PageFaultTest.cpp index c9c69d7d518..f7805427612 100644 --- a/Source/UnitTests/Core/PageFaultTest.cpp +++ b/Source/UnitTests/Core/PageFaultTest.cpp @@ -2,11 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include #include "Common/CommonTypes.h" #include "Common/ScopeGuard.h" -#include "Common/Timer.h" #include "Core/Core.h" #include "Core/MemTools.h" #include "Core/PowerPC/JitCommon/JitBase.h" diff --git a/Source/UnitTests/Core/PatchAllowlistTest.cpp b/Source/UnitTests/Core/PatchAllowlistTest.cpp index 85111fb6079..4fa6f0f3280 100644 --- a/Source/UnitTests/Core/PatchAllowlistTest.cpp +++ b/Source/UnitTests/Core/PatchAllowlistTest.cpp @@ -3,7 +3,6 @@ #ifdef USE_RETRO_ACHIEVEMENTS -#include #include #include #include @@ -17,12 +16,10 @@ #include "Common/CommonPaths.h" #include "Common/Crypto/SHA1.h" #include "Common/FileUtil.h" -#include "Common/IOFile.h" #include "Common/IniFile.h" #include "Common/JsonUtil.h" #include "Core/AchievementManager.h" #include "Core/ActionReplay.h" -#include "Core/CheatCodes.h" #include "Core/GeckoCode.h" #include "Core/GeckoCodeConfig.h" #include "Core/PatchEngine.h" diff --git a/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp b/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp index c9f69d0de1a..36604ee735f 100644 --- a/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp +++ b/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp @@ -1,23 +1,18 @@ // Copyright 2019 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include - #include "Common/CommonTypes.h" #include "Common/ScopeGuard.h" #include "Common/x64ABI.h" #include "Core/Core.h" -#include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h" -#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" +#include "Core/PowerPC/Jit64Common/Jit64Constants.h" #include "Core/System.h" #include "../TestValues.h" -#include #include namespace diff --git a/Source/UnitTests/Core/PowerPC/Jit64Common/Fres.cpp b/Source/UnitTests/Core/PowerPC/Jit64Common/Fres.cpp index d3377070ca0..bf92c659995 100644 --- a/Source/UnitTests/Core/PowerPC/Jit64Common/Fres.cpp +++ b/Source/UnitTests/Core/PowerPC/Jit64Common/Fres.cpp @@ -15,7 +15,6 @@ #include "../TestValues.h" -#include #include namespace diff --git a/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp b/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp index b395b4cd073..5af80075f09 100644 --- a/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp +++ b/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include #include "Common/CommonTypes.h" #include "Common/FloatUtils.h" @@ -17,7 +16,6 @@ #include "../TestValues.h" -#include #include namespace diff --git a/Source/UnitTests/UnitTestsMain.cpp b/Source/UnitTests/UnitTestsMain.cpp index 3edb1c19092..12b998125c8 100644 --- a/Source/UnitTests/UnitTestsMain.cpp +++ b/Source/UnitTests/UnitTestsMain.cpp @@ -2,11 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Based on gtest_main.cc -#include -#include - #include "Common/MsgHandler.h" -#include "Core/Core.h" #include "gtest/gtest.h" diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp index 936f2e35c18..1b1d8f38bac 100644 --- a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp +++ b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp @@ -5,12 +5,10 @@ #include #include #include -#include #include #include // NOLINT -#include "Common/Common.h" #include "Common/MathUtil.h" #include "VideoCommon/CPMemory.h" #include "VideoCommon/DataReader.h"