Merge branch 'master' into master

src/core/CdStream.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#define WITHWINDOWS
 #include "common.h"
 
 #include "CdStream.h"

src/core/Game.cpp

@@ -1,7 +1,5 @@
 #pragma warning( push )
 #pragma warning( disable : 4005)
-#define DIRECTINPUT_VERSION 0x0800
-#include <dinput.h>
 #pragma warning( pop )
 #include "common.h"
 #include "win.h"

src/core/Timer.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#define WITHWINDOWS
 #include "common.h"
 
 #include "DMAudio.h"

src/core/re3.cpp

@@ -1,6 +1,6 @@
 #include <direct.h>
 #include <csignal>
-#include <windows.h>
+#define WITHWINDOWS
 #include "common.h"
 #include "patcher.h"
 #include "Renderer.h"