diff --git a/android/app-android.cpp b/android/app-android.cpp
index 9bc0009a77..9151bc0487 100644
--- a/android/app-android.cpp
+++ b/android/app-android.cpp
@@ -24,23 +24,7 @@
 #include "android/native_audio.h"
 #include "gfx_es2/gl_state.h"
 
-// For Xperia Play support
-enum AndroidKeyCodes {
-	KEYCODE_BUTTON_CROSS = 23, // trackpad or X button(Xperia Play) is pressed
-	KEYCODE_BUTTON_CROSS_PS3 = 96, // PS3 X button is pressed
-	KEYCODE_BUTTON_CIRCLE = 1004, // Special custom keycode generated from 'O' button by our java code. Or 'O' button if Alt is pressed (TODO)
-	KEYCODE_BUTTON_CIRCLE_PS3 = 97, // PS3 O button is pressed
-	KEYCODE_BUTTON_SQUARE = 99, // Square button(Xperia Play) is pressed
-	KEYCODE_BUTTON_TRIANGLE = 100, // 'Triangle button(Xperia Play) is pressed
-	KEYCODE_DPAD_LEFT = 21,
-	KEYCODE_DPAD_UP = 19,
-	KEYCODE_DPAD_RIGHT = 22,
-	KEYCODE_DPAD_DOWN = 20,
-	KEYCODE_BUTTON_L1 = 102,
-	KEYCODE_BUTTON_R1 = 103,
-	KEYCODE_BUTTON_START = 108,
-	KEYCODE_BUTTON_SELECT = 109,
-};
+#include "app-android.h"
 
 static JNIEnv *jniEnvUI;
 
