One more pass at a reorg.

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

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>

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>

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>

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>

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>