Advanced input subsystem - Step1: cleanup dependencies

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 8fd21a333f61d3661b45842344ff3f6588802e73..449979e7ede5775f2cb92dd3a0f428ec4fb5b8fe 100644 (file)
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -4,7 +4,7 @@
 #  include "config.h"
 #endif
 
-#include <Input/input.hxx>
+#include <simgear/structure/SGBinding.hxx>
 #include <Scripting/NasalSys.hxx>
 #include <Main/fg_os.hxx>
 

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 1d2ccfba8b5255de8cf8ff3821be3132242af04b..bf418145b2fe7e74e730fcb536268efc9c67f28c 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -46,6 +46,7 @@
 #include <Cockpit/panel.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Main/fg_os.hxx>
 #include <Main/renderer.hxx>
 #include <Main/viewmgr.hxx>
 #include <GUI/new_gui.hxx>

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index db8e32aab94bb23a307fdb5540c2962dbe225070..513277dfc0f97f1dbd5b75feff4166996033b95e 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -6,8 +6,8 @@
 #include <iostream>
 #include <plib/pu.h>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/structure/SGBinding.hxx>
 
-#include <Input/input.hxx>
 #include <Main/globals.hxx>
 
 #include "new_gui.hxx"

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index a754e692271c2272e53945437226dadfa5942c4a..237e041ce5f4442eb2d470554718b6db21b4c8d9 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -38,6 +38,7 @@
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
+#include "fg_os.hxx"
 #include "fg_commands.hxx"
 #include "fg_props.hxx"
 #include "globals.hxx"

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index d9a2516ad7336e6187adba7e94059f4080c0f9eb..2a453c9e834f934cbcb9babdb4ea66bd70c4d00f 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -79,6 +79,7 @@
 #include "main.hxx"
 #include "util.hxx"
 #include "fg_init.hxx"
+#include "fg_os.hxx"
 #include "WindowSystemAdapter.hxx"
 
 

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index c3aeb4bfb8ebf00e736b713722a5cef4096cd395..f1458ead5dee72578fafb5e6ac602228a1a26393 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -63,6 +63,7 @@
 #include <simgear/scene/sky/sky.hxx>
 #include <simgear/scene/util/SGUpdateVisitor.hxx>
 #include <simgear/scene/util/RenderConstants.hxx>
+#include <simgear/scene/util/SGSceneUserData.hxx>
 #include <simgear/scene/tgdb/GroundLightManager.hxx>
 #include <simgear/scene/tgdb/pt_lights.hxx>
 #include <simgear/props/props.hxx>