1 files changed, 6 insertions, 8 deletions
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
index f117c047..7d0e1073 100644
--- a/src/core/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#if defined RW_D3D9 || defined RWLIBS
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#endif
 
 // based on x-gtasa
 
@@ -126,14 +130,8 @@ public:
 	GlfwJoyState           m_OldState;
 	GlfwJoyState           m_NewState;
 #else
-	#ifdef __DINPUT_INCLUDED__
-		DIJOYSTATE2           m_OldState;
-		DIJOYSTATE2           m_NewState;
-	#else
-		// this is here to fix the size of a struct
-		// TODO: find a better was a remove this
-		uint32 ___padd[0x110 / 4 * 2];
-	#endif
+	DIJOYSTATE2           m_OldState;
+	DIJOYSTATE2           m_NewState;
 #endif
 	wchar                 m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH];
 	bool                  m_aButtonStates[MAX_BUTTONS];