further reduce the amount of includes

diff --git a/examples/msg/dht-pastry/dht-pastry.c b/examples/msg/dht-pastry/dht-pastry.c
index e6c50ff..26e3579 100644 (file)
--- a/examples/msg/dht-pastry/dht-pastry.c
+++ b/examples/msg/dht-pastry/dht-pastry.c
@@ -4,8 +4,9 @@
 /* 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 <math.h>
 #include "simgrid/msg.h"
+#include "xbt/fifo.h"
+#include <math.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pastry, "Messages specific for this msg example");
 

diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.c b/examples/simdag/dag-dotload/sd_dag-dotload.c
index 3155441..11260d9 100644 (file)
--- a/examples/simdag/dag-dotload/sd_dag-dotload.c
+++ b/examples/simdag/dag-dotload/sd_dag-dotload.c
@@ -9,7 +9,6 @@
 #include "simgrid/simdag.h"
 #include "xbt/log.h"
 #include <stdio.h>
-#include <string.h>
 #include <libgen.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this SimDag example");

diff --git a/examples/simdag/daxload/sd_daxload.c b/examples/simdag/daxload/sd_daxload.c
index 50391f4..45cbd05 100644 (file)
--- a/examples/simdag/daxload/sd_daxload.c
+++ b/examples/simdag/daxload/sd_daxload.c
@@ -8,8 +8,6 @@
 
 #include "simgrid/simdag.h"
 #include "xbt/file.h"
-#include <stdio.h>
-#include <string.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this SimDag example");
 

diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.c b/examples/simdag/ptg-dotload/sd_ptg-dotload.c
index 1ac5e62..4104475 100644 (file)
--- a/examples/simdag/ptg-dotload/sd_ptg-dotload.c
+++ b/examples/simdag/ptg-dotload/sd_ptg-dotload.c
@@ -4,7 +4,6 @@
 /* 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 <stdio.h>
 #include "simgrid/simdag.h"
 #include "xbt/log.h"
 

diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h
index 684e40c..d11221e 100644 (file)
--- a/include/simgrid/instr.h
+++ b/include/simgrid/instr.h
@@ -7,10 +7,7 @@
 #ifndef INSTR_H_
 #define INSTR_H_
 
-#include "simgrid_config.h"
-
 #include "xbt.h"
-#include "xbt/graph.h"
 #include "simgrid/msg.h"
 
 SG_BEGIN_DECL()

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index d17f9e0..9a70662 100644 (file)
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -10,10 +10,10 @@
 
 #include <boost/unordered_map.hpp>
 
-#include <xbt/base.h>
-#include <xbt/string.hpp>
-#include <xbt/signal.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>

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 404d379..b41becd 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -7,13 +7,10 @@
 #ifndef SIMDAG_SIMDAG_H
 #define SIMDAG_SIMDAG_H
 
-#include "xbt/misc.h"
-#include "xbt/dynar.h"
-#include "xbt/dict.h"
-#include "xbt/asserts.h"
-#include "xbt/log.h"
-#include "simgrid/link.h"
 #include "simgrid/host.h"
+#include "simgrid/link.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 #ifdef __cplusplus
 #include <set>
 #endif

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 93176f4..4d861d5 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -7,14 +7,10 @@
 #ifndef _SIMIX_SIMIX_H
 #define _SIMIX_SIMIX_H
 
-#include "xbt/misc.h"
-#include "xbt/fifo.h"
-#include "xbt/dict.h"
-#include "xbt/function_types.h"
-#include "xbt/parmap.h"
-#include "xbt/swag.h"
 #include "simgrid/datatypes.h"
 #include "simgrid/host.h"
+#include "xbt/ex.h"
+#include "xbt/parmap.h"
 
 #ifdef __cplusplus
 

diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index f9623d1..4bb1dcf 100644 (file)
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -6,18 +6,10 @@
 #ifndef _SIMIX_ACTORIMPL_H
 #define _SIMIX_ACTORIMPL_H
 
-#include <atomic>
-#include <functional>
-#include <string>
-
-#include <xbt/base.h>
-#include <xbt/string.hpp>
-
-#include <simgrid/simix.hpp>
-#include <simgrid/s4u/Actor.hpp>
-
-#include "simgrid/simix.h"
-#include "popping_private.h"
+#include "simgrid/s4u/Actor.hpp"
+#include "src/simix/popping_private.h"
+#include "xbt/fifo.h"
+#include "xbt/swag.h"
 
 typedef struct s_smx_process_exit_fun {
   int_f_pvoid_pvoid_t fun;

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index 157deca..2e12211 100644 (file)
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -9,12 +9,8 @@
 
 #include <boost/circular_buffer.hpp>
 
-#include <xbt/base.h>
+#include "simgrid/s4u/Mailbox.hpp"
 
-#include <simgrid/s4u/Mailbox.hpp>
-
-#include "simgrid/simix.h"
-#include "popping_private.h"
 #include "src/simix/ActorImpl.hpp"
 
 

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index e78326f..85d2dfa 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -7,22 +7,6 @@
 #ifndef _SIMIX_PRIVATE_H
 #define _SIMIX_PRIVATE_H
 
-#include <functional>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#include <xbt/functional.hpp>
-
-#include "src/internal_config.h"
-#include "simgrid/simix.h"
-#include "surf/surf.h"
-#include "xbt/config.h"
-#include "xbt/xbt_os_time.h"
-#include "xbt/function_types.h"
-#include "src/xbt/ex_interface.h"
-#include "src/instr/instr_private.h"
-
 #include <signal.h>
 #include "src/kernel/context/Context.hpp"
 

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index 06bd94b..a8c4dad 100644 (file)
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -6,15 +6,8 @@
 #ifndef _SIMIX_SYNCHRO_PRIVATE_H
 #define _SIMIX_SYNCHRO_PRIVATE_H
 
-#include <atomic>
-
-#include <simgrid/s4u/Mutex.hpp>
-#include <simgrid/s4u/conditionVariable.hpp>
-
-#include "xbt/base.h"
+#include "simgrid/s4u/conditionVariable.hpp"
 #include "xbt/swag.h"
-#include "xbt/xbt_os_thread.h"
-#include "src/simix/popping_private.h"
 
 namespace simgrid {
 namespace simix {