diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am
index 3d3af9f3..0d21c976 100644
--- a/simgear/ephemeris/Makefile.am
+++ b/simgear/ephemeris/Makefile.am
@@ -16,4 +16,4 @@ libAstro_a_SOURCES = \
 	uranus.cxx uranus.hxx \
 	venus.cxx venus.hxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
diff --git a/simgear/ephemeris/celestialBody.cxx b/simgear/ephemeris/celestialBody.cxx
index 67dd5059..502ae504 100644
--- a/simgear/ephemeris/celestialBody.cxx
+++ b/simgear/ephemeris/celestialBody.cxx
@@ -22,7 +22,7 @@
  * $Id$
  **************************************************************************/
 
-#include <Debug/logstream.hxx>
+#include <simgear/logstream.hxx>
 
 #ifdef FG_MATH_EXCEPTION_CLASH
 #  define exception c_exception
diff --git a/simgear/ephemeris/celestialBody.hxx b/simgear/ephemeris/celestialBody.hxx
index 3deccc09..410ca01a 100644
--- a/simgear/ephemeris/celestialBody.hxx
+++ b/simgear/ephemeris/celestialBody.hxx
@@ -31,8 +31,9 @@
 #endif                                   
 
 
+#include <simgear/constants.h>
+
 #include <Time/fg_time.hxx>
-#include <Include/fg_constants.h>
 
 class Star;
 
diff --git a/simgear/ephemeris/moon.cxx b/simgear/ephemeris/moon.cxx
index 7b3d4b79..65f4ef2b 100644
--- a/simgear/ephemeris/moon.cxx
+++ b/simgear/ephemeris/moon.cxx
@@ -25,9 +25,10 @@
 
 #include <string.h>
 
-#include <Debug/logstream.hxx>
+#include <simgear/logstream.hxx>
+#include <simgear/fgpath.hxx>
+
 #include <Main/options.hxx>
-#include <Misc/fgpath.hxx>
 #include <Objects/texload.h>
 
 #ifdef __BORLANDC__
diff --git a/simgear/ephemeris/moon.hxx b/simgear/ephemeris/moon.hxx
index 62451601..619c159f 100644
--- a/simgear/ephemeris/moon.hxx
+++ b/simgear/ephemeris/moon.hxx
@@ -24,8 +24,9 @@
 #ifndef _MOON_HXX_
 #define _MOON_HXX_
 
+#include <simgear/constants.h>
+
 #include <Aircraft/aircraft.hxx>
-#include <Include/fg_constants.h>
 #include <Main/views.hxx>
 #include <Time/fg_time.hxx>
 
diff --git a/simgear/ephemeris/sky.cxx b/simgear/ephemeris/sky.cxx
index 25b57cdf..1ae7ddf0 100644
--- a/simgear/ephemeris/sky.cxx
+++ b/simgear/ephemeris/sky.cxx
@@ -32,14 +32,15 @@
 #include <math.h>
 
 #include <GL/glut.h>
-#include <XGL/xgl.h>
+#include <simgear/xgl.h>
+
+#include <simgear/logstream.hxx>
+#include <simgear/constants.h>
+#include <simgear/fg_random.h>
 
 #include <Aircraft/aircraft.hxx>
-#include <Debug/logstream.hxx>
 #include <FDM/flight.hxx>
-#include <Include/fg_constants.h>
 #include <Main/views.hxx>
-#include <Math/fg_random.h>
 #include <Time/event.hxx>
 #include <Time/fg_time.hxx>
 
diff --git a/simgear/ephemeris/solarsystem.cxx b/simgear/ephemeris/solarsystem.cxx
index 56c78d8e..4d5db44f 100644
--- a/simgear/ephemeris/solarsystem.cxx
+++ b/simgear/ephemeris/solarsystem.cxx
@@ -36,8 +36,10 @@
 #include <math.h>
 
 #include <GL/glut.h>
-#include <XGL/xgl.h>
-#include <Debug/logstream.hxx>
+#include <simgear/xgl.h>
+
+#include <simgear/logstream.hxx>
+
 #include <Time/sunpos.hxx>
 #include <Time/moonpos.hxx>
 #include "solarsystem.hxx"
diff --git a/simgear/ephemeris/star.cxx b/simgear/ephemeris/star.cxx
index edf5223b..63e207a7 100644
--- a/simgear/ephemeris/star.cxx
+++ b/simgear/ephemeris/star.cxx
@@ -26,10 +26,13 @@
 #  define exception c_exception
 #endif
 #include <math.h>
+
+#include <simgear/logstream.hxx>
+
 #include <Time/sunpos.hxx>
-#include <Debug/logstream.hxx>
 #include <Time/light.hxx>
 #include <Main/options.hxx>
+
 #include "star.hxx"
 
 /*************************************************************************
diff --git a/simgear/ephemeris/stars.cxx b/simgear/ephemeris/stars.cxx
index 057a3992..ab6e5ceb 100644
--- a/simgear/ephemeris/stars.cxx
+++ b/simgear/ephemeris/stars.cxx
@@ -30,7 +30,8 @@
 #  include <windows.h>
 #endif
 
-#include "Include/compiler.h"
+#include <simgear/compiler.h>
+
 #ifdef FG_HAVE_STD_INCLUDES
 #  include <cmath>
 #  include <cstdio>
@@ -46,18 +47,18 @@
 #include <string>
 
 #include <GL/glut.h>
-#include <XGL/xgl.h>
+#include <simgear/xgl.h>
+
+#include <simgear/logstream.hxx>
+#include <simgear/constants.h>
+#include <simgear/fgpath.hxx>
+#include <simgear/fgstream.hxx>
+#include <simgear/stopwatch.hxx>
 
 #include <Aircraft/aircraft.hxx>
-#include <Debug/logstream.hxx>
-#include <Include/fg_constants.h>
-#include <Misc/fgpath.hxx>
-#include <Misc/fgstream.hxx>
-#include <Misc/stopwatch.hxx>
 #include <Main/options.hxx>
 #include <Main/views.hxx>
 #include <Time/fg_time.hxx>
-#include "Misc/stopwatch.hxx"
 
 #include "stars.hxx"