-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved. */
/* 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 <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/host.hpp"
-#include "simgrid/msg.h"
#include "instr/instr_interface.h"
-#include "msg_private.h"
#include "mc/mc.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
+#include "src/msg/msg_private.h"
#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");