-#include "simgrid/s4u/channel.hpp"
-#include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/process.hpp"
+#include "s4u/actor.hpp"
+#include "s4u/mailbox.hpp"
+#include "s4u/engine.hpp"
+#include "s4u/host.hpp"
+
+#include "s4u/Activity.hpp"
+#include "s4u/comm.hpp"
+
+#include "s4u/storage.hpp"
+#include "s4u/file.hpp"