Clean fg_init.hxx

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 1a85d9b8ab8743c79382b04de85c2504f1c24cbe..96acc84e3bd1a8590fd7c57393dfe4a824241510 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -21,6 +21,7 @@
 #include <simgear/props/props.hxx>
 #include <simgear/structure/event_mgr.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>

diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index e4a254fd09c89c7cad0680420327dae950e4aa5d..1fc53a6fffa5e77a57d4d0a53f5f9e7bd68b7320 100644 (file)
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -25,25 +25,11 @@
 #ifndef _FG_INIT_HXX
 #define _FG_INIT_HXX
 
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
-#ifdef HAVE_CONFIG
-#  include <config.h>
-#endif
-
-#include <simgear/compiler.h>
-#include <simgear/timing/sg_time.hxx>
-
 #include <string>
 
-#include <Airports/simple.hxx>
-
-using std::string;
-
+// forward decls
+class SGPropertyNode;
+class SGTime;
 
 // Read in configuration (files and command line optoins) but only set
 // fg_root
@@ -51,7 +37,7 @@ bool fgInitFGRoot ( int argc, char **argv );
 
 
 // Return the current base package version
-string fgBasePackageVersion();
+std::string fgBasePackageVersion();
 
 
 // Read in configuration (file and command line)

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index abcd855352b2f588c97a6800bb61277eaaa530e9..2263a991ca1036e874889fa688ca235b8acdff6c 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -28,6 +28,7 @@
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include <math.h>              // rint()
 #include <stdio.h>

diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index 20b348569a7546241bcf77f2d0a936dc73056522..f1c940c969d61e8e4fd6069b70b7fd08f4e1f89d 100644 (file)
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -27,9 +27,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
-
-
-
+#include <simgear/timing/sg_time.hxx>
 
 #include <FDM/flightProperties.hxx>
 #include <Main/globals.hxx>