-#include <simgear/fg_geodesy.hxx>
-#include <simgear/interpolater.hxx>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/interpolater.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/misc/fgpath.hxx>