diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index f1800f279c..651589c34f 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -30,7 +30,7 @@
 #include "audio/format.h"
 #include "mpvcore/mp_msg.h"
 #include "ao.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 
 #define PULSE_CLIENT_NAME "mpv"
 
diff --git a/mpvcore/input/input.c b/input/input.c
similarity index 99%
rename from mpvcore/input/input.c
rename to input/input.c
index 18b254d17b..c7b27240c7 100644
--- a/mpvcore/input/input.c
+++ b/input/input.c
@@ -645,7 +645,7 @@ const m_option_t mp_input_opts[] = {
 static int default_cmd_func(int fd, char *buf, int l);
 
 static const char builtin_input_conf[] =
-#include "mpvcore/input/input_conf.h"
+#include "input/input_conf.h"
 ;
 
 static bool test_rect(struct mp_rect *rc, int x, int y)
diff --git a/mpvcore/input/input.h b/input/input.h
similarity index 100%
rename from mpvcore/input/input.h
rename to input/input.h
diff --git a/mpvcore/input/joystick.c b/input/joystick.c
similarity index 100%
rename from mpvcore/input/joystick.c
rename to input/joystick.c
diff --git a/mpvcore/input/joystick.h b/input/joystick.h
similarity index 100%
rename from mpvcore/input/joystick.h
rename to input/joystick.h
diff --git a/mpvcore/input/keycodes.h b/input/keycodes.h
similarity index 100%
rename from mpvcore/input/keycodes.h
rename to input/keycodes.h
diff --git a/mpvcore/input/lirc.c b/input/lirc.c
similarity index 100%
rename from mpvcore/input/lirc.c
rename to input/lirc.c
diff --git a/mpvcore/input/lirc.h b/input/lirc.h
similarity index 100%
rename from mpvcore/input/lirc.h
rename to input/lirc.h
diff --git a/old-makefile b/old-makefile
index 6241a10f61..29ce5e19f3 100644
--- a/old-makefile
+++ b/old-makefile
@@ -104,10 +104,10 @@ SOURCES-$(GL_WAYLAND)           += video/out/wayland_common.c \
                                    video/out/gl_wayland.c
 
 SOURCES-$(JACK)                 += audio/out/ao_jack.c
-SOURCES-$(JOYSTICK)             += mpvcore/input/joystick.c
+SOURCES-$(JOYSTICK)             += input/joystick.c
 SOURCES-$(LIBQUVI)              += mpvcore/resolve_quvi.c
 SOURCES-$(LIBQUVI9)             += mpvcore/resolve_quvi9.c
-SOURCES-$(LIRC)                 += mpvcore/input/lirc.c
+SOURCES-$(LIRC)                 += input/lirc.c
 SOURCES-$(OPENAL)               += audio/out/ao_openal.c
 SOURCES-$(OSS)                  += audio/out/ao_oss.c
 SOURCES-$(PULSE)                += audio/out/ao_pulse.c
@@ -192,6 +192,7 @@ SOURCES = audio/audio.c \
           demux/demux_subreader.c \
           demux/ebml.c \
           demux/mf.c \
+          input/input.c \
           mpvcore/asxparser.c \
           mpvcore/av_common.c \
           mpvcore/av_log.c \
@@ -213,7 +214,6 @@ SOURCES = audio/audio.c \
           mpvcore/playlist.c \
           mpvcore/playlist_parser.c \
           mpvcore/version.c \
-          mpvcore/input/input.c \
           osdep/io.c \
           osdep/numcores.c \
           osdep/timer.c \
@@ -335,11 +335,12 @@ DIRS =  . \
         audio/filter \
         audio/out \
         mpvcore \
-        mpvcore/input \
-        mpvcore/timeline \
+        input \
+        timeline \
         demux \
         osdep \
         osdep/ar \
+        player \
         stream \
         sub \
         video \
@@ -391,8 +392,8 @@ mpv$(EXESUF): $(OBJECTS)
 mpv$(EXESUF):
 	$(CC) -o $@ $^ $(EXTRALIBS)
 
-mpvcore/input/input.c: mpvcore/input/input_conf.h
-mpvcore/input/input_conf.h: TOOLS/file2string.pl etc/input.conf
+input/input.c: input/input_conf.h
+input/input_conf.h: TOOLS/file2string.pl etc/input.conf
 	./$^ >$@
 
 MKVLIB_DEPS = TOOLS/lib/Parse/Matroska.pm \
@@ -525,7 +526,7 @@ clean:
 	-$(RM) $(call ADDSUFFIXES,.pdf .tex .log .aux .out .toc,DOCS/man/*/mpv)
 	-$(RM) DOCS/man/*/mpv.1
 	-$(RM) version.h
-	-$(RM) mpvcore/input/input_conf.h
+	-$(RM) input/input_conf.h
 	-$(RM) video/out/vdpau_template.c
 	-$(RM) demux/ebml_types.h demux/ebml_defs.c
 	-$(RM) video/out/gl_video_shaders.h
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index c76f0b32cb..166084d425 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <windows.h>
-#include "mpvcore/input/keycodes.h"
-#include "mpvcore/input/input.h"
+#include "input/keycodes.h"
+#include "input/input.h"
 #include "getch2.h"
 
 int mp_input_slave_cmd_func(int fd, char *dest, int size)
diff --git a/osdep/getch2.c b/osdep/getch2.c
index b189a678db..e07594170a 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -43,8 +43,8 @@
 
 #include "mpvcore/mp_common.h"
 #include "mpvcore/bstr.h"
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "input/input.h"
+#include "input/keycodes.h"
 #include "getch2.h"
 
 #if HAVE_TERMIOS
diff --git a/osdep/macosx_events.h b/osdep/macosx_events.h
index dcb96d2d43..a4b122f534 100644
--- a/osdep/macosx_events.h
+++ b/osdep/macosx_events.h
@@ -19,7 +19,7 @@
 
 #ifndef MACOSX_EVENTS_H
 #define MACOSX_EVENTS_H
-#include "mpvcore/input/keycodes.h"
+#include "input/keycodes.h"
 
 void cocoa_put_key(int keycode);
 void cocoa_put_key_with_modifiers(int keycode, int modifiers);
diff --git a/player/command.c b/player/command.c
index 8701fff1ec..d626e0c4a3 100644
--- a/player/command.c
+++ b/player/command.c
@@ -33,7 +33,7 @@
 #include "command.h"
 #include "osdep/timer.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
 #include "demux/stheader.h"
diff --git a/player/dvdnav.c b/player/dvdnav.c
index f00274a7d0..6aad6f77ac 100644
--- a/player/dvdnav.c
+++ b/player/dvdnav.c
@@ -22,7 +22,7 @@
 
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 
 #include "stream/stream_dvdnav.h"
 
diff --git a/player/loadfile.c b/player/loadfile.c
index b1d4555269..603d48b988 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -40,7 +40,7 @@
 #include "mpvcore/mp_common.h"
 #include "mpvcore/resolve.h"
 #include "mpvcore/encode.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 
 #include "audio/mixer.h"
 #include "audio/audio.h"
diff --git a/player/lua.c b/player/lua.c
index d000c85c5f..c72e1b7d1b 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -11,7 +11,7 @@
 #include "mpvcore/m_property.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/m_option.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 #include "mpvcore/path.h"
 #include "mpvcore/bstr.h"
 #include "osdep/timer.h"
diff --git a/player/main.c b/player/main.c
index d590afc42a..d2b7d9dd61 100644
--- a/player/main.c
+++ b/player/main.c
@@ -48,7 +48,7 @@
 #include "mpvcore/playlist.h"
 #include "mpvcore/playlist_parser.h"
 #include "mpvcore/options.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 
 #include "audio/decode/dec_audio.h"
 #include "audio/out/ao.h"
diff --git a/player/misc.c b/player/misc.c
index 5f7d252551..68728295d4 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -33,7 +33,7 @@
 #include "mpvcore/resolve.h"
 #include "mpvcore/encode.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 
 #include "audio/out/ao.h"
 #include "demux/demux.h"
diff --git a/player/playloop.c b/player/playloop.c
index a2a577ced9..9bfd2f82a4 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -31,7 +31,7 @@
 #include "mpvcore/encode.h"
 #include "mpvcore/m_property.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 
 #include "osdep/timer.h"
 
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index d85853e723..88c94f3f26 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -30,7 +30,7 @@
 
 #include "mpvcore/options.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 #include "mpvcore/m_option.h"
 #include "osdep/timer.h"
 #include "stream.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index 0eb04a6d1f..ee746b0376 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -36,7 +36,7 @@
 #include "mpvcore/bstr.h"
 #include "vo.h"
 #include "aspect.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 #include "mpvcore/m_config.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mpv_global.h"
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index fabf5c7948..89f52a8937 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -40,10 +40,10 @@
 #include "video/vfcap.h"
 #include "video/memcpy_pic.h"
 
-#include "mpvcore/input/keycodes.h"
-#include "mpvcore/input/input.h"
+#include "input/keycodes.h"
+#include "input/input.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 
 /* caca stuff */
 static caca_canvas_t  *canvas;
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index 384df54b3a..91e6bd9daf 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -30,9 +30,9 @@
 
 #include <SDL.h>
 
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
+#include "input/keycodes.h"
+#include "input/input.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/options.h"
 
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index 6c5ebe1703..f619a2915c 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -23,14 +23,14 @@
 #include <windowsx.h>
 
 #include "mpvcore/options.h"
-#include "mpvcore/input/keycodes.h"
-#include "mpvcore/input/input.h"
+#include "input/keycodes.h"
+#include "input/input.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mp_common.h"
 #include "vo.h"
 #include "aspect.h"
 #include "w32_common.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 #include "osdep/io.h"
 #include "talloc.h"
 
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index e18e22c7af..d6be563a33 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -43,8 +43,8 @@
 #include "aspect.h"
 #include "osdep/timer.h"
 
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "input/input.h"
+#include "input/keycodes.h"
 
 #define MOD_SHIFT_MASK      0x01
 #define MOD_ALT_MASK        0x02
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index e1c67b177a..4187fa21cc 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -26,7 +26,7 @@
 #include "mpvcore/bstr.h"
 #include "mpvcore/options.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 #include "libavutil/common.h"
 #include "x11_common.h"
 #include "talloc.h"
@@ -70,8 +70,8 @@
 #include <zlib.h>
 #endif
 
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "input/input.h"
+#include "input/keycodes.h"
 
 #define vo_wm_LAYER 1
 #define vo_wm_FULLSCREEN 2
diff --git a/wscript_build.py b/wscript_build.py
index 703ade0d61..8142ff87c5 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -60,7 +60,7 @@ def build(ctx):
 
     ctx.file2string(
         source = "etc/input.conf",
-        target = "mpvcore/input/input_conf.h")
+        target = "input/input_conf.h")
 
     ctx.file2string(
         source = "video/out/gl_video_shaders.glsl",
@@ -163,9 +163,6 @@ def build(ctx):
         ( "audio/out/ao_wasapi.c",               "wasapi" ),
 
         ## Core
-        ( "mpvcore/input/input.c" ),
-        ( "mpvcore/input/joystick.c",            "joystick" ),
-        ( "mpvcore/input/lirc.c",                "lirc" ),
         ( "mpvcore/asxparser.c" ),
         ( "mpvcore/av_common.c" ),
         ( "mpvcore/av_log.c" ),
@@ -206,6 +203,11 @@ def build(ctx):
         ( "demux/ebml.c" ),
         ( "demux/mf.c" ),
 
+        ## Input
+        ( "input/input.c" ),
+        ( "input/joystick.c",                    "joystick" ),
+        ( "input/lirc.c",                        "lirc" ),
+
         ## Player
         ( "player/audio.c" ),
         ( "player/command.c" ),