-/* Copyright (c) 2014-2015. The SimGrid Team.
+/* Copyright (c) 2014-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "xbt/sysdep.h"
#include "src/internal_config.h"
-#include "src/smpi/private.h"
+#include "src/smpi/include/private.h"
#include "src/mc/mc_snapshot.h"
#include "src/mc/mc_private.h"
#ifdef SIMGRID_TEST
-#include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
#include <sys/mman.h>