#include "src/kernel/actor/SimcallObserver.hpp"
-#include "mc/datatypes.h"
#include "simgrid/forward.h" // aid_t
+#include "src/mc/datatypes.h"
+#include "src/xbt/mmalloc/mmalloc.h"
+#include <xbt/utility.hpp>
+
#include <array>
#include <cstdint>
-#include <xbt/dynar.h>
-#include <xbt/mmalloc.h>
-#include <xbt/utility.hpp>
// ***** Messages
namespace simgrid::mc {