diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 1a85d9b8a..96acc84e3 100644
--- 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 e4a254fd0..1fc53a6ff 100644
--- 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 abcd85535..2263a991c 100644
--- 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 20b348569..f1c940c96 100644
--- 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>