From b8be2efa978fde29350774a9ca03356d535a0bf2 Mon Sep 17 00:00:00 2001
From: darkf <>
Date: Mon, 6 Apr 2020 00:54:21 -0700
Subject: [PATCH] Include missing headers

---
 src/common/crypto/EmuRsa.h            | 2 ++
 src/common/input/InputManager.h       | 1 +
 src/common/input/SdlJoystick.h        | 1 +
 src/common/util/CxbxUtil.cpp          | 3 ++-
 src/common/util/strConverter.hpp      | 1 +
 src/common/xdvdfs-tools/xdvdfs.cpp    | 5 +++--
 src/core/hle/D3D8/XbVertexBuffer.h    | 1 +
 src/core/kernel/exports/EmuKrnlPs.cpp | 3 ++-
 src/devices/usb/Hub.cpp               | 3 ++-
 src/devices/usb/USBDevice.cpp         | 3 ++-
 src/devices/usb/XidGamepad.cpp        | 1 +
 src/gui/DlgEepromConfig.cpp           | 3 ++-
 12 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/common/crypto/EmuRsa.h b/src/common/crypto/EmuRsa.h
index daacaa194..2faef42cf 100644
--- a/src/common/crypto/EmuRsa.h
+++ b/src/common/crypto/EmuRsa.h
@@ -26,6 +26,8 @@
 #ifndef EMURSA_H
 #define EMURSA_H
 
+#include <cstdlib> // For size_t
+
 #pragma pack(4)
 
 typedef union _RSA_PUBLIC_KEY
diff --git a/src/common/input/InputManager.h b/src/common/input/InputManager.h
index 44468bc1e..60776d7fe 100644
--- a/src/common/input/InputManager.h
+++ b/src/common/input/InputManager.h
@@ -28,6 +28,7 @@
 #ifndef INPUTMANAGER_H_
 #define INPUTMANAGER_H_
 
+#include <thread>
 #include "InputDevice.h"
 #include "EmuDevice.h"
 
diff --git a/src/common/input/SdlJoystick.h b/src/common/input/SdlJoystick.h
index be2658001..9cd646710 100644
--- a/src/common/input/SdlJoystick.h
+++ b/src/common/input/SdlJoystick.h
@@ -30,6 +30,7 @@
 
 #include "InputDevice.h"
 #include <SDL_haptic.h>
+#include <thread>
 
 
 namespace Sdl
diff --git a/src/common/util/CxbxUtil.cpp b/src/common/util/CxbxUtil.cpp
index 238a0b97f..09caf894d 100644
--- a/src/common/util/CxbxUtil.cpp
+++ b/src/common/util/CxbxUtil.cpp
@@ -49,7 +49,8 @@
 
 
 // The intent of this file is to add general functions which are not kernel specific (for those CxbxKrnl.h should be used instead)
-
+
+#include <cstring> // For memcpy
 #include "common\util\CxbxUtil.h"
 #include "core\kernel\init\CxbxKrnl.h"
 
diff --git a/src/common/util/strConverter.hpp b/src/common/util/strConverter.hpp
index b75a292d4..3b41ae8ec 100644
--- a/src/common/util/strConverter.hpp
+++ b/src/common/util/strConverter.hpp
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <string>
+#include <cstring>
 #include <SDL_stdinc.h>
 
 // Depending on what type of UTF-8 string is input, otherwise will use native by default.
diff --git a/src/common/xdvdfs-tools/xdvdfs.cpp b/src/common/xdvdfs-tools/xdvdfs.cpp
index 7f8fbd90f..f8c65e848 100644
--- a/src/common/xdvdfs-tools/xdvdfs.cpp
+++ b/src/common/xdvdfs-tools/xdvdfs.cpp
@@ -1,8 +1,9 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstddef>
 #include <sys/types.h>
 
 #include "xdvdfs.h"
diff --git a/src/core/hle/D3D8/XbVertexBuffer.h b/src/core/hle/D3D8/XbVertexBuffer.h
index 848bf7773..d81224acc 100644
--- a/src/core/hle/D3D8/XbVertexBuffer.h
+++ b/src/core/hle/D3D8/XbVertexBuffer.h
@@ -26,6 +26,7 @@
 #define XBVERTEXBUFFER_H
 
 #include <unordered_map>
+#include <list>
 
 #include "Cxbx.h"
 
diff --git a/src/core/kernel/exports/EmuKrnlPs.cpp b/src/core/kernel/exports/EmuKrnlPs.cpp
index f9214d0da..5f8ff46a9 100644
--- a/src/core/kernel/exports/EmuKrnlPs.cpp
+++ b/src/core/kernel/exports/EmuKrnlPs.cpp
@@ -35,7 +35,8 @@ namespace xboxkrnl
 #include <xboxkrnl/xboxkrnl.h> // For PsCreateSystemThreadEx, etc.
 };
 
-#include <process.h> // For __beginthreadex(), etc.
+#include <process.h> // For __beginthreadex(), etc.
+#include <float.h> // For _controlfp constants
 
 #include "Logging.h" // For LOG_FUNC()
 #include "EmuKrnlLogging.h"
diff --git a/src/devices/usb/Hub.cpp b/src/devices/usb/Hub.cpp
index 3253d136c..97f0865ed 100644
--- a/src/devices/usb/Hub.cpp
+++ b/src/devices/usb/Hub.cpp
@@ -60,7 +60,8 @@ namespace xboxkrnl
 {
 	#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 };
-
+
+#include <cstring> // For memcpy
 #include "OHCI.h"
 #include "Hub.h"
 #include "core\kernel\exports\EmuKrnl.h"  // For EmuLog
diff --git a/src/devices/usb/USBDevice.cpp b/src/devices/usb/USBDevice.cpp
index 50b16bf41..cb3371894 100644
--- a/src/devices/usb/USBDevice.cpp
+++ b/src/devices/usb/USBDevice.cpp
@@ -62,7 +62,8 @@ namespace xboxkrnl
 {
 	#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 };
-
+
+#include <cstring>
 #include "USBDevice.h"
 #include "OHCI.h"
 #include "core\kernel\exports\EmuKrnl.h"  // For EmuLog
diff --git a/src/devices/usb/XidGamepad.cpp b/src/devices/usb/XidGamepad.cpp
index 0901654b6..22997f4fb 100644
--- a/src/devices/usb/XidGamepad.cpp
+++ b/src/devices/usb/XidGamepad.cpp
@@ -58,6 +58,7 @@ namespace xboxkrnl
 	#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
 };
 
+#include <cstring>
 #include "XidGamepad.h"
 #include "USBDevice.h"
 #include "common\input\InputManager.h"
diff --git a/src/gui/DlgEepromConfig.cpp b/src/gui/DlgEepromConfig.cpp
index a95720da7..1f7964881 100644
--- a/src/gui/DlgEepromConfig.cpp
+++ b/src/gui/DlgEepromConfig.cpp
@@ -25,7 +25,8 @@
 // *
 // ******************************************************************
 
-#include <fstream>
+#include <fstream>
+#include <cstring> // For memcpy
 #include "EmuEEPROM.h" // For EEPROMInfo, EEPROMInfos
 #include "core\kernel\init\CxbxKrnl.h"
 #include "DlgEepromConfig.h"