diff --git a/core/SCsub b/core/SCsub
index 600686225..1bd1c2212 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -190,6 +190,7 @@ SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")
 SConscript("object/SCsub")
+SConscript("input/SCsub")
 SConscript("bind/SCsub")
 
 # Build it all as a library
diff --git a/core/global_constants.cpp b/core/global_constants.cpp
index 14dc12301..2bb160976 100644
--- a/core/global_constants.cpp
+++ b/core/global_constants.cpp
@@ -31,7 +31,7 @@
 #include "global_constants.h"
 
 #include "core/object/object.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/variant/variant.h"
 
diff --git a/core/input/SCsub b/core/input/SCsub
new file mode 100644
index 000000000..62a99dc4e
--- /dev/null
+++ b/core/input/SCsub
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+import input_builders
+from platform_methods import run_in_subprocess
+
+Import("env")
+
+env_input = env.Clone()
+
+# Order matters here. Higher index controller database files write on top of lower index database files.
+controller_databases = [
+    "gamecontrollerdb.txt", 
+    "pandemoniumcontrollerdb.txt",
+]
+
+gensource = env_input.CommandNoCache(
+    "default_controller_mappings.gen.cpp",
+    controller_databases,
+    run_in_subprocess(input_builders.make_default_controller_mappings),
+)
+
+env_input.add_source_files(env.core_sources, "*.cpp")
+env_input.add_source_files(env.core_sources, gensource)
diff --git a/main/default_controller_mappings.h b/core/input/default_controller_mappings.h
similarity index 100%
rename from main/default_controller_mappings.h
rename to core/input/default_controller_mappings.h
diff --git a/main/gamecontrollerdb.txt b/core/input/gamecontrollerdb.txt
similarity index 100%
rename from main/gamecontrollerdb.txt
rename to core/input/gamecontrollerdb.txt
diff --git a/core/os/input.cpp b/core/input/input.cpp
similarity index 99%
rename from core/os/input.cpp
rename to core/input/input.cpp
index 2603ca740..20d6f1399 100644
--- a/core/os/input.cpp
+++ b/core/input/input.cpp
@@ -30,7 +30,7 @@
 
 #include "input.h"
 
-#include "core/input_map.h"
+#include "core/input/input_map.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
 
diff --git a/core/os/input.h b/core/input/input.h
similarity index 100%
rename from core/os/input.h
rename to core/input/input.h
diff --git a/core/input/input_builders.py b/core/input/input_builders.py
new file mode 100644
index 000000000..e60ebbada
--- /dev/null
+++ b/core/input/input_builders.py
@@ -0,0 +1,69 @@
+"""Functions used to generate source files during build time
+
+All such functions are invoked in a subprocess on Windows to prevent build flakiness.
+
+"""
+from platform_methods import subprocess_main
+from collections import OrderedDict
+
+def make_default_controller_mappings(target, source, env):
+    dst = target[0]
+    g = open(dst, "w")
+
+    g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
+    g.write('#include "core/typedefs.h"\n')
+    g.write('#include "core/input/default_controller_mappings.h"\n')
+
+    # ensure mappings have a consistent order
+    platform_mappings = OrderedDict()
+    for src_path in source:
+        with open(src_path, "r") as f:
+            # read mapping file and skip header
+            mapping_file_lines = f.readlines()[2:]
+
+        current_platform = None
+        for line in mapping_file_lines:
+            if not line:
+                continue
+            line = line.strip()
+            if len(line) == 0:
+                continue
+            if line[0] == "#":
+                current_platform = line[1:].strip()
+                if current_platform not in platform_mappings:
+                    platform_mappings[current_platform] = {}
+            elif current_platform:
+                line_parts = line.split(",")
+                guid = line_parts[0]
+                if guid in platform_mappings[current_platform]:
+                    g.write(
+                        "// WARNING - DATABASE {} OVERWROTE PRIOR MAPPING: {} {}\n".format(
+                            src_path, current_platform, platform_mappings[current_platform][guid]
+                        )
+                    )
+                platform_mappings[current_platform][guid] = line
+
+    platform_variables = {
+        "Linux": "#if X11_ENABLED",
+        "Windows": "#ifdef WINDOWS_ENABLED",
+        "Mac OS X": "#ifdef OSX_ENABLED",
+        "Android": "#if defined(__ANDROID__)",
+        "iOS": "#ifdef IPHONE_ENABLED",
+        "Javascript": "#ifdef JAVASCRIPT_ENABLED",
+        "UWP": "#ifdef UWP_ENABLED",
+    }
+
+    g.write("const char* DefaultControllerMappings::mappings[] = {\n")
+    for platform, mappings in platform_mappings.items():
+        variable = platform_variables[platform]
+        g.write("{}\n".format(variable))
+        for mapping in mappings.values():
+            g.write('\t"{}",\n'.format(mapping))
+        g.write("#endif\n")
+
+    g.write("\tNULL\n};\n")
+    g.close()
+
+
+if __name__ == "__main__":
+    subprocess_main(globals())
diff --git a/core/os/input_event.cpp b/core/input/input_event.cpp
similarity index 99%
rename from core/os/input_event.cpp
rename to core/input/input_event.cpp
index fbbcf12a2..67c5e9c83 100644
--- a/core/os/input_event.cpp
+++ b/core/input/input_event.cpp
@@ -30,7 +30,7 @@
 
 #include "input_event.h"
 
-#include "core/input_map.h"
+#include "core/input/input_map.h"
 #include "core/os/keyboard.h"
 
 const int InputEvent::DEVICE_ID_TOUCH_MOUSE = -1;
