#include "mc/datatypes.h"
#include "xbt/fifo.h"
#include "xbt/config.h"
+#include <libunwind.h>
+#include <dwarf.h>
#include "xbt/function_types.h"
#include "xbt/mmalloc.h"
#include "../xbt/mmalloc/mmprivate.h"
#include "xbt/automaton.h"
#include "xbt/hash.h"
-#include "msg/msg.h"
-#include "msg/datatypes.h"
+#include <simgrid/msg.h>
#include "xbt/strbuff.h"
#include "xbt/parmap.h"