diff --git a/Makefile b/Makefile
index d7dddb2579..23b87b0fa5 100644
--- a/Makefile
+++ b/Makefile
@@ -36,11 +36,6 @@ RETROLAUNCH_OBJ = tools/retrolaunch/main.o \
 
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
 
-ifeq ($(REENTRANT_TEST), 1)
-   DEFINES += -Dmain=retroarch_main
-   OBJ += console/test.o
-endif
-
 ifeq ($(HAVE_DYLIB), 1)
    LIBS += $(DYLIB_LIB)
 endif
@@ -60,12 +55,6 @@ ifeq ($(HAVE_ZLIB), 1)
    DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE -DHAVE_ZLIB
 endif
 
-ifeq ($(HAVE_FFMPEG), 1)
-   OBJ += record/ffmpeg.o
-   LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS)
-   DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
-endif
-
 ifeq ($(HAVE_DYNAMIC), 1)
    LIBS += $(DYLIB_LIB)
 else
diff --git a/Makefile.common b/Makefile.common
index b89adad6fb..ba22accfae 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -31,6 +31,11 @@ ifeq ($(TDM_GCC),)
    LDCXXFLAGS += -static-libstdc++
 endif
 
+ifeq ($(REENTRANT_TEST), 1)
+   DEFINES += -Dmain=retroarch_main
+   OBJ += console/test.o
+endif
+
 # System
 
 ifneq ($(findstring BSD,$(OS)),)
@@ -127,7 +132,6 @@ OBJ += frontend/frontend.o \
 
 ifeq ($(HAVE_STDIN_CMD), 1)
    DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD
-   OBJ += command.o
 endif
 
 ifeq ($(HAVE_PYTHON), 1)
@@ -525,3 +529,12 @@ ifneq ($(findstring Win32,$(OS)),)
 OBJ +=	media/rarch.o \
 			gfx/context/win32_common.o
 endif
+
+# Record
+
+ifeq ($(HAVE_FFMPEG), 1)
+   OBJ += record/ffmpeg.o
+   LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(FFMPEG_LIBS)
+   DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
+	DEFINES += -DHAVE_FFMPEG -Iffmpeg
+endif
diff --git a/Makefile.win b/Makefile.win
index 65004044ce..1b0fb13257 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -50,6 +50,12 @@ RSOUND_LIBS      := -lrsound
 PYTHON_LIBS      := -lpython32
 PYTHON_CFLAGS    := -DHAVE_PYTHON -Ipython
 
+AVCODEC_LIBS     := -lavcodec
+AVUTIL_LIBS      := -lavutil
+SWSCALE_LIBS     := -lswscale
+AVFORMAT_LIBS    := -lavformat
+FFMPEG_LIBS      := -lws2_32 -lz
+
 OBJDIR           := obj-w32
 
 OS               := Win32
@@ -109,12 +115,6 @@ else
    LIBS += $(libretro)
 endif
 
-ifeq ($(HAVE_FFMPEG), 1)
-   OBJ += record/ffmpeg.o
-   LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lz
-   DEFINES += -DHAVE_FFMPEG -Iffmpeg
-endif
-
 ifneq ($(V), 1)
    Q := @
 endif