One more pass at a reorg.

diff --git a/simgear/ephemeris/celestialBody.cxx b/simgear/ephemeris/celestialBody.cxx
index 502ae504e1481f8ffd2318e00354a39af62817b9..a46a34dfca3c416f5efcaf9f923c8fb405c6505f 100644 (file)
--- a/simgear/ephemeris/celestialBody.cxx
+++ b/simgear/ephemeris/celestialBody.cxx
@@ -22,7 +22,7 @@
  * $Id$
  **************************************************************************/
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #ifdef FG_MATH_EXCEPTION_CLASH
 #  define exception c_exception

diff --git a/simgear/ephemeris/moon.cxx b/simgear/ephemeris/moon.cxx
index 65f4ef2b7b14ddbf598b4cc1bc3a9c9141b2f276..c36b076a8469652f0f49ef29764a4066bff68683 100644 (file)
--- a/simgear/ephemeris/moon.cxx
+++ b/simgear/ephemeris/moon.cxx
@@ -25,8 +25,8 @@
 
 #include <string.h>
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Main/options.hxx>
 #include <Objects/texload.h>

diff --git a/simgear/ephemeris/sky.cxx b/simgear/ephemeris/sky.cxx
index 1ae7ddf0a52b042a1b5df1c8aec87c9cf1b6c6d4..3277d0e76607bb4f88c46f4a27bebc22c89daf17 100644 (file)
--- a/simgear/ephemeris/sky.cxx
+++ b/simgear/ephemeris/sky.cxx
@@ -32,11 +32,11 @@
 #include <math.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_random.h>
 
 #include <Aircraft/aircraft.hxx>
 #include <FDM/flight.hxx>

diff --git a/simgear/ephemeris/solarsystem.cxx b/simgear/ephemeris/solarsystem.cxx
index 4d5db44fc0cbe5c17e36e5ccf9a4958f774ba58f..c2bb1e74016abdc1c2858d94cbac57d7a8f0ca77 100644 (file)
--- a/simgear/ephemeris/solarsystem.cxx
+++ b/simgear/ephemeris/solarsystem.cxx
@@ -36,9 +36,9 @@
 #include <math.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include <Time/sunpos.hxx>
 #include <Time/moonpos.hxx>

diff --git a/simgear/ephemeris/star.cxx b/simgear/ephemeris/star.cxx
index 63e207a7fcfb76f6ea7758cc82bcbea342ee8de2..01f8c0d673b71e75cdb2cc4eb0cd085d51f16651 100644 (file)
--- a/simgear/ephemeris/star.cxx
+++ b/simgear/ephemeris/star.cxx
@@ -27,7 +27,7 @@
 #endif
 #include <math.h>
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include <Time/sunpos.hxx>
 #include <Time/light.hxx>

diff --git a/simgear/ephemeris/stars.cxx b/simgear/ephemeris/stars.cxx
index ab6e5cebb3f63b7fd1dd743b82a0f789dc82c432..2a767748dae39cbac90cfb018b51e937ad16c482 100644 (file)
--- a/simgear/ephemeris/stars.cxx
+++ b/simgear/ephemeris/stars.cxx
@@ -47,13 +47,13 @@
 #include <string>
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fgpath.hxx>
-#include <simgear/fgstream.hxx>
-#include <simgear/stopwatch.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/stopwatch.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Main/options.hxx>