Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / simix / smx_environment.cpp

diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp
index 4025023187ee56ca8321bd7f0a160ec1ca16949a..ad6fe51ad9113ea6f9f6b85b41f113a6dadc4d23 100644 (file)
--- a/src/simix/smx_environment.cpp
+++ b/src/simix/smx_environment.cpp
@@ -1,15 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2018. 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 "smx_private.hpp"
-#include <xbt/ex.hpp>
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
+#include "src/include/surf/surf.hpp"
 #include "xbt/xbt_os_time.h"
-#include "xbt/config.h"
+#include <xbt/ex.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, "Logging specific to SIMIX (environment)");