-/* Copyright (c) 2008-2015. The SimGrid Team.
+/* Copyright (c) 2008-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "xbt/config.h"
#include "xbt/log.h"
-#include <xbt/str.h>
+#include <xbt/sysdep.h>
#include <mc/mc.h>
#include "src/mc/mc_replay.h"
#include <simgrid/sg_config.h>
#if SIMGRID_HAVE_MC
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_private.h"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_safety.hpp"
#endif
-#include "src/mc/mc_record.h"
+#include "src/mc/mc_record.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc, "Configuration of the Model Checker");