#include <elfutils/libdw.h>
#include "mc/mc.h"
-#include "mc_base.h"
+#include "src/mc/mc_base.h"
#include "mc/datatypes.h"
#include "xbt/fifo.h"
#include "xbt/config.h"
#ifdef __cplusplus
-#include "../xbt/memory_map.hpp"
+#include "src/xbt/memory_map.hpp"
#endif
#include "xbt/function_types.h"
#include "xbt/mmalloc.h"
-#include "../simix/smx_private.h"
-#include "../xbt/mmalloc/mmprivate.h"
+#include "src/simix/smx_private.h"
+#include "src/xbt/mmalloc/mmprivate.h"
#include "xbt/automaton.h"
-#include "xbt/hash.h"
#include <simgrid/msg.h>
#include "xbt/strbuff.h"
#include "xbt/parmap.h"
#include <xbt/base.h>
-#include "mc_forward.h"
-#include "mc_protocol.h"
+#include "src/mc/mc_forward.h"
+#include "src/mc/mc_protocol.h"
SG_BEGIN_DECL()
#ifdef __cplusplus
-XBT_PRIVATE void MC_find_object_address(
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE void find_object_address(
std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
+}
+}
+
#endif
SG_END_DECL()