-#include <xbt/Extendable.hpp>
-#include <xbt/signal.hpp>
-#include <xbt/string.hpp>
-#include <xbt/swag.h>
-
-#include <simgrid/simix.h>
-#include <simgrid/datatypes.h>
-#include <simgrid/s4u/forward.hpp>
+#include "xbt/Extendable.hpp"
+#include "xbt/dict.h"
+#include "xbt/signal.hpp"
+#include "xbt/string.hpp"
+#include "xbt/swag.h"
+
+#include "simgrid/forward.h"
+#include "simgrid/s4u/forward.hpp"