diff --git a/android/app-android.h b/android/app-android.h
new file mode 100644
index 0000000000..a034ea635b
--- /dev/null
+++ b/android/app-android.h
@@ -0,0 +1,253 @@
+#pragma once
+
+// For Xperia Play support
+enum AndroidKeyCodes {
+	KEYCODE_BUTTON_CROSS = 23, // trackpad or X button(Xperia Play) is pressed
+	KEYCODE_BUTTON_CROSS_PS3 = 96, // PS3 X button is pressed
+	KEYCODE_BUTTON_CIRCLE = 1004, // Special custom keycode generated from 'O' button by our java code. Or 'O' button if Alt is pressed (TODO)
+	KEYCODE_BUTTON_CIRCLE_PS3 = 97, // PS3 O button is pressed
+	KEYCODE_BUTTON_SQUARE = 99, // Square button(Xperia Play) is pressed
+	KEYCODE_BUTTON_TRIANGLE = 100, // 'Triangle button(Xperia Play) is pressed
+	KEYCODE_DPAD_LEFT = 21,
+	KEYCODE_DPAD_UP = 19,
+	KEYCODE_DPAD_RIGHT = 22,
+	KEYCODE_DPAD_DOWN = 20,
+	KEYCODE_BUTTON_L1 = 102,
+	KEYCODE_BUTTON_R1 = 103,
+	KEYCODE_BUTTON_START = 108,
+	KEYCODE_BUTTON_SELECT = 109,
+	KEYCODE_UNKNOWN = 0,
+	KEYCODE_SOFT_LEFT = 1,
+	KEYCODE_SOFT_RIGHT = 2,
+	KEYCODE_HOME = 3,
+	KEYCODE_BACK = 4,
+	KEYCODE_CALL = 5,
+	KEYCODE_ENDCALL = 6,
+	KEYCODE_0 = 7,
+	KEYCODE_1 = 8,
+	KEYCODE_2 = 9,
+	KEYCODE_3 = 10,
+	KEYCODE_4 = 11,
+	KEYCODE_5 = 12,
+	KEYCODE_6 = 13,
+	KEYCODE_7 = 14,
+	KEYCODE_8 = 15,
+	KEYCODE_9 = 16,
+	KEYCODE_STAR = 17,
+	KEYCODE_POUND = 18,
+	KEYCODE_DPAD_UP = 19,
+	KEYCODE_DPAD_DOWN = 20,
+	KEYCODE_DPAD_LEFT = 21,
+	KEYCODE_DPAD_RIGHT = 22,
+	KEYCODE_DPAD_CENTER = 23,
+	KEYCODE_VOLUME_UP = 24,
+	KEYCODE_VOLUME_DOWN = 25,
+	KEYCODE_POWER = 26,
+	KEYCODE_CAMERA = 27,
+	KEYCODE_CLEAR = 28,
+	KEYCODE_A = 29,
+	KEYCODE_B = 30,
+	KEYCODE_C = 31,
+	KEYCODE_D = 32,
+	KEYCODE_E = 33,
+	KEYCODE_F = 34,
+	KEYCODE_G = 35,
+	KEYCODE_H = 36,
+	KEYCODE_I = 37,
+	KEYCODE_J = 38,
+	KEYCODE_K = 39,
+	KEYCODE_L = 40,
+	KEYCODE_M = 41,
+	KEYCODE_N = 42,
+	KEYCODE_O = 43,
+	KEYCODE_P = 44,
+	KEYCODE_Q = 45,
+	KEYCODE_R = 46,
+	KEYCODE_S = 47,
+	KEYCODE_T = 48,
+	KEYCODE_U = 49,
+	KEYCODE_V = 50,
+	KEYCODE_W = 51,
+	KEYCODE_X = 52,
+	KEYCODE_Y = 53,
+	KEYCODE_Z = 54,
+	KEYCODE_COMMA = 55,
+	KEYCODE_PERIOD = 56,
+	KEYCODE_ALT_LEFT = 57,
+	KEYCODE_ALT_RIGHT = 58,
+	KEYCODE_SHIFT_LEFT = 59,
+	KEYCODE_SHIFT_RIGHT = 60,
+	KEYCODE_TAB = 61,
+	KEYCODE_SPACE = 62,
+	KEYCODE_SYM = 63,
+	KEYCODE_EXPLORER = 64,
+	KEYCODE_ENVELOPE = 65,
+	KEYCODE_ENTER = 66,
+	KEYCODE_DEL = 67,
+	KEYCODE_GRAVE = 68,
+	KEYCODE_MINUS = 69,
+	KEYCODE_EQUALS = 70,
+	KEYCODE_LEFT_BRACKET = 71,
+	KEYCODE_RIGHT_BRACKET = 72,
+	KEYCODE_BACKSLASH = 73,
+	KEYCODE_SEMICOLON = 74,
+	KEYCODE_APOSTROPHE = 75,
+	KEYCODE_SLASH = 76,
+	KEYCODE_AT = 77,
+	KEYCODE_NUM = 78,
+	KEYCODE_HEADSETHOOK = 79,
+	KEYCODE_FOCUS = 80,
+	KEYCODE_PLUS = 81,
+	KEYCODE_MENU = 82,
+	KEYCODE_NOTIFICATION = 83,
+	KEYCODE_SEARCH = 84,
+	KEYCODE_MEDIA_PLAY_PAUSE = 85,
+	KEYCODE_MEDIA_STOP = 86,
+	KEYCODE_MEDIA_NEXT = 87,
+	KEYCODE_MEDIA_PREVIOUS = 88,
+	KEYCODE_MEDIA_REWIND = 89,
+	KEYCODE_MEDIA_FAST_FORWARD = 90,
+	KEYCODE_MUTE = 91,
+	KEYCODE_PAGE_UP = 92,
+	KEYCODE_PAGE_DOWN = 93,
+	KEYCODE_PICTSYMBOLS = 94,
+	KEYCODE_SWITCH_CHARSET = 95,
+	KEYCODE_BUTTON_A = 96,
+	KEYCODE_BUTTON_B = 97,
+	KEYCODE_BUTTON_C = 98,
+	KEYCODE_BUTTON_X = 99,
+	KEYCODE_BUTTON_Y = 100,
+	KEYCODE_BUTTON_Z = 101,
+	KEYCODE_BUTTON_L1 = 102,
+	KEYCODE_BUTTON_R1 = 103,
+	KEYCODE_BUTTON_L2 = 104,
+	KEYCODE_BUTTON_R2 = 105,
+	KEYCODE_BUTTON_THUMBL = 106,
+	KEYCODE_BUTTON_THUMBR = 107,
+	KEYCODE_BUTTON_START = 108,
+	KEYCODE_BUTTON_SELECT = 109,
+	KEYCODE_BUTTON_MODE = 110,
+	KEYCODE_ESCAPE = 111,
+	KEYCODE_FORWARD_DEL = 112,
+	KEYCODE_CTRL_LEFT = 113,
+	KEYCODE_CTRL_RIGHT = 114,
+	KEYCODE_CAPS_LOCK = 115,
+	KEYCODE_SCROLL_LOCK = 116,
+	KEYCODE_META_LEFT = 117,
+	KEYCODE_META_RIGHT = 118,
+	KEYCODE_FUNCTION = 119,
+	KEYCODE_SYSRQ = 120,
+	KEYCODE_BREAK = 121,
+	KEYCODE_MOVE_HOME = 122,
+	KEYCODE_MOVE_END = 123,
+	KEYCODE_INSERT = 124,
+	KEYCODE_FORWARD = 125,
+	KEYCODE_MEDIA_PLAY = 126,
+	KEYCODE_MEDIA_PAUSE = 127,
+	KEYCODE_MEDIA_CLOSE = 128,
+	KEYCODE_MEDIA_EJECT = 129,
+	KEYCODE_MEDIA_RECORD = 130,
+	KEYCODE_F1 = 131,
+	KEYCODE_F2 = 132,
+	KEYCODE_F3 = 133,
+	KEYCODE_F4 = 134,
+	KEYCODE_F5 = 135,
+	KEYCODE_F6 = 136,
+	KEYCODE_F7 = 137,
+	KEYCODE_F8 = 138,
+	KEYCODE_F9 = 139,
+	KEYCODE_F10 = 140,
+	KEYCODE_F11 = 141,
+	KEYCODE_F12 = 142,
+	KEYCODE_NUM_LOCK = 143,
+	KEYCODE_NUMPAD_0 = 144,
+	KEYCODE_NUMPAD_1 = 145,
+	KEYCODE_NUMPAD_2 = 146,
+	KEYCODE_NUMPAD_3 = 147,
+	KEYCODE_NUMPAD_4 = 148,
+	KEYCODE_NUMPAD_5 = 149,
+	KEYCODE_NUMPAD_6 = 150,
+	KEYCODE_NUMPAD_7 = 151,
+	KEYCODE_NUMPAD_8 = 152,
+	KEYCODE_NUMPAD_9 = 153,
+	KEYCODE_NUMPAD_DIVIDE = 154,
+	KEYCODE_NUMPAD_MULTIPLY = 155,
+	KEYCODE_NUMPAD_SUBTRACT = 156,
+	KEYCODE_NUMPAD_ADD = 157,
+	KEYCODE_NUMPAD_DOT = 158,
+	KEYCODE_NUMPAD_COMMA = 159,
+	KEYCODE_NUMPAD_ENTER = 160,
+	KEYCODE_NUMPAD_EQUALS = 161,
+	KEYCODE_NUMPAD_LEFT_PAREN = 162,
+	KEYCODE_NUMPAD_RIGHT_PAREN = 163,
+	KEYCODE_VOLUME_MUTE = 164,
+	KEYCODE_INFO = 165,
+	KEYCODE_CHANNEL_UP = 166,
+	KEYCODE_CHANNEL_DOWN = 167,
+	KEYCODE_ZOOM_IN = 168,
+	KEYCODE_ZOOM_OUT = 169,
+	KEYCODE_TV = 170,
+	KEYCODE_WINDOW = 171,
+	KEYCODE_GUIDE = 172,
+	KEYCODE_DVR = 173,
+	KEYCODE_BOOKMARK = 174,
+	KEYCODE_CAPTIONS = 175,
+	KEYCODE_SETTINGS = 176,
+	KEYCODE_TV_POWER = 177,
+	KEYCODE_TV_INPUT = 178,
+	KEYCODE_STB_POWER = 179,
+	KEYCODE_STB_INPUT = 180,
+	KEYCODE_AVR_POWER = 181,
+	KEYCODE_AVR_INPUT = 182,
+	KEYCODE_PROG_RED = 183,
+	KEYCODE_PROG_GREEN = 184,
+	KEYCODE_PROG_YELLOW = 185,
+	KEYCODE_PROG_BLUE = 186,
+	KEYCODE_APP_SWITCH = 187,
+	KEYCODE_BUTTON_1 = 188,
+	KEYCODE_BUTTON_2 = 189,
+	KEYCODE_BUTTON_3 = 190,
+	KEYCODE_BUTTON_4 = 191,
+	KEYCODE_BUTTON_5 = 192,
+	KEYCODE_BUTTON_6 = 193,
+	KEYCODE_BUTTON_7 = 194,
+	KEYCODE_BUTTON_8 = 195,
+	KEYCODE_BUTTON_9 = 196,
+	KEYCODE_BUTTON_10 = 197,
+	KEYCODE_BUTTON_11 = 198,
+	KEYCODE_BUTTON_12 = 199,
+	KEYCODE_BUTTON_13 = 200,
+	KEYCODE_BUTTON_14 = 201,
+	KEYCODE_BUTTON_15 = 202,
+	KEYCODE_BUTTON_16 = 203,
+};
+
+enum AndroidJoystickAxis {
+	// Field descriptor #15 I
+	JOYSTICK_AXIS_X = 0,
+	JOYSTICK_AXIS_Y = 1,
+	JOYSTICK_AXIS_PRESSURE = 2,
+	JOYSTICK_AXIS_SIZE = 3,
+	JOYSTICK_AXIS_TOUCH_MAJOR = 4,
+	JOYSTICK_AXIS_TOUCH_MINOR = 5,
+	JOYSTICK_AXIS_TOOL_MAJOR = 6,
+	JOYSTICK_AXIS_TOOL_MINOR = 7,
+	JOYSTICK_AXIS_ORIENTATION = 8,
+	JOYSTICK_AXIS_VSCROLL = 9,
+	JOYSTICK_AXIS_HSCROLL = 10,
+	JOYSTICK_AXIS_Z = 11,
+	JOYSTICK_AXIS_RX = 12,
+	JOYSTICK_AXIS_RY = 13,
+	JOYSTICK_AXIS_RZ = 14,
+	JOYSTICK_AXIS_HAT_X = 15,
+	JOYSTICK_AXIS_HAT_Y = 16,
+	JOYSTICK_AXIS_LTRIGGER = 17,
+	JOYSTICK_AXIS_RTRIGGER = 18,
+	JOYSTICK_AXIS_THROTTLE = 19,
+	JOYSTICK_AXIS_RUDDER = 20,
+	JOYSTICK_AXIS_WHEEL = 21,
+	JOYSTICK_AXIS_GAS = 22,
+	JOYSTICK_AXIS_BRAKE = 23,
+	JOYSTICK_AXIS_DISTANCE = 24,
+	JOYSTICK_AXIS_TILT = 25,
+};
diff --git a/native.vcxproj b/native.vcxproj
index 9b818fe9a0..71ed381080 100644
--- a/native.vcxproj
+++ b/native.vcxproj
@@ -172,6 +172,7 @@
     <None Include="ui\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="android\app-android.h" />
     <ClInclude Include="android\native-audio-so.h" />
     <ClInclude Include="android\native_audio.h" />
     <ClInclude Include="audio\mixer.h" />
diff --git a/native.vcxproj.filters b/native.vcxproj.filters
index cae63ba799..a2bf0c0750 100644
--- a/native.vcxproj.filters
+++ b/native.vcxproj.filters
@@ -272,6 +272,7 @@
     <ClInclude Include="data\compression.h">
       <Filter>data</Filter>
     </ClInclude>
+    <ClInclude Include="android\app-android.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="gfx\gl_debug_log.cpp">