-#include <simgear/logstream.hxx>
-#include <simgear/fgstream.hxx>
-#include <simgear/newbucket.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/bucket/newbucket.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/fgpath.hxx>