diff --git a/Makefile.common b/Makefile.common
index c36f6bf9df..c6f5062416 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -511,3 +511,8 @@ ifeq ($(HAVE_NETPLAY), 1)
       LIBS += -lws2_32
    endif
 endif
+
+ifneq ($(findstring Win32,$(OS)),)
+OBJ +=	media/rarch.o \
+			gfx/context/win32_common.o
+endif
diff --git a/Makefile.win b/Makefile.win
index 51a0ad9984..0ec61c7c00 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -61,9 +61,6 @@ LDFLAGS          := -L. -static-libgcc
 
 include Makefile.common
 
-OBJ +=	media/rarch.o \
-			gfx/context/win32_common.o
-
 JOYCONFIG_OBJ += conf/config_file.o \
 	tools/retroarch-joyconfig.o \
 	compat/compat.o \