diff --git a/include/core/dispatch.hpp b/include/core/dispatch.hpp
index 72dc0869..3af66fe3 100644
--- a/include/core/dispatch.hpp
+++ b/include/core/dispatch.hpp
@@ -1,7 +1,6 @@
 #ifndef _dispatch__hpp__included__
 #define _dispatch__hpp__included__
 
-#include "core/keymapper.hpp"
 #include "library/framebuffer.hpp"
 #include "library/dispatch.hpp"
 
diff --git a/include/core/window.hpp b/include/core/window.hpp
index a4488137..1fa52567 100644
--- a/include/core/window.hpp
+++ b/include/core/window.hpp
@@ -1,9 +1,9 @@
 #ifndef _window__hpp__included__
 #define _window__hpp__included__
 
-#include "core/keymapper.hpp"
 #include "core/rom.hpp"
 #include "interface/romtype.hpp"
+#include "library/keyboard.hpp"
 #include "library/messagebuffer.hpp"
 #include "library/emustatus.hpp"
 #include "library/framebuffer.hpp"
diff --git a/include/lua/lua.hpp b/include/lua/lua.hpp
index 036277b1..bfe765f3 100644
--- a/include/lua/lua.hpp
+++ b/include/lua/lua.hpp
@@ -2,9 +2,9 @@
 #define _lua__hpp__included__
 
 #include "core/controllerframe.hpp"
-#include "core/keymapper.hpp"
 #include "core/movie.hpp"
 #include "library/framebuffer.hpp"
+#include "library/keyboard.hpp"
 #include "library/lua-framebuffer.hpp"
 
 void init_lua() throw();
diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index 5d8235b8..3c4b40db 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -4,6 +4,7 @@
 #include "core/controller.hpp"
 #include "core/dispatch.hpp"
 #include "core/framebuffer.hpp"
+#include "core/keymapper.hpp"
 #include "core/mainloop.hpp"
 #include "core/misc.hpp"
 #include "core/moviedata.hpp"
diff --git a/src/core/dispatch.cpp b/src/core/dispatch.cpp
index 3eef76d5..a9df22cb 100644
--- a/src/core/dispatch.cpp
+++ b/src/core/dispatch.cpp
@@ -1,5 +1,6 @@
 #include "core/dispatch.hpp"
 #include "library/globalwrap.hpp"
+#include "core/keymapper.hpp"
 #include "core/misc.hpp"
 
 #include <sstream>
diff --git a/src/core/framebuffer.cpp b/src/core/framebuffer.cpp
index 4ae58e06..7fcded4d 100644
--- a/src/core/framebuffer.cpp
+++ b/src/core/framebuffer.cpp
@@ -1,12 +1,13 @@
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
 #include "core/framebuffer.hpp"
-#include "core/subtitles.hpp"
-#include "lua/lua.hpp"
+#include "core/keymapper.hpp"
 #include "core/misc.hpp"
-#include "core/window.hpp"
 #include "core/moviedata.hpp"
 #include "core/moviefile.hpp"
+#include "core/subtitles.hpp"
+#include "core/window.hpp"
+#include "lua/lua.hpp"
 #include "fonts/wrapper.hpp"
 #include "library/framebuffer.hpp"
 #include "library/pixfmt-lrgb.hpp"
diff --git a/src/core/mainloop.cpp b/src/core/mainloop.cpp
index a475695a..5ade24c3 100644
--- a/src/core/mainloop.cpp
+++ b/src/core/mainloop.cpp
@@ -8,6 +8,7 @@
 #include "core/framebuffer.hpp"
 #include "core/framerate.hpp"
 #include "core/inthread.hpp"
+#include "core/keymapper.hpp"
 #include "core/multitrack.hpp"
 #include "lua/lua.hpp"
 #include "library/string.hpp"
diff --git a/src/core/multitrack.cpp b/src/core/multitrack.cpp
index f67b4fe0..fec628dc 100644
--- a/src/core/multitrack.cpp
+++ b/src/core/multitrack.cpp
@@ -2,6 +2,7 @@
 #include "core/command.hpp"
 #include "core/controller.hpp"
 #include "core/dispatch.hpp"
+#include "core/keymapper.hpp"
 #include "core/moviedata.hpp"
 #include "core/multitrack.hpp"
 #include "lua/internal.hpp"
diff --git a/src/core/window.cpp b/src/core/window.cpp
index b31f06f4..8c9ba266 100644
--- a/src/core/window.cpp
+++ b/src/core/window.cpp
@@ -3,6 +3,7 @@
 #include "core/dispatch.hpp"
 #include "core/framerate.hpp"
 #include "core/joystickapi.hpp"
+#include "core/keymapper.hpp"
 #include "lua/lua.hpp"
 #include "core/misc.hpp"
 #include "core/window.hpp"
diff --git a/src/platform/wxwidgets/mainwindow.cpp b/src/platform/wxwidgets/mainwindow.cpp
index 98daf321..96d564d9 100644
--- a/src/platform/wxwidgets/mainwindow.cpp
+++ b/src/platform/wxwidgets/mainwindow.cpp
@@ -19,6 +19,7 @@
 #include "core/dispatch.hpp"
 #include "core/framebuffer.hpp"
 #include "core/framerate.hpp"
+#include "core/keymapper.hpp"
 #include "interface/romtype.hpp"
 #include "core/loadlib.hpp"
 #include "lua/lua.hpp"
diff --git a/src/platform/wxwidgets/settings-keyentry.cpp b/src/platform/wxwidgets/settings-keyentry.cpp
index 91414144..dfcd9a45 100644
--- a/src/platform/wxwidgets/settings-keyentry.cpp
+++ b/src/platform/wxwidgets/settings-keyentry.cpp
@@ -1,5 +1,6 @@
 #include "platform/wxwidgets/settings-common.hpp"
 #include "platform/wxwidgets/settings-keyentry.hpp"
+#include "core/keymapper.hpp"
 
 namespace
 {
diff --git a/src/video/jmd.cpp b/src/video/jmd.cpp
index 42804317..3ee63f37 100644
--- a/src/video/jmd.cpp
+++ b/src/video/jmd.cpp
@@ -1,6 +1,7 @@
 #include "core/advdumper.hpp"
 #include "core/dispatch.hpp"
 #include "core/settings.hpp"
+#include "core/window.hpp"
 #include "library/serialization.hpp"
 #include "video/tcp.hpp"
 
diff --git a/src/video/pipedec.cpp b/src/video/pipedec.cpp
index 5f32f47a..cf948dc7 100644
--- a/src/video/pipedec.cpp
+++ b/src/video/pipedec.cpp
@@ -1,5 +1,6 @@
 #include "core/advdumper.hpp"
 #include "core/dispatch.hpp"
+#include "core/window.hpp"
 #include "video/sox.hpp"
 #include "library/serialization.hpp"
 #include "library/string.hpp"