4 files changed, 39 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04cb07d14..76ec0fe56 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -761,6 +761,7 @@ SET(SRCS
     input/keyboardconfig.h
     input/keyboarddata.h
     input/keydata.h
+    input/keyfunction.h
     input/keyinput.h
     input/keyitem.h
     input/keysortfunctor.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 36fc6949a..25598e42f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -865,6 +865,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      input/keyboardconfig.h \
 	      input/keyboarddata.h \
 	      input/keydata.h \
+	      input/keyfunction.h \
 	      input/keyinput.h \
 	      input/keyitem.h \
 	      input/keysortfunctor.h \
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index cab7f780a..870bcdb50 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -21,24 +21,17 @@
 #ifndef INPUT_INPUTMANAGER_H
 #define INPUT_INPUTMANAGER_H
 
-#include "events/inputevent.h"
-
+#include "input/keyfunction.h"
 #include "input/keydata.h"
-#include "input/keyitem.h"
 
 #include <string>
 #include <map>
 
 #include <SDL_events.h>
 
-const unsigned int KeyFunctionSize = 3;
-
 class Setup_Input;
 
-struct KeyFunction final
-{
-    KeyItem values[KeyFunctionSize];
-};
+struct KeyData;
 
 enum KeyCondition
 {
diff --git a/src/input/keyfunction.h b/src/input/keyfunction.h
new file mode 100644
index 000000000..2376e4da5
--- /dev/null
+++ b/src/input/keyfunction.h
@@ -0,0 +1,35 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INPUT_KEYFUNCTION_H
+#define INPUT_KEYFUNCTION_H
+
+#include "input/keyitem.h"
+
+#include "localconsts.h"
+
+const unsigned int KeyFunctionSize = 3;
+
+struct KeyFunction final
+{
+    KeyItem values[KeyFunctionSize];
+};
+
+#endif  // INPUT_KEYFUNCTION_H