diff --git a/Makefile.common b/Makefile.common
index 2428402d2d..5afd751391 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -374,8 +374,8 @@ ifeq ($(HAVE_DINPUT), 1)
    JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32
 endif
 
-ifeq ($(HAVE_WINXINPUT), 1)
-   DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG
+ifeq ($(HAVE_XINPUT), 1)
+   DEFINES += -DHAVE_XINPUT -DHAVE_BUILTIN_AUTOCONFIG
    OBJ += input/drivers_joypad/xinput_joypad.o \
           input/autoconf/builtin_win.o
 endif
diff --git a/Makefile.win b/Makefile.win
index 5f41ec11e3..50edf7f35a 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -20,7 +20,7 @@ HAVE_ZLIB_DEFLATE = 1
 HAVE_PYTHON = 0
 DYNAMIC = 1
 
-HAVE_WINXINPUT = 1
+HAVE_XINPUT = 1
 
 HAVE_SDL      := 0
 HAVE_SDL2     := 0
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 2f7067bc2f..ccfeb89c53 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -838,7 +838,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
    
    g_pads[g_joypad_cnt].joy_name = strdup(inst->tszProductName);
    
-#ifdef HAVE_WINXINPUT
+#ifdef HAVE_XINPUT
 #if 0
    is_xinput_pad = g_xinput_block_pads 
       && name_is_xinput_pad(inst->tszProductName);
@@ -861,7 +861,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
    IDirectInputDevice8_EnumObjects(*pad, enum_axes_cb, 
          *pad, DIDFT_ABSAXIS);
          
-#ifdef HAVE_WINXINPUT
+#ifdef HAVE_XINPUT
    if (!is_xinput_pad)
 #endif
    {
diff --git a/input/input_joypad_driver.c b/input/input_joypad_driver.c
index e308ce6293..314fee7b31 100644
--- a/input/input_joypad_driver.c
+++ b/input/input_joypad_driver.c
@@ -26,7 +26,7 @@ static rarch_joypad_driver_t *joypad_drivers[] = {
 #ifdef __CELLOS_LV2__
    &ps3_joypad,
 #endif
-#ifdef HAVE_WINXINPUT
+#ifdef HAVE_XINPUT
    &xinput_joypad,
 #endif
 #ifdef GEKKO
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index af6fff3b28..d53076880f 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -219,7 +219,7 @@ if [ "$OS" = 'Win32' ]; then
    check_lib DSOUND -ldsound
 
    if [ "$HAVE_DINPUT" != 'no' ]; then
-      HAVE_WINXINPUT=yes
+      HAVE_XINPUT=yes
    fi
 
    HAVE_XAUDIO=yes
diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c
index a7901e92a1..c8fa9820f7 100644
--- a/tools/retroarch-joyconfig-griffin.c
+++ b/tools/retroarch-joyconfig-griffin.c
@@ -25,7 +25,7 @@
 #include "../input/drivers/dinput.c"
 #endif
 
-#if defined(HAVE_WINXINPUT)
+#if defined(HAVE_XINPUT)
 #include "../input/drivers_joypad/xinput_joypad.c"
 #endif