diff --git a/core/os/input_event.h b/core/input/input_event.h
similarity index 100%
rename from core/os/input_event.h
rename to core/input/input_event.h
diff --git a/core/input_map.cpp b/core/input/input_map.cpp
similarity index 99%
rename from core/input_map.cpp
rename to core/input/input_map.cpp
index 754d8a21a..ba736ccc7 100644
--- a/core/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -30,7 +30,7 @@
 
 #include "input_map.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/config/project_settings.h"
 
diff --git a/core/input_map.h b/core/input/input_map.h
similarity index 99%
rename from core/input_map.h
rename to core/input/input_map.h
index 41a66d6bd..ce5b7408f 100644
--- a/core/input_map.h
+++ b/core/input/input_map.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/object/object.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 
 class InputMap : public Object {
 	GDCLASS(InputMap, Object);
diff --git a/main/pandemoniumcontrollerdb.txt b/core/input/pandemoniumcontrollerdb.txt
similarity index 100%
rename from main/pandemoniumcontrollerdb.txt
rename to core/input/pandemoniumcontrollerdb.txt
diff --git a/scene/gui/shortcut.cpp b/core/input/shortcut.cpp
similarity index 98%
rename from scene/gui/shortcut.cpp
rename to core/input/shortcut.cpp
index c7027357a..2f47c2e2c 100644
--- a/scene/gui/shortcut.cpp
+++ b/core/input/shortcut.cpp
@@ -30,7 +30,7 @@
 
 #include "shortcut.h"
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 
 void ShortCut::set_shortcut(const Ref<InputEvent> &p_shortcut) {
diff --git a/scene/gui/shortcut.h b/core/input/shortcut.h
similarity index 100%
rename from scene/gui/shortcut.h
rename to core/input/shortcut.h
diff --git a/core/os/main_loop.h b/core/os/main_loop.h
index 09a1da5c1..7ddb96c87 100644
--- a/core/os/main_loop.h
+++ b/core/os/main_loop.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/object/reference.h"
 #include "core/object/script_language.h"
 
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 3bf67d469..9039668b2 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -32,7 +32,7 @@
 
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/midi_driver.h"
 #include "core/config/project_settings.h"
 #include "core/version_generated.gen.h"
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index a1e9d4ed3..8b98db455 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -39,7 +39,7 @@
 #include "core/crypto/hashing_context.h"
 #include "core/config/engine.h"
 #include "core/func_ref.h"
-#include "core/input_map.h"
+#include "core/input/input_map.h"
 #include "core/io/config_file.h"
 #include "core/io/dtls_server.h"
 #include "core/io/http_client.h"
@@ -65,7 +65,7 @@
 #include "core/math/geometry.h"
 #include "core/math/random_number_generator.h"
 #include "core/math/triangle_mesh.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/main_loop.h"
 #include "core/os/time.h"
 #include "core/containers/packed_data_container.h"
diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp
index 8959049a3..fa3efaf9e 100644
--- a/core/variant/variant_parser.cpp
+++ b/core/variant/variant_parser.cpp
@@ -31,7 +31,7 @@
 #include "variant_parser.h"
 
 #include "core/io/resource_loader.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_buffer.h"
 
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp
index e444a576c..9586fa771 100644
--- a/editor/animation_bezier_editor.cpp
+++ b/editor/animation_bezier_editor.cpp
@@ -41,7 +41,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"
 #include "core/string/node_path.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/containers/pair.h"
 #include "core/string/string_name.h"
@@ -53,7 +53,7 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/range.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/node.h"
 #include "scene/resources/font.h"
 
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index ed2026229..20f62e6ca 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -42,8 +42,8 @@
 #include "core/math/transform.h"
 #include "core/math/transform_2d.h"
 #include "core/math/vector3.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/containers/pair.h"
@@ -78,7 +78,7 @@
 #include "scene/gui/scroll_bar.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp
index aa2f2e9b8..f2fd38dd8 100644
--- a/editor/animation_track_editor_plugins.cpp
+++ b/editor/animation_track_editor_plugins.cpp
@@ -44,7 +44,7 @@
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/string/node_path.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index d0c0fa007..6e003c204 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -35,8 +35,8 @@
 #include "core/variant/dictionary.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/object/resource.h"
@@ -55,7 +55,7 @@
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/scroll_container.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/texture_button.h"
 #include "scene/gui/tool_button.h"
diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp
index f43221bb6..f9e4b1d0e 100644
--- a/editor/create_dialog.cpp
+++ b/editor/create_dialog.cpp
@@ -42,7 +42,7 @@
 #include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/os/file_access.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/script_language.h"
 #include "core/typedefs.h"
diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp
index 93b095f47..7ca863302 100644
--- a/editor/editor_audio_buses.cpp
+++ b/editor/editor_audio_buses.cpp
@@ -31,7 +31,7 @@
 #include "editor_audio_buses.h"
 
 #include "core/io/resource_saver.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor_node.h"
 #include "editor_scale.h"
@@ -47,7 +47,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/string/string_name.h"
 #include "core/object/undo_redo.h"
diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
index 0d48d7e2d..de39b4549 100644
--- a/editor/editor_file_dialog.cpp
+++ b/editor/editor_file_dialog.cpp
@@ -39,7 +39,7 @@
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index 933b3d217..6744ad2eb 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -30,7 +30,7 @@
 
 #include "editor_help.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/version_generated.gen.h"
 #include "doc_data_compressed.gen.h"
@@ -46,7 +46,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/containers/pair.h"
diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp
index 6126aad40..f6d6c3479 100644
--- a/editor/editor_help_search.cpp
+++ b/editor/editor_help_search.cpp
@@ -37,7 +37,7 @@
 #include "core/error/error_macros.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/typedefs.h"
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index bcaeaabdb..eafdd17e0 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -37,8 +37,8 @@
 #include "core/containers/hash_map.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp
index a5ca7010a..c7b20e6ef 100644
--- a/editor/editor_layouts_dialog.cpp
+++ b/editor/editor_layouts_dialog.cpp
@@ -40,7 +40,7 @@
 #include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/math/math_defs.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 6398fec6a..45b7cd59d 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -48,8 +48,8 @@
 #include "core/object/object_id.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
@@ -177,7 +177,7 @@
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tabs.h"
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index 14d59f2bc..d05835588 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -51,7 +51,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/containers/pool_vector.h"
 #include "core/object/resource.h"
 #include "core/containers/rid.h"
diff --git a/editor/editor_profiler.cpp b/editor/editor_profiler.cpp
index c9c76a030..52ccfc17d 100644
--- a/editor/editor_profiler.cpp
+++ b/editor/editor_profiler.cpp
@@ -38,7 +38,7 @@
 #include "core/image.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/variant/variant.h"
 #include "scene/gui/button.h"
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 8cdba87bf..1d53681ef 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -47,7 +47,7 @@
 #include "core/math/vector3.h"
 #include "core/object/object.h"
 #include "core/object/object_id.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/config/project_settings.h"
 #include "core/containers/rid.h"
diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp
index 9a9346791..e40f860e7 100644
--- a/editor/editor_properties_array_dict.cpp
+++ b/editor/editor_properties_array_dict.cpp
@@ -37,8 +37,8 @@
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/resource.h"
 #include "core/typedefs.h"
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index 76b196a1e..7be53ee34 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -44,7 +44,7 @@
 #include "core/containers/map.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/containers/pair.h"
 #include "core/object/ref_ptr.h"
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 52009cfce..8a4541dde 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -46,7 +46,7 @@
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
diff --git a/editor/editor_settings.h b/editor/editor_settings.h
index 2e933c342..881a46575 100644
--- a/editor/editor_settings.h
+++ b/editor/editor_settings.h
@@ -32,7 +32,7 @@
 
 #include "core/object/resource.h"
 
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 
 #include "core/object/object.h"
 #include "core/io/config_file.h"
diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp
index 62b886531..0fad4007c 100644
--- a/editor/editor_spin_slider.cpp
+++ b/editor/editor_spin_slider.cpp
@@ -31,7 +31,7 @@
 #include "editor_spin_slider.h"
 
 #include "core/math/expression.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor_scale.h"
 #include "core/variant/array.h"
@@ -42,7 +42,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
diff --git a/editor/editor_zoom_widget.cpp b/editor/editor_zoom_widget.cpp
index 714ecf4e8..84f600064 100644
--- a/editor/editor_zoom_widget.cpp
+++ b/editor/editor_zoom_widget.cpp
@@ -33,7 +33,7 @@
 #include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "scene/gui/button.h"
 
 void EditorZoomWidget::_update_zoom_label() {
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index b75f78060..2893faafb 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -33,7 +33,7 @@
 #include "core/io/resource_loader.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
@@ -52,7 +52,7 @@
 #include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/string/print_string.h"
 #include "core/object/resource.h"
diff --git a/editor/pane_drag.cpp b/editor/pane_drag.cpp
index 8f35cc475..9e420c27f 100644
--- a/editor/pane_drag.cpp
+++ b/editor/pane_drag.cpp
@@ -31,7 +31,7 @@
 #include "pane_drag.h"
 
 #include "core/object/class_db.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/variant/variant.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/resources/texture.h"
diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp
index 3dc2ee81b..4fe1ab5b0 100644
--- a/editor/plugins/abstract_polygon_2d_editor.cpp
+++ b/editor/plugins/abstract_polygon_2d_editor.cpp
@@ -40,7 +40,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
 #include "core/typedefs.h"
diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp
index e02a0e75a..7e8327a32 100644
--- a/editor/plugins/animation_blend_space_1d_editor.cpp
+++ b/editor/plugins/animation_blend_space_1d_editor.cpp
@@ -41,7 +41,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/undo_redo.h"
 #include "core/variant/variant.h"
diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp
index deccd6754..3e8c307d2 100644
--- a/editor/plugins/animation_blend_space_2d_editor.cpp
+++ b/editor/plugins/animation_blend_space_2d_editor.cpp
@@ -45,7 +45,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/undo_redo.h"
 #include "core/variant/variant.h"
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 294c6de5f..6fd301ec1 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -32,7 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/config/project_settings.h"
 #include "editor/animation_track_editor.h"
@@ -52,7 +52,7 @@
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/resource.h"
 #include "core/containers/rid_handle.h"
diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp
index c09492340..c4fc027f7 100644
--- a/editor/plugins/animation_state_machine_editor.cpp
+++ b/editor/plugins/animation_state_machine_editor.cpp
@@ -42,7 +42,7 @@
 #include "core/math/geometry.h"
 #include "core/math/math_defs.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
 #include "core/object/undo_redo.h"
diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp
index 59776af4b..d4d2d52f6 100644
--- a/editor/plugins/audio_stream_editor_plugin.cpp
+++ b/editor/plugins/audio_stream_editor_plugin.cpp
@@ -39,7 +39,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
 #include "core/containers/vector.h"
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 6b8e15ff7..168b4f671 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "canvas_item_editor_plugin.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
@@ -61,7 +61,7 @@
 #include "core/math/geometry.h"
 #include "core/math/math_funcs.h"
 #include "core/string/node_path.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
 #include "core/object/resource.h"
diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp
index f9abf6dee..ccfe11d2d 100644
--- a/editor/plugins/collision_polygon_editor_plugin.cpp
+++ b/editor/plugins/collision_polygon_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "collision_polygon_editor_plugin.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_settings.h"
 #include "scene/3d/camera.h"
@@ -47,7 +47,7 @@
 #include "core/math/rect2.h"
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
 #include "core/object/undo_redo.h"
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp
index 8d0b5b329..20e3ef39b 100644
--- a/editor/plugins/collision_shape_2d_editor_plugin.cpp
+++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp
@@ -41,8 +41,8 @@
 #include "core/object/class_db.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/object/undo_redo.h"
diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp
index 4efa90cba..027c8e174 100644
--- a/editor/plugins/curve_editor_plugin.cpp
+++ b/editor/plugins/curve_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #include "curve_editor_plugin.h"
 
 #include "core/core_string_names.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "core/object/class_db.h"
@@ -41,7 +41,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/resource.h"
 #include "core/string/string_name.h"
diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp
index 4f6b128c3..0680b6a95 100644
--- a/editor/plugins/mesh_editor_plugin.cpp
+++ b/editor/plugins/mesh_editor_plugin.cpp
@@ -44,7 +44,7 @@
 #include "core/math/transform.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/variant/variant.h"
 #include "scene/3d/camera.h"
diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp
index ea0c12e09..92e3f5e8b 100644
--- a/editor/plugins/path_2d_editor_plugin.cpp
+++ b/editor/plugins/path_2d_editor_plugin.cpp
@@ -40,7 +40,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/undo_redo.h"
 #include "core/variant/variant.h"
diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp
index b31e4a141..d809c5f3a 100644
--- a/editor/plugins/path_editor_plugin.cpp
+++ b/editor/plugins/path_editor_plugin.cpp
@@ -37,7 +37,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/plane.h"
 #include "core/math/transform.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp
index 872e05f78..85b1a50e8 100644
--- a/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #include "polygon_2d_editor_plugin.h"
 
 #include "canvas_item_editor_plugin.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
@@ -44,7 +44,7 @@
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
 #include "core/string/node_path.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index 24cfc6249..2a13f90b3 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -32,7 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
@@ -58,7 +58,7 @@
 #include "core/containers/map.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/containers/pair.h"
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 38577e861..541929651 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -41,8 +41,8 @@
 #include "core/math/transform_2d.h"
 #include "core/string/node_path.h"
 #include "core/os/file_access.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/config/project_settings.h"
diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp
index f8f8575cd..20f90baa7 100644
--- a/editor/plugins/shader_editor_plugin.cpp
+++ b/editor/plugins/shader_editor_plugin.cpp
@@ -40,7 +40,7 @@
 #include "core/containers/map.h"
 #include "core/math/transform_2d.h"
 #include "core/os/file_access.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index fe78123fe..75456b170 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -42,8 +42,8 @@
 #include "core/math/plane.h"
 #include "core/math/rect2.h"
 #include "core/string/node_path.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
@@ -82,7 +82,7 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/viewport_container.h"
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index 104bf96fa..1f1183cd1 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -39,8 +39,8 @@
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
diff --git a/editor/plugins/text_editor.cpp b/editor/plugins/text_editor.cpp
index 88002b17f..c442657be 100644
--- a/editor/plugins/text_editor.cpp
+++ b/editor/plugins/text_editor.cpp
@@ -38,7 +38,7 @@
 #include "core/error/error_macros.h"
 #include "core/math/transform_2d.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
 #include "editor/editor_settings.h"
diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp
index 3d79fb288..1615fbdde 100644
--- a/editor/plugins/texture_region_editor_plugin.cpp
+++ b/editor/plugins/texture_region_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #include "texture_region_editor_plugin.h"
 
 #include "core/core_string_names.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/panel.h"
@@ -41,7 +41,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/string/string_name.h"
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
index f3d7cb8d7..e7c74eb54 100644
--- a/editor/plugins/theme_editor_plugin.cpp
+++ b/editor/plugins/theme_editor_plugin.cpp
@@ -36,7 +36,7 @@
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp
index 4780ee363..af929462a 100644
--- a/editor/plugins/theme_editor_preview.cpp
+++ b/editor/plugins/theme_editor_preview.cpp
@@ -39,7 +39,7 @@
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index c63cf397b..684c53405 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -44,7 +44,7 @@
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index f3a0aba65..bcab79378 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -30,7 +30,7 @@
 
 #include "project_settings_editor.h"
 
-#include "core/input_map.h"
+#include "core/input/input_map.h"
 #include "core/os/keyboard.h"
 #include "core/config/project_settings.h"
 #include "core/string/translation.h"
diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h
index ca8496096..fbece1a1e 100644
--- a/editor/project_settings_editor.h
+++ b/editor/project_settings_editor.h
@@ -33,7 +33,7 @@
 #include "scene/gui/dialogs.h"
 
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 52aac0a07..c9b40d57f 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -48,8 +48,8 @@
 #include "core/math/transform_2d.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp
index 7ef580319..22ed3a0b4 100644
--- a/editor/property_selector.cpp
+++ b/editor/property_selector.cpp
@@ -36,7 +36,7 @@
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/object/method_bind.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/object/script_language.h"
diff --git a/editor/quick_open.cpp b/editor/quick_open.cpp
index 563972608..35a5bc33d 100644
--- a/editor/quick_open.cpp
+++ b/editor/quick_open.cpp
@@ -35,7 +35,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
 #include "core/object/class_db.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/containers/pair.h"
 #include "core/typedefs.h"
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 21c44991f..14a314492 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -39,8 +39,8 @@
 #include "core/io/resource_saver.h"
 #include "core/math/vector2.h"
 #include "core/os/file_access.h"
-#include "core/os/input.h"
-#include "core/os/input_event.h"
+#include "core/input/input.h"
+#include "core/input/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index 469e94c73..e8a592234 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -45,7 +45,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
 #include "core/object/undo_redo.h"
@@ -60,7 +60,7 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
diff --git a/main/SCsub b/main/SCsub
index 87e65fbdf..0cffeaca5 100644
--- a/main/SCsub
+++ b/main/SCsub
@@ -9,17 +9,6 @@ env.main_sources = []
 
 env.add_source_files(env.main_sources, "*.cpp")
 
-# Order matters here. Higher index controller database files write on top of lower index database files.
-controller_databases = ["gamecontrollerdb.txt", "pandemoniumcontrollerdb.txt"]
-
-gensource = env.CommandNoCache(
-    "default_controller_mappings.gen.cpp",
-    controller_databases,
-    run_in_subprocess(main_builders.make_default_controller_mappings),
-)
-
-env.add_source_files(env.main_sources, gensource)
-
 env.Depends("#main/splash.gen.h", "#main/splash.png")
 env.CommandNoCache("#main/splash.gen.h", "#main/splash.png", run_in_subprocess(main_builders.make_splash))
 
diff --git a/main/input_default.cpp b/main/input_default.cpp
index e22673025..27c52ab2f 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -30,9 +30,9 @@
 
 #include "input_default.h"
 
-#include "core/input_map.h"
+#include "core/input/input_map.h"
 #include "core/os/os.h"
-#include "main/default_controller_mappings.h"
+#include "core/input/default_controller_mappings.h"
 #include "scene/resources/texture.h"
 #include "servers/visual_server.h"
 
diff --git a/main/input_default.h b/main/input_default.h
index ec42ad470..7483f640d 100644
--- a/main/input_default.h
+++ b/main/input_default.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 
 class InputDefault : public Input {
 	GDCLASS(InputDefault, Input);
diff --git a/main/main.cpp b/main/main.cpp
index 52afb2664..f77a6fd8f 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -31,7 +31,7 @@
 #include "main.h"
 
 #include "core/crypto/crypto.h"
-#include "core/input_map.h"
+#include "core/input/input_map.h"
 #include "core/io/file_access_network.h"
 #include "core/io/file_access_pack.h"
 #include "core/io/file_access_zip.h"
diff --git a/main/main_builders.py b/main/main_builders.py
index 6e5a5ceed..2871b70c9 100644
--- a/main/main_builders.py
+++ b/main/main_builders.py
@@ -67,64 +67,5 @@ def make_app_icon(target, source, env):
         g.write("#endif")
 
 
-def make_default_controller_mappings(target, source, env):
-    dst = target[0]
-    g = open(dst, "w")
-
-    g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-    g.write('#include "core/typedefs.h"\n')
-    g.write('#include "main/default_controller_mappings.h"\n')
-
-    # ensure mappings have a consistent order
-    platform_mappings = OrderedDict()
-    for src_path in source:
-        with open(src_path, "r") as f:
-            # read mapping file and skip header
-            mapping_file_lines = f.readlines()[2:]
-
-        current_platform = None
-        for line in mapping_file_lines:
-            if not line:
-                continue
-            line = line.strip()
-            if len(line) == 0:
-                continue
-            if line[0] == "#":
-                current_platform = line[1:].strip()
-                if current_platform not in platform_mappings:
-                    platform_mappings[current_platform] = {}
-            elif current_platform:
-                line_parts = line.split(",")
-                guid = line_parts[0]
-                if guid in platform_mappings[current_platform]:
-                    g.write(
-                        "// WARNING - DATABASE {} OVERWROTE PRIOR MAPPING: {} {}\n".format(
-                            src_path, current_platform, platform_mappings[current_platform][guid]
-                        )
-                    )
-                platform_mappings[current_platform][guid] = line
-
-    platform_variables = {
-        "Linux": "#if X11_ENABLED",
-        "Windows": "#ifdef WINDOWS_ENABLED",
-        "Mac OS X": "#ifdef OSX_ENABLED",
-        "Android": "#if defined(__ANDROID__)",
-        "iOS": "#ifdef IPHONE_ENABLED",
-        "Javascript": "#ifdef JAVASCRIPT_ENABLED",
-        "UWP": "#ifdef UWP_ENABLED",
-    }
-
-    g.write("const char* DefaultControllerMappings::mappings[] = {\n")
-    for platform, mappings in platform_mappings.items():
-        variable = platform_variables[platform]
-        g.write("{}\n".format(variable))
-        for mapping in mappings.values():
-            g.write('\t"{}",\n'.format(mapping))
-        g.write("#endif\n")
-
-    g.write("\tNULL\n};\n")
-    g.close()
-
-
 if __name__ == "__main__":
     subprocess_main(globals())
diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp
index 86767d676..42426a025 100644
--- a/main/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
@@ -47,7 +47,7 @@
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp
index ee2b2aa2d..6461655d4 100644
--- a/main/tests/test_shader_lang.cpp
+++ b/main/tests/test_shader_lang.cpp
@@ -36,7 +36,7 @@
 
 #include "core/string/print_string.h"
 #include "scene/gui/control.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/text_edit.h"
 #include "servers/visual/shader_language.h"
 #include "servers/visual/shader_types.h"
diff --git a/modules/material_maker/editor/widgets/curve_edit/slope_point.h b/modules/material_maker/editor/widgets/curve_edit/slope_point.h
index 757e43a6b..56af8f086 100644
--- a/modules/material_maker/editor/widgets/curve_edit/slope_point.h
+++ b/modules/material_maker/editor/widgets/curve_edit/slope_point.h
@@ -2,7 +2,7 @@
 #define SLOPE_POINT_H
 
 #include "core/math/vector2.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 
 #include "scene/gui/control.h"
 
diff --git a/modules/material_maker/editor/widgets/file_dialog/left_panel.h b/modules/material_maker/editor/widgets/file_dialog/left_panel.h
index ce7612bc2..28ae205f8 100644
--- a/modules/material_maker/editor/widgets/file_dialog/left_panel.h
+++ b/modules/material_maker/editor/widgets/file_dialog/left_panel.h
@@ -2,7 +2,7 @@
 #define LEFT_PANEL_H
 
 #include "core/variant/array.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/string/ustring.h"
 
 #include "scene/gui/box_container.h"
diff --git a/modules/material_maker/editor/widgets/float_edit/float_edit.h b/modules/material_maker/editor/widgets/float_edit/float_edit.h
index 2d9d67e8e..9112b7540 100644
--- a/modules/material_maker/editor/widgets/float_edit/float_edit.h
+++ b/modules/material_maker/editor/widgets/float_edit/float_edit.h
@@ -1,7 +1,7 @@
 #ifndef FLOAT_EDIT_H
 #define FLOAT_EDIT_H
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "scene/gui/line_edit.h"
 
 class ColorRect;
diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h b/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h
index 55b1b2084..ce62fd6bb 100644
--- a/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h
+++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h
@@ -3,7 +3,7 @@
 #define GRADIENT_CURSOR_H
 
 #include "core/math/color.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/variant/variant.h"
 
 #include "scene/gui/control.h"
diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h
index 711ac22cf..f8b612a65 100644
--- a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h
+++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h
@@ -2,7 +2,7 @@
 #define MM_GRADIENT_EDITOR_H
 
 #include "core/math/color.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/object/reference.h"
 #include "core/object/undo_redo.h"
 #include "core/variant/variant.h"
diff --git a/modules/material_maker/editor/widgets/polygon_edit/polygon_control_point.h b/modules/material_maker/editor/widgets/polygon_edit/polygon_control_point.h
index f59900c17..8d5861461 100644
--- a/modules/material_maker/editor/widgets/polygon_edit/polygon_control_point.h
+++ b/modules/material_maker/editor/widgets/polygon_edit/polygon_control_point.h
@@ -3,7 +3,7 @@
 
 #include "scene/gui/control.h"
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 
 class PolygonEditor;
 
diff --git a/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h b/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h
index baf005635..253df89e5 100644
--- a/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h
+++ b/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h
@@ -1,7 +1,7 @@
 #ifndef POLYGON_EDITOR_H
 #define POLYGON_EDITOR_H
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "core/object/reference.h"
 
 #include "polygon_view.h"
diff --git a/modules/mesh_data_resource/editor/mdi_ed_plugin.h b/modules/mesh_data_resource/editor/mdi_ed_plugin.h
index c2685a15a..4cd21a6ea 100644
--- a/modules/mesh_data_resource/editor/mdi_ed_plugin.h
+++ b/modules/mesh_data_resource/editor/mdi_ed_plugin.h
@@ -25,7 +25,7 @@ SOFTWARE.
 
 #include "editor/editor_plugin.h"
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 
 //TODO:
 //Remove gizmo registration, it's not needed anymore
diff --git a/modules/paint/paint_window.cpp b/modules/paint/paint_window.cpp
index 56b740f08..f514c6666 100644
--- a/modules/paint/paint_window.cpp
+++ b/modules/paint/paint_window.cpp
@@ -25,7 +25,7 @@ SOFTWARE.
 #include "paint_window.h"
 
 #include "core/image.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "scene/resources/texture.h"
 
 #include "actions/brighten_action.h"
diff --git a/modules/plugin_refresher/plugin_refresher.cpp b/modules/plugin_refresher/plugin_refresher.cpp
index 5c46d1f4d..9c01ec04e 100644
--- a/modules/plugin_refresher/plugin_refresher.cpp
+++ b/modules/plugin_refresher/plugin_refresher.cpp
@@ -4,7 +4,7 @@
 #include "core/log/logger.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 
 #include "editor/editor_plugin.h"
 #include "editor/project_settings_editor.h"
diff --git a/modules/props/editor/prop_editor_plugin.cpp b/modules/props/editor/prop_editor_plugin.cpp
index 1f99c6eac..912093247 100644
--- a/modules/props/editor/prop_editor_plugin.cpp
+++ b/modules/props/editor/prop_editor_plugin.cpp
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "../singleton/prop_utils.h"
 #include "core/os/keyboard.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 
 #include "scene/gui/separator.h"
 #include "editor/editor_settings.h"
diff --git a/modules/props_2d/editor/prop_2d_editor_plugin.cpp b/modules/props_2d/editor/prop_2d_editor_plugin.cpp
index ba3f1e83d..1c0b80075 100644
--- a/modules/props_2d/editor/prop_2d_editor_plugin.cpp
+++ b/modules/props_2d/editor/prop_2d_editor_plugin.cpp
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "../singleton/prop_2d_utils.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_settings.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 
 void Prop2DEditorPlugin::convert_active_scene_to_prop_data() {
 	SceneTree *st = SceneTree::get_singleton();
diff --git a/modules/rtile_map/tile_map_editor_plugin.cpp b/modules/rtile_map/tile_map_editor_plugin.cpp
index 8aeea9315..1847d6cc0 100644
--- a/modules/rtile_map/tile_map_editor_plugin.cpp
+++ b/modules/rtile_map/tile_map_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #include "tile_map_editor_plugin.h"
 
 #include "core/math/math_funcs.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
diff --git a/modules/rtile_map/tile_set_editor_plugin.cpp b/modules/rtile_map/tile_set_editor_plugin.cpp
index 227622b31..baaa68297 100644
--- a/modules/rtile_map/tile_set_editor_plugin.cpp
+++ b/modules/rtile_map/tile_set_editor_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "tile_set_editor_plugin.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
diff --git a/modules/skeleton_editor/skeleton_editor_plugin.h b/modules/skeleton_editor/skeleton_editor_plugin.h
index 2f6da6414..d3acfd003 100644
--- a/modules/skeleton_editor/skeleton_editor_plugin.h
+++ b/modules/skeleton_editor/skeleton_editor_plugin.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
diff --git a/modules/terraman/world/terrain_world_editor.cpp b/modules/terraman/world/terrain_world_editor.cpp
index 1005fa948..9e029adef 100644
--- a/modules/terraman/world/terrain_world_editor.cpp
+++ b/modules/terraman/world/terrain_world_editor.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/camera.h"
 #include "scene/gui/slider.h"
diff --git a/modules/terraman_2d/world/terrain_2d_world_editor.cpp b/modules/terraman_2d/world/terrain_2d_world_editor.cpp
index 44b599a4d..1c48856f0 100644
--- a/modules/terraman_2d/world/terrain_2d_world_editor.cpp
+++ b/modules/terraman_2d/world/terrain_2d_world_editor.cpp
@@ -36,7 +36,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/camera.h"
 #include "scene/gui/slider.h"
diff --git a/modules/ui_extensions/bs_input_event_key.cpp b/modules/ui_extensions/bs_input_event_key.cpp
index 5f4904853..041fd0ea4 100644
--- a/modules/ui_extensions/bs_input_event_key.cpp
+++ b/modules/ui_extensions/bs_input_event_key.cpp
@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "bs_input_event_key.h"
 
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 
 void BSInputEventKey::from_input_event_key(const Ref<InputEventKey> event) {
 	set_device(event->get_device());
diff --git a/modules/ui_extensions/bs_input_event_key.h b/modules/ui_extensions/bs_input_event_key.h
index 6c8294cca..3fbcfdb0f 100644
--- a/modules/ui_extensions/bs_input_event_key.h
+++ b/modules/ui_extensions/bs_input_event_key.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 
 class BSInputEventKey : public InputEventKey {
 	GDCLASS(BSInputEventKey, InputEventKey);
diff --git a/modules/ui_extensions/input_map_editor.cpp b/modules/ui_extensions/input_map_editor.cpp
index 89bb80eb5..c2c36a934 100644
--- a/modules/ui_extensions/input_map_editor.cpp
+++ b/modules/ui_extensions/input_map_editor.cpp
@@ -42,7 +42,7 @@
 #include "scene/gui/margin_container.h"
 
 #include "scene/gui/label.h"
-#include "core/input_map.h"
+#include "core/input/input_map.h"
 
 static const char *_button_names[JOY_BUTTON_MAX] = {
 	"DualShock Cross, Xbox A, Nintendo B",
diff --git a/modules/ui_extensions/register_types.cpp b/modules/ui_extensions/register_types.cpp
index 24e2a4393..e49f541df 100644
--- a/modules/ui_extensions/register_types.cpp
+++ b/modules/ui_extensions/register_types.cpp
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "bs_input_event_key.h"
 #include "input_map_editor.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "touch_button.h"
 
 void register_ui_extensions_types() {
diff --git a/modules/voxelman/world/voxel_world_editor.cpp b/modules/voxelman/world/voxel_world_editor.cpp
index 88ff04cb5..90b8798c6 100644
--- a/modules/voxelman/world/voxel_world_editor.cpp
+++ b/modules/voxelman/world/voxel_world_editor.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/camera.h"
 #include "scene/gui/slider.h"
diff --git a/platform/frt/keyboard_linux_input.cpp b/platform/frt/keyboard_linux_input.cpp
index 156189757..06189f766 100644
--- a/platform/frt/keyboard_linux_input.cpp
+++ b/platform/frt/keyboard_linux_input.cpp
@@ -30,7 +30,7 @@
 
 #define FRT_MOCK_GODOT_INPUT_MODIFIER_STATE
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #endif
 
 #include "frt.h"
diff --git a/platform/frt/keyboard_x11.cpp b/platform/frt/keyboard_x11.cpp
index b0eeb59d9..433406ff4 100644
--- a/platform/frt/keyboard_x11.cpp
+++ b/platform/frt/keyboard_x11.cpp
@@ -30,7 +30,7 @@
 
 #define FRT_MOCK_GODOT_INPUT_MODIFIER_STATE
 
-#include "core/os/input_event.h"
+#include "core/input/input_event.h"
 #endif
 
 #include "frt.h"
diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp
index e716c03fe..48d6b9ec7 100644
--- a/platform/frt/os_frt.cpp
+++ b/platform/frt/os_frt.cpp
@@ -32,7 +32,7 @@
 
 #include "core/version.h"
 #include "core/os/os.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/file_access.h"
 #include "drivers/unix/os_unix.h"
 #include "servers/visual_server.h"
diff --git a/platform/frt_sdl/sdl2_godot_mapping.h b/platform/frt_sdl/sdl2_godot_mapping.h
index 23dd36736..1b791f07b 100644
--- a/platform/frt_sdl/sdl2_godot_mapping.h
+++ b/platform/frt_sdl/sdl2_godot_mapping.h
@@ -10,7 +10,7 @@
 #define FRT_GODOT_VERSION ((((VERSION_MAJOR * 100) + VERSION_MINOR) * 100) + VERSION_PATCH)
 
 #include "core/os/os.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "main/input_default.h"
 
diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h
index 2c12b33f4..e5c381e47 100644
--- a/platform/iphone/os_iphone.h
+++ b/platform/iphone/os_iphone.h
@@ -32,7 +32,7 @@
 
 #ifdef IPHONE_ENABLED
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "drivers/coreaudio/audio_driver_coreaudio.h"
 #include "drivers/unix/os_unix.h"
 #include "joypad_iphone.h"
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index d8819ac71..7762a8791 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -32,7 +32,7 @@
 
 #define BitMap _QDBitMap // Suppress deprecated QuickDraw definition.
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "crash_handler_osx.h"
 #include "drivers/coreaudio/audio_driver_coreaudio.h"
 #include "drivers/coremidi/midi_driver_coremidi.h"
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 4a009b056..265256b25 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "context_gl_windows.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
 #include "crash_handler_windows.h"
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 0747e8ea3..20beed21d 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -32,7 +32,7 @@
 
 #include "context_gl_x11.h"
 #include "core/containers/local_vector.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "crash_handler_x11.h"
 #include "drivers/alsa/audio_driver_alsa.h"
 #include "drivers/alsamidi/midi_driver_alsamidi.h"
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index bf5660a1f..08bacba89 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -31,7 +31,7 @@
 #include "canvas_item.h"
 #include "core/object/message_queue.h"
 #include "core/object/method_bind_ext.gen.inc"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/version.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/viewport.h"
diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp
index 4aee1f1bf..86577c5e0 100644
--- a/scene/2d/touch_screen_button.cpp
+++ b/scene/2d/touch_screen_button.cpp
@@ -30,8 +30,8 @@
 
 #include "touch_screen_button.h"
 
-#include "core/input_map.h"
-#include "core/os/input.h"
+#include "core/input/input_map.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/rectangle_shape_2d.h"
diff --git a/scene/debugger/script_debugger_remote.cpp b/scene/debugger/script_debugger_remote.cpp
index 475b8ae66..b26fc5b4b 100644
--- a/scene/debugger/script_debugger_remote.cpp
+++ b/scene/debugger/script_debugger_remote.cpp
@@ -35,7 +35,7 @@
 #include "core/io/marshalls.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
 #include "scene/main/node.h"
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index ad45bb896..22db1ba88 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -31,7 +31,7 @@
 #include "base_button.h"
 
 #include "core/os/keyboard.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/viewport.h"
 #include "scene/scene_string_names.h"
 
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 769254519..2a3ffd4e5 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -30,7 +30,7 @@
 
 #include "color_picker.h"
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 
@@ -41,7 +41,7 @@
 #include "scene/gui/popup.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp
index fb45515e9..7b269dcea 100644
--- a/scene/gui/color_rect.cpp
+++ b/scene/gui/color_rect.cpp
@@ -30,7 +30,7 @@
 
 #include "color_rect.h"
 
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 
 void ColorRect::set_frame_color(const Color &p_color) {
 	color = p_color;
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index acea0c4da..ec0487736 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -37,7 +37,7 @@
 #include "core/config/project_settings.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/node.h"
 #include "scene/main/timer.h"
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index e2549ffea..6dd9618f0 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -37,7 +37,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/texture_button.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 61746755c..83fae073d 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -33,7 +33,7 @@
 #include "core/os/keyboard.h"
 #include "core/string/print_string.h"
 #include "scene/gui/label.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 
 #include "box_container.h"
 #include "core/os/dir_access.h"
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 4d45ec9f9..2f29fd69c 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -31,13 +31,13 @@
 #include "graph_edit.h"
 
 #include "core/math/math_funcs.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/graph_node.h"
 #include "scene/gui/label.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 6909731f9..66e59e590 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -31,14 +31,14 @@
 #include "line_edit.h"
 
 #include "core/object/message_queue.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/translation.h"
 #include "label.h"
 #include "scene/gui/popup_menu.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
 
diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp
index a20c58e3d..d64ae9082 100644
--- a/scene/gui/link_button.cpp
+++ b/scene/gui/link_button.cpp
@@ -31,7 +31,7 @@
 #include "link_button.h"
 
 #include "core/string/translation.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 
 void LinkButton::set_text(const String &p_text) {
 	if (text == p_text) {
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index e5283aff4..eb02bdded 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -29,10 +29,10 @@
 /*************************************************************************/
 
 #include "menu_button.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "scene/gui/popup_menu.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/viewport.h"
 
 void MenuButton::_unhandled_key_input(Ref<InputEvent> p_event) {
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index c25da861b..e48bd10bc 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -29,10 +29,10 @@
 /*************************************************************************/
 
 #include "option_button.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/string/print_string.h"
 #include "scene/gui/popup_menu.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 
 static const int NONE_SELECTED = -1;
 
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 83f1f8ece..37c1e00e1 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -29,13 +29,13 @@
 /*************************************************************************/
 
 #include "popup_menu.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/config/project_settings.h"
 #include "core/string/translation.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/timer.h"
 
 PopupMenu::Item::Item() {
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp
index 55209e393..447ad45db 100644
--- a/scene/gui/spin_box.cpp
+++ b/scene/gui/spin_box.cpp
@@ -30,9 +30,9 @@
 
 #include "spin_box.h"
 #include "core/math/expression.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "scene/gui/popup_menu.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/timer.h"
 
 Size2 SpinBox::get_minimum_size() const {
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index fdcf2b55d..6259fd140 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -31,7 +31,7 @@
 #include "text_edit.h"
 
 #include "core/object/message_queue.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
@@ -39,7 +39,7 @@
 #include "label.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
 
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index f0bdd31bd..319463dc1 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -31,7 +31,7 @@
 #include "tree.h"
 
 #include "core/math/math_funcs.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
@@ -39,7 +39,7 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/slider.h"
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 05b23fef6..c7819ae33 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -31,7 +31,7 @@
 #include "viewport.h"
 
 #include "core/core_string_names.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
 #include "scene/2d/camera_2d.h"
@@ -48,7 +48,7 @@
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/popup_menu.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/viewport_container.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/timer.h"
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 5186e1878..681f5362e 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -113,7 +113,7 @@
 #include "scene/gui/scroll_bar.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index 3a6457eec..11c794b88 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -38,7 +38,7 @@
 #include "scene/2d/node_2d.h"
 #include "scene/3d/spatial.h"
 #include "scene/gui/control.h"
-#include "scene/gui/shortcut.h"
+#include "core/input/shortcut.h"
 #include "scene/main/instance_placeholder.h"
 #include "scene/property_utils.h"