diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index 1a9f6325eb..b04e739790 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -34,6 +34,7 @@
 #include "../input_driver.h"
 #include "../input_keymaps.h"
 #include "../../verbosity.h"
+#include "dinput_joypad.h"
 
 struct dinput_joypad
 {
@@ -63,7 +64,7 @@ extern bool g_xinput_block_pads;
 extern int g_xinput_pad_indexes[MAX_USERS];
 extern LPDIRECTINPUT8 g_dinput_ctx;
 
-bool dinput_joypad_get_vidpid_from_xinput_index(int index, int *vid, int *pid, int *dinput_index)
+bool dinput_joypad_get_vidpid_from_xinput_index(int32_t index, int32_t *vid, int32_t *pid, int32_t *dinput_index)
 {
    int i;
 
diff --git a/input/drivers_joypad/dinput_joypad.h b/input/drivers_joypad/dinput_joypad.h
index e7705bfa30..12d491f3b9 100644
--- a/input/drivers_joypad/dinput_joypad.h
+++ b/input/drivers_joypad/dinput_joypad.h
@@ -18,11 +18,13 @@
 #ifndef __DINPUT_JOYPAD_H
 #define __DINPUT_JOYPAD_H
 
+#include <stdint.h>
+#include <boolean.h>
 #include <retro_common_api.h>
 
 RETRO_BEGIN_DECLS
 
-bool dinput_joypad_get_vidpid_from_xinput_index(int index, int *vid, int *pid, int *dinput_index);
+bool dinput_joypad_get_vidpid_from_xinput_index(int32_t index, int32_t *vid, int32_t *pid, int32_t *dinput_index);
 
 RETRO_END_DECLS
 
diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c
index 524d461160..f7eb8bd347 100644
--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@@ -278,11 +278,12 @@ static bool xinput_joypad_init(void *data)
 
       if (pad_index_to_xuser_index(j) > -1)
       {
-         int vid          = 0;
-         int pid          = 0;
+         int32_t vid          = 0;
+         int32_t pid          = 0;
 #ifdef HAVE_DINPUT
-         int dinput_index = 0;
-         bool success     = dinput_joypad_get_vidpid_from_xinput_index(pad_index_to_xuser_index(j), &vid, &pid, &dinput_index);
+         int32_t dinput_index = 0;
+         bool success     = dinput_joypad_get_vidpid_from_xinput_index((int32_t)pad_index_to_xuser_index(j), (int32_t*)&vid, (int32_t*)&pid,
+			 (int32_t*)&dinput_index);
 
          if (success)
             RARCH_LOG("[XInput]: Found VID/PID (%04X/%04X) from DINPUT index %d for \"%s\", user #%u\n",