diff --git a/Makefile.common b/Makefile.common
index c6f5062416..e811f47ba9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -281,7 +281,8 @@ endif
 
 ifeq ($(HAVE_WINXINPUT), 1)
    DEFINES += -DHAVE_WINXINPUT
-   OBJ += input/winxinput_joypad.o
+   OBJ += input/winxinput_joypad.o \
+          input/autoconf/builtin_win.o
    JOYCONFIG_OBJ += input/winxinput_joypad.o
 endif
 
@@ -374,8 +375,7 @@ ifeq ($(HAVE_OPENGL), 1)
          LIBS += -framework OpenGL
       else ifneq ($(findstring Win32,$(OS)),)
          LIBS += -lopengl32 -lgdi32 -lcomdlg32
-         OBJ += gfx/context/wgl_ctx.o \
-					 gfx/context/win32_common.o
+         OBJ += gfx/context/wgl_ctx.o
       else
          LIBS += -lGL
       endif
diff --git a/Makefile.win b/Makefile.win
index 0ec61c7c00..b040ead608 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -52,6 +52,7 @@ PYTHON_CFLAGS    := -DHAVE_PYTHON -Ipython
 
 OBJDIR           := obj-w32
 
+OS               := Win32
 OBJ              :=
 JOYCONFIG_OBJ    :=
 LIBS             := -lm
diff --git a/input/input_common.c b/input/input_common.c
index 897e7f403d..ded16967cf 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -1450,7 +1450,7 @@ void input_config_autoconfigure_joypad(unsigned index,
    /* false = load from both cfg files and internal */
    bool internal_only = !*g_settings.input.autoconfig_dir;
 
-#ifdef HAVE_BUILTIN_AUTOCONFIG
+#if defined(HAVE_BUILTIN_AUTOCONFIG) && (!defined(_WIN32) || defined(HAVE_WINXINPUT))
    /* First internal */
    for (i = 0; input_builtin_autoconfs[i]; i++)
    {