From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 20 Mar 2018 14:23:56 +0000 (+0100)
Subject: do not include msg from s4u and surf
X-Git-Tag: v3.19~8
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5f9b6053027484ea411db0d1ee44ac258c9816f1

do not include msg from s4u and surf
---

diff --git a/include/simgrid/zone.h b/include/simgrid/zone.h
index bd7bf722e9..4dac581086 100644
--- a/include/simgrid/zone.h
+++ b/include/simgrid/zone.h
@@ -10,6 +10,7 @@
 
 #include <simgrid/forward.h>
 #include <xbt/base.h>
+#include <xbt/dict.h>
 
 /* C interface */
 SG_BEGIN_DECL()
diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index 5895951e4a..b17967db20 100644
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -4,13 +4,13 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/msg.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/simix.hpp"
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
 #include "xbt/log.h"
+#include <simgrid/zone.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
 
diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index 502b55689b..fe8d8ffbde 100644
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -4,12 +4,12 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/kernel/resource/Resource.hpp"
-#include "simgrid/msg.h"
 #include "simgrid/plugins/file_system.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"
+#include "simgrid/storage.h"
 #include "src/surf/StorageImpl.hpp"
 #include <unordered_map>
 
diff --git a/src/surf/plugins/host_dvfs.cpp b/src/surf/plugins/host_dvfs.cpp
index fd3a2388aa..555d67ae53 100644
--- a/src/surf/plugins/host_dvfs.cpp
+++ b/src/surf/plugins/host_dvfs.cpp
@@ -12,7 +12,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <simgrid/msg.h>
 #include <simgrid/s4u/Engine.hpp>
 #include <string>
 #include <utility>