diff --git a/Makefile b/Makefile
index 14a1e54fee..151ddf9226 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ SOURCES-$(GL_WAYLAND)           += video/out/wayland_common.c \
 
 SOURCES-$(JACK)                 += audio/out/ao_jack.c
 SOURCES-$(JOYSTICK)             += core/input/joystick.c
-SOURCES-$(LIBQUVI)              += core/quvi.c
+SOURCES-$(LIBQUVI)              += core/resolve_quvi.c
 SOURCES-$(LIRC)                 += core/input/lirc.c
 SOURCES-$(OPENAL)               += audio/out/ao_openal.c
 SOURCES-$(OSS)                  += audio/out/ao_oss.c
diff --git a/core/command.c b/core/command.c
index c39bb3c16d..11ee73ec57 100644
--- a/core/command.c
+++ b/core/command.c
@@ -31,7 +31,7 @@
 #include "stream/stream.h"
 #include "demux/demux.h"
 #include "demux/stheader.h"
-#include "mplayer.h"
+#include "resolve.h"
 #include "playlist.h"
 #include "playlist_parser.h"
 #include "sub/sub.h"
diff --git a/core/mplayer.c b/core/mplayer.c
index 3cdd83021d..fa0723f022 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -68,7 +68,7 @@
 
 #include "core/m_option.h"
 #include "core/m_config.h"
-#include "core/mplayer.h"
+#include "core/resolve.h"
 #include "core/m_property.h"
 
 #include "sub/find_subfiles.h"
diff --git a/core/mplayer.h b/core/resolve.h
similarity index 87%
rename from core/mplayer.h
rename to core/resolve.h
index 825458b6f5..d991bf1a39 100644
--- a/core/mplayer.h
+++ b/core/resolve.h
@@ -16,12 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPLAYER_MPLAYER_H
-#define MPLAYER_MPLAYER_H
-
-#include <stdlib.h>
-
-#include "core/mp_msg.h"
+#ifndef MP_RESOLVE_H
+#define MP_RESOLVE_H
 
 struct MPContext;
 struct MPOpts;
@@ -33,4 +29,4 @@ struct mp_resolve_result {
 
 struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts);
 
-#endif /* MPLAYER_MPLAYER_H */
+#endif
diff --git a/core/quvi.c b/core/resolve_quvi.c
similarity index 99%
rename from core/quvi.c
rename to core/resolve_quvi.c
index e300e2dd03..5870335811 100644
--- a/core/quvi.c
+++ b/core/resolve_quvi.c
@@ -21,7 +21,7 @@
 #include "talloc.h"
 #include "core/mp_msg.h"
 #include "core/options.h"
-#include "mplayer.h"
+#include "resolve.h"
 
 struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
 {
diff --git a/sub/sub.c b/sub/sub.c
index 7eb32d5885..35d9f29326 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -31,7 +31,6 @@
 
 #include "talloc.h"
 #include "core/options.h"
-#include "core/mplayer.h"
 #include "core/mp_msg.h"
 #include "sub.h"
 #include "dec_sub.h"