4 files changed, 45 insertions, 15 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec0837df3..04cb07d14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -762,6 +762,7 @@ SET(SRCS
     input/keyboarddata.h
     input/keydata.h
     input/keyinput.h
+    input/keyitem.h
     input/keysortfunctor.h
     input/multitouchmanager.cpp
     input/multitouchmanager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index c248a8822..36fc6949a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -866,6 +866,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      input/keyboarddata.h \
 	      input/keydata.h \
 	      input/keyinput.h \
+	      input/keyitem.h \
 	      input/keysortfunctor.h \
 	      input/multitouchmanager.cpp \
 	      input/multitouchmanager.h \
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index dcdcfc4c7..cab7f780a 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -24,6 +24,7 @@
 #include "events/inputevent.h"
 
 #include "input/keydata.h"
+#include "input/keyitem.h"
 
 #include <string>
 #include <map>
@@ -34,21 +35,6 @@ const unsigned int KeyFunctionSize = 3;
 
 class Setup_Input;
 
-struct KeyItem final
-{
-    KeyItem() :
-        type(-1), value(-1)
-    { }
-
-    KeyItem(const int type0, const int value0) :
-        type(type0), value(value0)
-    { }
-
-    int type;
-
-    int value;
-};
-
 struct KeyFunction final
 {
     KeyItem values[KeyFunctionSize];
diff --git a/src/input/keyitem.h b/src/input/keyitem.h
new file mode 100644
index 000000000..96ee70d0a
--- /dev/null
+++ b/src/input/keyitem.h
@@ -0,0 +1,42 @@
+/*
+ *  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_KEYITEM_H
+#define INPUT_KEYITEM_H
+
+#include "localconsts.h"
+
+struct KeyItem final
+{
+    KeyItem() :
+        type(-1),
+        value(-1)
+    { }
+
+    KeyItem(const int type0, const int value0) :
+        type(type0), value(value0)
+    { }
+
+    int type;
+
+    int value;
+};
+
+#endif  // INPUT_KEYITEM_H