Don't randomly include "stdafx.h"

It's file for precompiled headers.
Include what is used, don't rely on transitive includes.

Utilities/cheat_info.h

@@ -1,6 +1,8 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
+
+#include <string>
 
 enum class cheat_type : u8
 {

Utilities/sync.h

@@ -7,7 +7,9 @@
 #include "util/dyn_lib.hpp"
 
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <Windows.h>
 #include <time.h>
 #elif __linux__

rpcs3/Emu/Audio/AudioBackend.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "Utilities/StrFmt.h"
 
 enum : u32
 {

rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp

@@ -2,6 +2,7 @@
 #error "XAudio2 can only be built on Windows."
 #endif
 
+#include <algorithm>
 #include "util/logs.hpp"
 #include "Utilities/StrFmt.h"
 #include "Emu/System.h"

rpcs3/Emu/Cell/Modules/cellMsgDialog.h

@@ -1,9 +1,14 @@
 #pragma once
 
+#include "util/types.hpp"
+#include "util/atomic.hpp"
 #include "Utilities/BitField.h"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
 
+#include <string>
+#include <functional>
+
 enum
 {
 	CELL_MSGDIALOG_PROGRESSBAR_STRING_SIZE = 64,

rpcs3/Emu/Cell/Modules/cellOskDialog.h

@@ -1,6 +1,10 @@
 #pragma once
 
+#include "util/types.hpp"
+#include "util/atomic.hpp"
 #include "Emu/Memory/vm_ptr.h"
+#include <string>
+#include <functional>
 
 // error codes
 enum CellOskDialogError : u32

rpcs3/Emu/Cell/Modules/cellSaveData.h

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "stdafx.h"
-#include <Emu/Memory/vm_ptr.h>
+#include "util/types.hpp"
+#include "util/endian.hpp"
+#include "Emu/Memory/vm_ptr.h"
+#include <string>
+#include <vector>
 
 // Return codes
 enum CellSaveDataError : u32

rpcs3/Emu/Cell/Modules/sceNpTrophy.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
+#include "util/endian.hpp"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
+#include <vector>
 
 // Error codes
 enum SceNpTrophyError : u32

rpcs3/Emu/Cell/PPUThread.h

@@ -4,6 +4,7 @@
 #include "../Memory/vm_ptr.h"
 #include "Utilities/lockless.h"
 
+#include "util/logs.hpp"
 #include "util/v128.hpp"
 
 LOG_CHANNEL(ppu_log, "PPU");

rpcs3/Emu/Cell/SPUThread.h

@@ -7,6 +7,7 @@
 
 #include <map>
 #include "util/v128.hpp"
+#include "util/logs.hpp"
 #include "util/to_endian.hpp"
 
 LOG_CHANNEL(spu_log, "SPU");

rpcs3/Emu/Io/MouseHandler.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <list>
+#include <algorithm>
 #include "Utilities/mutex.h"
 #include "util/init_mutex.hpp"
 

rpcs3/Emu/Io/interception.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include "util/types.hpp"
+#include "util/atomic.hpp"
+
 namespace input
 {
 	extern atomic_t<bool> g_intercepted;

rpcs3/Emu/Io/pad_types.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include "util/types.hpp"
+
+#include <vector>
+
 enum SystemInfo
 {
 	CELL_PAD_INFO_INTERCEPTED = 0x00000001

rpcs3/Emu/Memory/vm.h

@@ -3,6 +3,7 @@
 #include <map>
 #include <memory>
 #include "util/types.hpp"
+#include "util/atomic.hpp"
 #include "Utilities/StrFmt.h"
 
 #include "util/to_endian.hpp"

rpcs3/Emu/RSX/CgBinaryProgram.h

@@ -1,8 +1,9 @@
 #pragma once
-#include <sstream>
+
 #include "Emu/Memory/vm.h"
 #include "Emu/RSX/GL/GLVertexProgram.h"
 #include "Emu/RSX/GL/GLFragmentProgram.h"
+#include "Utilities/File.h"
 
 using CGprofile = be_t<u32>;
 using CGbool = be_t<s32>;

rpcs3/Emu/RSX/GL/GLHelpers.h

@@ -15,6 +15,7 @@
 #include "Emu/system_config.h"
 #include "Utilities/mutex.h"
 #include "Utilities/geometry.h"
+#include "Utilities/File.h"
 #include "util/logs.hpp"
 #include "util/asm.hpp"
 

rpcs3/Emu/RSX/GL/GLOverlays.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "GLHelpers.h"
 #include "../Overlays/overlays.h"
+#include <string>
 
 extern u64 get_system_time();
 

rpcs3/Emu/RSX/GL/GLTextOut.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "GLHelpers.h"
 #include "../Common/TextGlyphs.h"
+#include <string>
+#include <vector>
 
 namespace gl
 {

rpcs3/Emu/RSX/GL/GLTextureCache.h

@@ -1,10 +1,13 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include "GLRenderTargets.h"
 #include "../Common/texture_cache.h"
 
+#include <memory>
+#include <vector>
+
 class GLGSRender;
 
 namespace gl

rpcs3/Emu/RSX/GSFrameBase.h

@@ -1,6 +1,9 @@
 #pragma once
 
+#include "util/types.hpp"
+#include "util/atomic.hpp"
 #include <memory>
+#include <vector>
 
 #include "display.h"
 

rpcs3/Emu/RSX/Overlays/overlay_controls.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "util/logs.hpp"
 #include "Utilities/geometry.h"
 #include "Utilities/File.h"
 #include "overlay_utils.h"

rpcs3/Emu/RSX/VK/VKHelpers.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include <string>
 #include <functional>
 #include <vector>

rpcs3/Emu/RSX/VK/VKRenderTargets.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "VKHelpers.h"
 #include "VKFormats.h"
 #include "../Common/surface_store.h"

rpcs3/Emu/RSX/VK/VKTextureCache.h

@@ -1,10 +1,14 @@
 #pragma once
-#include "stdafx.h"
+
+#include "util/types.hpp"
 #include "VKRenderTargets.h"
 #include "VKResourceManager.h"
 #include "VKDMA.h"
 #include "../Common/texture_cache.h"
 
+#include <memory>
+#include <vector>
+
 extern u64 get_system_time();
 
 namespace vk

rpcs3/Emu/System.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
+#include "util/atomic.hpp"
 #include <functional>
 #include <memory>
 #include <string>
+#include <vector>
 
 u64 get_system_time();
 u64 get_guest_system_time();

rpcs3/Input/basic_keyboard_handler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Io/KeyboardHandler.h"
 
 #include <QKeyEvent>

rpcs3/Input/basic_mouse_handler.cpp

@@ -1,6 +1,9 @@
 #include <QApplication>
 #include <QCursor>
 
+#include "util/types.hpp"
+#include "util/logs.hpp"
+
 #include "basic_mouse_handler.h"
 #include "rpcs3qt/gs_frame.h"
 #include "Emu/Io/interception.h"

rpcs3/Input/basic_mouse_handler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Io/MouseHandler.h"
 
 #include <QWindow>

rpcs3/Input/evdev_joystick_handler.h

@@ -1,10 +1,12 @@
 #pragma once
 #ifdef HAVE_LIBEVDEV
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Utilities/File.h"
 #include "Emu/Io/PadHandler.h"
 #include <libevdev/libevdev.h>
+#include <memory>
+#include <unordered_map>
 #include <vector>
 #include <thread>
 #include <ctime>

rpcs3/Input/keyboard_pad_handler.h

@@ -1,10 +1,13 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Io/PadHandler.h"
 
 #include <QWindow>
 #include <QKeyEvent>
+#include <string>
+#include <vector>
+#include <unordered_map>
 
 enum mouse
 {

rpcs3/Input/mm_joystick_handler.h

@@ -1,10 +1,18 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Io/PadHandler.h"
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <Windows.h>
 #include <mmsystem.h>
 
+#include <string>
+#include <vector>
+#include <memory>
+#include <unordered_map>
+
 class mm_joystick_handler final : public PadHandlerBase
 {
 	// Unique names for the config files and our pad settings dialog

rpcs3/Input/pad_thread.h

@@ -1,12 +1,15 @@
 #pragma once
 
+#include "util/types.hpp"
+#include "util/atomic.hpp"
+#include "Emu/Io/pad_types.h"
+#include "Emu/Io/pad_config_types.h"
+
 #include <map>
 #include <thread>
 #include <mutex>
-
-#include "stdafx.h"
-#include "Emu/Io/pad_types.h"
-#include "Emu/Io/pad_config_types.h"
+#include <string_view>
+#include <string>
 
 class PadHandlerBase;
 

rpcs3/Input/xinput_pad_handler.h

@@ -1,7 +1,9 @@
 #pragma once
 
 #include "Emu/Io/PadHandler.h"
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <Windows.h>
 #include <Xinput.h>
 #include <chrono>

rpcs3/Loader/PSF.h

@@ -1,8 +1,15 @@
 #pragma once
 
+#include "util/types.hpp"
 #include <map>
+#include <string>
 #include <string_view>
 
+namespace fs
+{
+	class file;
+}
+
 namespace psf
 {
 	enum class format : u16

rpcs3/cmake_modules/ConfigureCompiler.cmake

@@ -2,7 +2,7 @@
 
 if(MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:throwingNew /constexpr:steps16777216 /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _ENABLE_EXTENDED_ALIGNED_STORAGE=1 /D _HAS_EXCEPTIONS=0 /MT")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D NOMINMAX /D _ENABLE_EXTENDED_ALIGNED_STORAGE=1 /D _HAS_EXCEPTIONS=0 /MT")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED")
 

rpcs3/headless_application.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "stdafx.h"
-
 #include <QCoreApplication>
 
 #include "main_application.h"
 
+#include <functional>
+
 /** Headless RPCS3 Application Class
  * The main point of this class is to do application initialization and initialize callbacks.
 */

rpcs3/main.cpp

@@ -39,6 +39,7 @@ DYNAMIC_IMPORT("ntdll.dll", NtSetTimerResolution, NTSTATUS(ULONG DesiredResoluti
 
 #include "Utilities/Config.h"
 #include "Utilities/Thread.h"
+#include "Utilities/File.h"
 #include "rpcs3_version.h"
 #include "Emu/System.h"
 #include <thread>

rpcs3/main_application.cpp

@@ -1,5 +1,9 @@
 #include "main_application.h"
 
+#include "util/types.hpp"
+#include "util/logs.hpp"
+#include "util/atomic.hpp"
+
 #include "Input/pad_thread.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"

rpcs3/rpcs3qt/_discord_utils.cpp

@@ -1,9 +1,11 @@
 #ifdef WITH_DISCORD_RPC
-#include "stdafx.h"
 #include "_discord_utils.h"
 #include "discord_rpc.h"
 #include "discord_register.h"
 
+#include <string>
+#include <ctime>
+
 namespace discord
 {
 	void initialize(const std::string& application_id)
@@ -27,7 +29,7 @@ namespace discord
 
 		if (reset_timer)
 		{
-			discordPresence.startTimestamp = time(0);
+			discordPresence.startTimestamp = std::time(0);
 		}
 
 		Discord_UpdatePresence(&discordPresence);

rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp

@@ -8,6 +8,9 @@
 #include <QVBoxLayout>
 #include <QPushButton>
 
+#include "util/logs.hpp"
+#include "Utilities/File.h"
+
 LOG_CHANNEL(autopause_log, "AutoPause");
 
 constexpr auto qstr = QString::fromStdString;

rpcs3/rpcs3qt/auto_pause_settings_dialog.h

@@ -1,11 +1,12 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QDialog>
 #include <QLabel>
 #include <QTableWidget>
 #include <QLineEdit>
+#include <vector>
 
 class auto_pause_settings_dialog : public QDialog
 {

rpcs3/rpcs3qt/breakpoint_handler.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "stdafx.h"
+
+#include "util/types.hpp"
 #include <set>
 
 enum class breakpoint_types
@@ -38,6 +39,6 @@ public:
 
 private:
 	// TODO : generalize to hold multiple games and handle flags.Probably do : std::map<std::string (gameid), std::set<breakpoint>>.
-	// Although, externally, they'll only be accessed by loc (I think) so a map of maps may also do? 
+	// Although, externally, they'll only be accessed by loc (I think) so a map of maps may also do?
 	std::set<u32> m_breakpoints; //! Holds all breakpoints.
 };

rpcs3/rpcs3qt/breakpoint_list.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QListWidget>
+#include <memory>
 
 class CPUDisAsm;
 class cpu_thread;

rpcs3/rpcs3qt/call_stack_list.cpp

@@ -1,5 +1,7 @@
 #include "call_stack_list.h"
 
+#include "Utilities/StrFmt.h"
+
 constexpr auto qstr = QString::fromStdString;
 
 call_stack_list::call_stack_list(QWidget* parent) : QListWidget(parent)

rpcs3/rpcs3qt/call_stack_list.h

@@ -1,11 +1,13 @@
 #pragma once
 
-#include "stdafx.h"
-
-#include "Emu/CPU/CPUThread.h"
-#include "Emu/CPU/CPUDisAsm.h"
+#include "util/types.hpp"
 
 #include <QListWidget>
+#include <memory>
+#include <vector>
+
+class cpu_thread;
+class CPUDisAsm;
 
 class call_stack_list : public QListWidget
 {

rpcs3/rpcs3qt/cg_disasm_window.cpp

@@ -1,5 +1,3 @@
-#include "stdafx.h"
-
 #include "cg_disasm_window.h"
 #include "gui_settings.h"
 #include "syntax_highlighter.h"

rpcs3/rpcs3qt/cg_disasm_window.h

@@ -1,9 +1,10 @@
 #pragma once
 
+#include "util/types.hpp"
+
 #include <QTextEdit>
 #include <QDropEvent>
-
-#include "stdafx.h"
+#include <memory>
 
 class AsmHighlighter;
 class GlslHighlighter;

rpcs3/rpcs3qt/cheat_manager.cpp

@@ -20,6 +20,7 @@
 #include "util/yaml.hpp"
 #include "util/asm.hpp"
 #include "util/to_endian.hpp"
+#include "Utilities/File.h"
 #include "Utilities/StrUtil.h"
 #include "Utilities/bin_patch.h" // get_patches_path()
 

rpcs3/rpcs3qt/cheat_manager.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
+
 #include <QDialog>
 #include <QTableWidget>
 #include <QListWidget>
@@ -8,6 +9,10 @@
 #include <QComboBox>
 #include <QPushButton>
 
+#include <string>
+#include <vector>
+#include <map>
+
 #include "Utilities/cheat_info.h"
 
 class cheat_engine

rpcs3/rpcs3qt/curl_handle.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "curl_handle.h"
 #include "Emu/System.h"
 

rpcs3/rpcs3qt/debugger_frame.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include "custom_dock_widget.h"
 
@@ -9,6 +9,9 @@
 #include <QPushButton>
 #include <QComboBox>
 
+#include <memory>
+#include <vector>
+
 class CPUDisAsm;
 class cpu_thread;
 class gui_settings;
@@ -73,7 +76,7 @@ public:
 	void ClearCallStack();
 
 	/** Needed so key press events work when other objects are selected in debugger_frame. */
-	bool eventFilter(QObject* object, QEvent* event) override; 
+	bool eventFilter(QObject* object, QEvent* event) override;
 protected:
 	/** Override inherited method from Qt to allow signalling when close happened.*/
 	void closeEvent(QCloseEvent* event) override;

rpcs3/rpcs3qt/debugger_list.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QListWidget>
 
+#include <memory>
+
 class breakpoint_handler;
 class CPUDisAsm;
 class cpu_thread;

rpcs3/rpcs3qt/downloader.cpp

@@ -1,5 +1,3 @@
-#include "stdafx.h"
-
 #include <QApplication>
 #include <QThread>
 
@@ -8,6 +6,7 @@
 #include "progress_dialog.h"
 
 #include "Crypto/sha256.h"
+#include "util/logs.hpp"
 
 LOG_CHANNEL(network_log, "NETWORK");
 

rpcs3/rpcs3qt/emu_settings.cpp

@@ -11,6 +11,7 @@
 #include "Emu/Cell/Modules/cellSysutil.h"
 
 #include "util/yaml.hpp"
+#include "Utilities/File.h"
 
 LOG_CHANNEL(cfg_log, "CFG");
 

rpcs3/rpcs3qt/emu_settings.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "yaml-cpp/yaml.h"
+#include "util/types.hpp"
 
-#include "stdafx.h"
+#include "yaml-cpp/yaml.h"
 
 #include "microphone_creator.h"
 #include "render_creator.h"
@@ -15,6 +15,9 @@
 #include <QSpinBox>
 #include <QDateTimeEdit>
 
+#include <string>
+#include <vector>
+
 constexpr auto qstr = QString::fromStdString;
 
 class emu_settings : public QObject

rpcs3/rpcs3qt/fatal_error_dialog.cpp

@@ -3,6 +3,8 @@
 #include <QLayout>
 #include <QTextDocument>
 
+#include <string>
+
 fatal_error_dialog::fatal_error_dialog(const std::string& text) : QMessageBox()
 {
 	setWindowTitle(tr("RPCS3: Fatal Error"));

rpcs3/rpcs3qt/fatal_error_dialog.h

@@ -2,6 +2,8 @@
 
 #include <QMessageBox>
 
+#include <string>
+
 class fatal_error_dialog : public QMessageBox
 {
 	Q_OBJECT

rpcs3/rpcs3qt/game_list_frame.cpp

@@ -19,6 +19,7 @@
 #include "Loader/PSF.h"
 #include "util/types.hpp"
 #include "Utilities/lockless.h"
+#include "Utilities/File.h"
 #include "util/yaml.hpp"
 #include "Input/pad_thread.h"
 

rpcs3/rpcs3qt/gl_gs_frame.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "gl_gs_frame.h"
 
 #include "Emu/system_config.h"

rpcs3/rpcs3qt/gl_gs_frame.h

@@ -1,8 +1,11 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
+
 #include "gs_frame.h"
 
+#include <memory>
+
 struct GLContext
 {
 	QSurface *surface = nullptr;

rpcs3/rpcs3qt/gs_frame.cpp

@@ -4,6 +4,7 @@
 #include "Utilities/Config.h"
 #include "Utilities/Timer.h"
 #include "Utilities/date_time.h"
+#include "Utilities/File.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
 #include "Emu/IdManager.h"

rpcs3/rpcs3qt/gs_frame.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
+#include "util/atomic.hpp"
 #include "Emu/RSX/GSFrameBase.h"
 
 #include <QWindow>
@@ -12,6 +13,9 @@
 #include <QWinTaskbarButton>
 #endif
 
+#include <memory>
+#include <vector>
+
 class gui_settings;
 
 class gs_frame : public QWindow, public GSFrameBase

rpcs3/rpcs3qt/gui_application.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QApplication>
 #include <QElapsedTimer>
@@ -9,6 +9,9 @@
 
 #include "main_application.h"
 
+#include <memory>
+#include <functional>
+
 class gs_frame;
 class main_window;
 class gui_settings;

rpcs3/rpcs3qt/instruction_editor_dialog.h

@@ -1,11 +1,13 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QDialog>
 #include <QLineEdit>
 #include <QLabel>
 
+#include <memory>
+
 class CPUDisAsm;
 class cpu_thread;
 

rpcs3/rpcs3qt/kernel_explorer.cpp

@@ -1,5 +1,3 @@
-#include "stdafx.h"
-
 #include <map>
 
 #include <QVBoxLayout>

rpcs3/rpcs3qt/log_frame.cpp

@@ -2,7 +2,6 @@
 #include "qt_utils.h"
 #include "gui_settings.h"
 
-#include "stdafx.h"
 #include "rpcs3_version.h"
 #include "Utilities/mutex.h"
 #include "Utilities/lockless.h"

rpcs3/rpcs3qt/main_window.cpp

@@ -1,5 +1,3 @@
-#include "stdafx.h"
-
 #include "main_window.h"
 #include "qt_utils.h"
 #include "vfs_dialog.h"

rpcs3/rpcs3qt/memory_string_searcher.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "memory_string_searcher.h"
 #include "Emu/Memory/vm.h"
 
@@ -6,6 +5,8 @@
 #include <QPushButton>
 #include <QHBoxLayout>
 
+#include "util/logs.hpp"
+
 LOG_CHANNEL(gui_log, "GUI");
 
 memory_string_searcher::memory_string_searcher(QWidget* parent)

rpcs3/rpcs3qt/memory_viewer_panel.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QDialog>
 #include <QLineEdit>
@@ -8,6 +8,8 @@
 #include <QFont>
 #include <QFontDatabase>
 
+#include <string>
+
 class memory_viewer_panel : public QDialog
 {
 	Q_OBJECT

rpcs3/rpcs3qt/microphone_creator.cpp

@@ -1,5 +1,6 @@
 #include "microphone_creator.h"
 
+#include "Utilities/StrFmt.h"
 #include "Utilities/StrUtil.h"
 
 #include "3rdparty/OpenAL/include/alext.h"

rpcs3/rpcs3qt/microphone_creator.h

@@ -1,12 +1,13 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QString>
 #include <QStringList>
 #include <QObject>
 
 #include <array>
+#include <string>
 
 class microphone_creator : public QObject
 {

rpcs3/rpcs3qt/msg_dialog_frame.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 
 #include <QProgressBar>
@@ -11,6 +11,8 @@
 #include <QWinTaskbarButton>
 #endif
 
+#include <string>
+
 class custom_dialog;
 
 class msg_dialog_frame : public QObject, public MsgDialogBase

rpcs3/rpcs3qt/osk_dialog_frame.h

@@ -1,10 +1,12 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Cell/Modules/cellOskDialog.h"
 
 #include <QObject>
 
+#include <string>
+
 class custom_dialog;
 
 class osk_dialog_frame : public QObject, public OskDialogBase

rpcs3/rpcs3qt/persistent_settings.cpp

@@ -1,6 +1,7 @@
-#include "stdafx.h"
 #include "persistent_settings.h"
 
+#include "util/logs.hpp"
+
 LOG_CHANNEL(cfg_log, "CFG");
 
 persistent_settings::persistent_settings(QObject* parent) : settings(parent)

rpcs3/rpcs3qt/qt_utils.cpp

@@ -9,6 +9,7 @@
 #include <QUrl>
 
 #include "Emu/System.h"
+#include "Utilities/File.h"
 
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 constexpr auto qstr = QString::fromStdString;

rpcs3/rpcs3qt/qt_utils.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
+
 #include <QDir>
 #include <QComboBox>
 #include <QFont>
@@ -10,6 +11,8 @@
 #include <QHeaderView>
 #include <QTreeWidgetItem>
 
+#include <string>
+
 namespace gui
 {
 	namespace utils

rpcs3/rpcs3qt/register_editor_dialog.h

@@ -1,11 +1,13 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QDialog>
 #include <QComboBox>
 #include <QLineEdit>
 
+#include <memory>
+
 class CPUDisAsm;
 class cpu_thread;
 

rpcs3/rpcs3qt/rsx_debugger.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QDialog>
 #include <QGroupBox>
@@ -12,6 +12,8 @@
 #include <QTableWidget>
 #include <QTabWidget>
 
+#include <memory>
+
 class gui_settings;
 
 class Buffer : public QGroupBox

rpcs3/rpcs3qt/save_data_dialog.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
 
+#include "util/types.hpp"
+
 class save_data_dialog : public SaveDialogBase
 {
 public:

rpcs3/rpcs3qt/save_data_info_dialog.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "save_data_info_dialog.h"
 
 #include <QPushButton>

rpcs3/rpcs3qt/save_data_list_dialog.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "save_data_list_dialog.h"
 #include "save_data_info_dialog.h"
 #include "gui_settings.h"

rpcs3/rpcs3qt/save_data_list_dialog.h

@@ -1,7 +1,6 @@
 #pragma once
 
-// I just want the struct for the save data.
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
 
@@ -9,6 +8,9 @@
 #include <QDialog>
 #include <QLabel>
 
+#include <vector>
+#include <memory>
+
 class gui_settings;
 class persistent_settings;
 

rpcs3/rpcs3qt/save_manager_dialog.cpp

@@ -21,6 +21,8 @@
 #include <QPainter>
 #include <QScreen>
 
+#include "Utilities/File.h"
+
 LOG_CHANNEL(gui_log, "GUI");
 
 namespace

rpcs3/rpcs3qt/settings.cpp

@@ -2,6 +2,8 @@
 
 #include "qt_utils.h"
 
+#include "Utilities/File.h"
+
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
 settings::settings(QObject* parent) : QObject(parent),

rpcs3/rpcs3qt/settings_dialog.cpp

@@ -22,7 +22,6 @@
 #include "render_creator.h"
 #include "microphone_creator.h"
 
-#include "stdafx.h"
 #include "Emu/GameInfo.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"

rpcs3/rpcs3qt/skylander_dialog.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include <QDialog>
 #include <QPushButton>

rpcs3/rpcs3qt/trophy_manager_dialog.cpp

@@ -5,10 +5,9 @@
 #include "game_list.h"
 #include "gui_settings.h"
 
-#include "stdafx.h"
-
 #include "util/logs.hpp"
 #include "Utilities/StrUtil.h"
+#include "Utilities/File.h"
 #include "Emu/VFS.h"
 #include "Emu/System.h"
 #include "Emu/Cell/Modules/sceNpTrophy.h"

rpcs3/rpcs3qt/trophy_notification_helper.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
 
 #include <QWindow>
+#include <vector>
 
 class trophy_notification_helper : public TrophyNotificationBase
 {

rpcs3/rpcs3qt/update_manager.cpp

@@ -1,11 +1,12 @@
-#include "stdafx.h"
 #include "update_manager.h"
 #include "progress_dialog.h"
 #include "localized.h"
 #include "rpcs3_version.h"
 #include "downloader.h"
 #include "Utilities/StrUtil.h"
+#include "Utilities/File.h"
 #include "Emu/System.h"
+#include "util/logs.hpp"
 
 #include <QApplication>
 #include <QDateTime>
@@ -15,7 +16,9 @@
 #include <QThread>
 
 #if defined(_WIN32)
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <CpuArch.h>
 #include <7z.h>

rpcs3/rpcs3qt/update_manager.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include <QObject>
 #include <QByteArray>
 
+#include <string>
+
 class downloader;
 
 class update_manager final :  public QObject

rpcs3/rpcs3qt/user_manager_dialog.h

@@ -1,10 +1,13 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 #include "user_account.h"
 
 #include <QDialog>
 #include <QTableWidget>
+#include <string>
+#include <memory>
+#include <map>
 
 class gui_settings;
 class persistent_settings;

rpcs3/rpcs3qt/vfs_dialog_tab.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdafx.h"
+#include "util/types.hpp"
 
 #include "gui_settings.h"
 #include "emu_settings.h"
@@ -9,6 +9,8 @@
 #include <QListWidget>
 #include <QLabel>
 
+#include <memory>
+
 namespace cfg
 {
 	class string;

rpcs3/stdafx.cpp

@@ -1,5 +1,4 @@
-// No BOM and only basic ASCII in this file, or a neko will die
-#include "stdafx.h"
+#include "stdafx.h" // No BOM and only basic ASCII in this file, or a neko will die
 
 static_assert(std::endian::native == std::endian::little || std::endian::native == std::endian::big);
 

rpcs3/stdafx.h

@@ -1,7 +1,5 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#define NOMINMAX
-
 #include "util/types.hpp"
 #include "util/atomic.hpp"
 #include "util/endian.hpp"

rpcs3/util/logs.cpp

@@ -14,7 +14,9 @@
 using namespace std::literals::chrono_literals;
 
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <Windows.h>
 #else
 #include <sys/mman.h>

rpcs3_default.props

@@ -13,7 +13,7 @@
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
     </Lib>
     <ClCompile>
-      <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>