diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index edbbf22787..8747ffedcc 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -20,6 +20,7 @@ SRCS += parse_es.c \
         mpeg_packetizer.c \
         yuv4mpeg.c \
         yuv4mpeg_ratio.c \
+        mf.c \
 
 # Demuxers
 SRCS += demuxer.c \
diff --git a/stream/mf.c b/libmpdemux/mf.c
similarity index 100%
rename from stream/mf.c
rename to libmpdemux/mf.c
diff --git a/stream/mf.h b/libmpdemux/mf.h
similarity index 100%
rename from stream/mf.h
rename to libmpdemux/mf.h
diff --git a/stream/Makefile b/stream/Makefile
index f4e04fbcbe..b63317347d 100644
--- a/stream/Makefile
+++ b/stream/Makefile
@@ -4,8 +4,7 @@ LIBNAME = stream.a
 include ../config.mak
 
 # Core
-SRCS += mf.c \
-        open.c \
+SRCS += open.c \
         url.c \
 
 ifeq ($(STREAM_CACHE),yes)