From 712c213599a4a608ff1f84b2a58f88f8f35e2b43 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 20 Dec 2016 15:10:57 +0100
Subject: [PATCH 1/1] another bunch of include cuts. The last one for today

---
 include/simgrid/datatypes.h                |  2 +-
 include/simgrid/s4u/VirtualMachine.hpp     |  6 +++---
 include/simgrid/s4u/host.hpp               | 16 ++++++++--------
 src/instr/instr_config.cpp                 |  2 --
 src/plugins/vm/VirtualMachineImpl.hpp      |  1 +
 teshsuite/surf/surf_usage/surf_usage.cpp   |  1 +
 teshsuite/surf/surf_usage2/surf_usage2.cpp |  1 +
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/simgrid/datatypes.h b/include/simgrid/datatypes.h
index dd73424d05..35bf69e9c4 100644
--- a/include/simgrid/datatypes.h
+++ b/include/simgrid/datatypes.h
@@ -7,7 +7,7 @@
 #ifndef SIMGRID_DATATYPES_H_
 #define SIMGRID_DATATYPES_H_
 
-#include <simgrid/forward.h>
+#include "simgrid/forward.h"
 
 struct vm_params {
   int ncpus;
diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 3247e91fd4..6dfb9998d7 100644
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -6,9 +6,9 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
-#include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/host.hpp>
-#include <xbt/base.h>
+#include "simgrid/datatypes.h"
+#include "simgrid/s4u/forward.hpp"
+#include "simgrid/s4u/host.hpp"
 
 typedef enum {
   SURF_VM_STATE_CREATED, /**< created, but not yet started */
diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index 9a70662136..ea5d00a1bf 100644
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -10,14 +10,14 @@
 
 #include <boost/unordered_map.hpp>
 
-#include <xbt/Extendable.hpp>
-#include <xbt/signal.hpp>
-#include <xbt/string.hpp>
-#include <xbt/swag.h>
-
-#include <simgrid/simix.h>
-#include <simgrid/datatypes.h>
-#include <simgrid/s4u/forward.hpp>
+#include "xbt/Extendable.hpp"
+#include "xbt/dict.h"
+#include "xbt/signal.hpp"
+#include "xbt/string.hpp"
+#include "xbt/swag.h"
+
+#include "simgrid/forward.h"
+#include "simgrid/s4u/forward.hpp"
 
 namespace simgrid {
 
diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 558bb7e82d..5f29a40af9 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -5,9 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/instr/instr_private.h"
-#include "simgrid/sg_config.h"
 #include "surf/surf.h"
-#include <functional>
 #include <vector>
 
 XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)");
diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index be85c44173..0a87584f6e 100644
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -4,6 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/VirtualMachine.hpp"
+#include "simgrid/simix.h"
 #include "src/surf/HostImpl.hpp"
 
 #ifndef VM_INTERFACE_HPP_
diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp
index 8f60d2b965..fb33bb5739 100644
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf/surf.h"
+#include "simgrid/host.h"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/sg_config.h"
 #include "src/surf/cpu_interface.hpp"
diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp
index 27a1ac918e..b7e0950a2b 100644
--- a/teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf/surf.h"
+#include "simgrid/host.h"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/sg_config.h"
 #include "src/surf/cpu_interface.hpp"
-- 
2.20.1