chop includes

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index 11bd0b1..c362f99 100644 (file)
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -14,7 +14,6 @@
 #ifndef SIMGRID_MODELCHECKER_H
 #define SIMGRID_MODELCHECKER_H
 
 #ifndef SIMGRID_MODELCHECKER_H
 #define SIMGRID_MODELCHECKER_H
 

-#include <stdbool.h>

 #include <stddef.h> /* size_t */
 
 #include <simgrid_config.h> /* SIMGRID_HAVE_MC ? */
 #include <stddef.h> /* size_t */
 
 #include <simgrid_config.h> /* SIMGRID_HAVE_MC ? */

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 2d3cdb3..9a6efb7 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -7,7 +7,6 @@
 #ifndef MSG_H
 #define MSG_H
 
 #ifndef MSG_H
 #define MSG_H
 

-#include "xbt.h"

 #include "xbt/lib.h"
 #include "simgrid/forward.h"
 #include "simgrid/simix.h"
 #include "xbt/lib.h"
 #include "simgrid/forward.h"
 #include "simgrid/simix.h"

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index e4ace91..b85daaa 100644 (file)
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2017. 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. */
 
 /* 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. */


@@ -7,11 +6,6 @@
 #ifndef SIMGRID_S4U_ACTIVITY_HPP
 #define SIMGRID_S4U_ACTIVITY_HPP
 
 #ifndef SIMGRID_S4U_ACTIVITY_HPP
 #define SIMGRID_S4U_ACTIVITY_HPP
 

-#include <cstdlib>
-
-#include <xbt/base.h>
-#include <xbt/misc.h>
-

 #include <simgrid/s4u/forward.hpp>
 #include <simgrid/forward.h>
 
 #include <simgrid/s4u/forward.hpp>
 #include <simgrid/forward.h>
 

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 4914e5e..5517dc6 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -16,15 +16,11 @@
 #include <utility>
 #include <vector>
 
 #include <utility>
 #include <vector>
 

-#include <boost/intrusive_ptr.hpp>
-

 #include <xbt/Extendable.hpp>
 #include <xbt/Extendable.hpp>

-#include <xbt/base.h>

 #include <xbt/functional.hpp>
 #include <xbt/string.hpp>
 
 #include <simgrid/chrono.hpp>
 #include <xbt/functional.hpp>
 #include <xbt/string.hpp>
 
 #include <simgrid/chrono.hpp>

-#include <simgrid/simix.h>

 #include <simgrid/s4u/forward.hpp>
 
 namespace simgrid {
 #include <simgrid/s4u/forward.hpp>
 
 namespace simgrid {

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index a09f323..7e0e9e3 100644 (file)
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -7,14 +7,7 @@
 #ifndef SIMGRID_SIMIX_HPP
 #define SIMGRID_SIMIX_HPP
 
 #ifndef SIMGRID_SIMIX_HPP
 #define SIMGRID_SIMIX_HPP
 

-#include <cstddef>
-
-#include <string>
-#include <utility>
-#include <memory>
-#include <functional>
-
-#include <xbt/function_types.h>
+//#include <xbt/function_types.h>

 #include <xbt/future.hpp>
 #include <xbt/functional.hpp>
 #include <xbt/signal.hpp>
 #include <xbt/future.hpp>
 #include <xbt/functional.hpp>
 #include <xbt/signal.hpp>

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index b93f958..d6c6b2b 100644 (file)
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -15,14 +15,12 @@
 #include <exception>
 #include <functional>
 #include <memory>
 #include <exception>
 #include <functional>
 #include <memory>

-#include <string>
-#include <tuple>

 #include <type_traits>
 #include <utility>
 #include <vector>
 
 #include <type_traits>
 #include <utility>
 #include <vector>
 

-#include <xbt/sysdep.h>
-#include <xbt/utility.hpp>
+#include "xbt/sysdep.h"
+#include "xbt/utility.hpp"

 
 namespace simgrid {
 namespace xbt {
 
 namespace simgrid {
 namespace xbt {

diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index 9b7e47b..4a53a46 100644 (file)
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -9,7 +9,7 @@
 #include "simgrid/s4u/Actor.hpp"
 #include "src/simix/popping_private.h"
 #include "xbt/swag.h"
 #include "simgrid/s4u/Actor.hpp"
 #include "src/simix/popping_private.h"
 #include "xbt/swag.h"

-#include<list>
+#include <list>

 
 typedef struct s_smx_process_exit_fun {
   int_f_pvoid_pvoid_t fun;
 
 typedef struct s_smx_process_exit_fun {
   int_f_pvoid_pvoid_t fun;