diff --git a/Makefile.common b/Makefile.common
index 5241f12a9f..efb03f724a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -206,8 +206,9 @@ OBJ += \
        $(LIBRETRO_COMM_DIR)/streams/file_stream_transforms.o \
        $(LIBRETRO_COMM_DIR)/streams/interface_stream.o \
        $(LIBRETRO_COMM_DIR)/streams/memory_stream.o \
-       $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.o \
-       $(LIBRETRO_COMM_DIR)/media/media_detect_cd.o \
+       $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.o
+
+OBJ += \
        $(LIBRETRO_COMM_DIR)/lists/string_list.o \
        $(LIBRETRO_COMM_DIR)/string/stdstring.o \
        $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
@@ -1778,7 +1779,8 @@ ifeq ($(HAVE_CDROM), 1)
 
    DEFINES += -DHAVE_CDROM
    OBJ += $(LIBRETRO_COMM_DIR)/cdrom/cdrom.o \
-       $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_cdrom.o
+			 $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_cdrom.o \
+			 $(LIBRETRO_COMM_DIR)/media/media_detect_cd.o
 endif
 
 ifeq ($(HAVE_RTGA), 1)