-#include <Debug/logstream.hxx>
-#include <Include/fg_types.hxx>
-#include <Main/options.hxx>
-
-#include <Network/iochannel.hxx>
-#include <Network/fg_file.hxx>
-#include <Network/fg_serial.hxx>
-#include <Network/fg_socket.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
+#include <simgear/io/sg_file.hxx>
+#include <simgear/io/sg_serial.hxx>
+#include <simgear/io/sg_socket.hxx>
+#include <simgear/math/sg_types.hxx>
+#include <simgear/timing/timestamp.hxx>