Merge branch 'master' into fix/execute_benched

diff --cc src/smpi/internals/smpi_bench.cpp
index 0b68ed9,795521e..21fe974
--- 1/src/smpi/internals/smpi_bench.cpp
--- 2/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@@ -3,14 -3,13 +3,14 @@@
  /* This program is free software; you can redistribute it and/or modify it
   * under the terms of the license (GNU LGPL) which comes with this package. */
  
- #include "src/internal_config.h"
- #include "private.h"
  #include "private.hpp"
  #include "simgrid/modelchecker.h"
- #include "src/mc/mc_replay.h"
- #include "smpi_process.hpp"
  #include "smpi_comm.hpp"
 +#include "simgrid/host.h"
+ #include "smpi_process.hpp"
+ #include "src/internal_config.h"
+ #include "src/mc/mc_replay.hpp"
+ #include <unordered_map>
  
  #ifndef WIN32
  #include <sys/mman.h>