From 71980d9754a6693a769dce2f1e55d92103b46b5e Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 24 Jun 2016 14:37:06 +0200
Subject: [PATCH] Remove some useless #includes

---
 examples/s4u/io/s4u_io.cpp                            | 1 -
 include/simgrid/kernel/future.hpp                     | 9 +++------
 include/simgrid/s4u/actor.hpp                         | 1 -
 include/simgrid/s4u/file.hpp                          | 2 --
 include/simgrid/s4u/host.hpp                          | 1 -
 include/simgrid/simix/blocking_simcall.hpp            | 7 +++----
 include/xbt/ex.h                                      | 2 --
 include/xbt/functional.hpp                            | 2 +-
 include/xbt/future.hpp                                | 6 ++----
 src/mc/mc_comm_pattern.h                              | 2 --
 src/mc/mc_safety.h                                    | 1 -
 src/simix/smx_global.cpp                              | 2 ++
 src/smpi/smpi_memory.cpp                              | 6 ++++--
 src/surf/AsClusterFatTree.cpp                         | 7 +++----
 src/surf/plugins/energy.cpp                           | 1 -
 src/surf/surf_interface.hpp                           | 2 --
 teshsuite/simix/generic_simcalls/generic_simcalls.cpp | 4 ++--
 17 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/examples/s4u/io/s4u_io.cpp b/examples/s4u/io/s4u_io.cpp
index b3aaa11a71..fc78c30374 100644
--- a/examples/s4u/io/s4u_io.cpp
+++ b/examples/s4u/io/s4u_io.cpp
@@ -4,7 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <unordered_map>
-#include <vector>
 
 #include "simgrid/s4u.h"
 
diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp
index cedfd39c96..5c11dbb056 100644
--- a/include/simgrid/kernel/future.hpp
+++ b/include/simgrid/kernel/future.hpp
@@ -7,7 +7,10 @@
 #ifndef SIMGRID_KERNEL_FUTURE_HPP
 #define SIMGRID_KERNEL_FUTURE_HPP
 
+#include <functional>
 #include <future>
+#include <memory>
+#include <utility>
 #include <type_traits>
 
 #include <boost/optional.hpp>
@@ -15,12 +18,6 @@
 #include <xbt/base.h>
 #include <xbt/functional.hpp>
 
-#include <functional>
-#include <future>
-#include <memory>
-#include <utility>
-#include <type_traits>
-
 namespace simgrid {
 namespace kernel {
 
diff --git a/include/simgrid/s4u/actor.hpp b/include/simgrid/s4u/actor.hpp
index 9b38309464..88d8b01b17 100644
--- a/include/simgrid/s4u/actor.hpp
+++ b/include/simgrid/s4u/actor.hpp
@@ -8,7 +8,6 @@
 
 #include <atomic>
 #include <functional>
-#include <future>
 #include <memory>
 #include <stdexcept>
 #include <type_traits>
diff --git a/include/simgrid/s4u/file.hpp b/include/simgrid/s4u/file.hpp
index 809bd7829b..4acf4c3606 100644
--- a/include/simgrid/s4u/file.hpp
+++ b/include/simgrid/s4u/file.hpp
@@ -6,8 +6,6 @@
 #ifndef SIMGRID_S4U_FILE_HPP
 #define SIMGRID_S4U_FILE_HPP
 
-#include <vector>
-
 #include <xbt/base.h>
 #include <simgrid/simix.h>
 
diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index 4283ab5f1d..7dd89ff19c 100644
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -7,7 +7,6 @@
 #define SIMGRID_S4U_HOST_HPP
 
 #include <boost/unordered_map.hpp>
-#include <vector>
 
 #include <xbt/base.h>
 #include <xbt/string.hpp>
diff --git a/include/simgrid/simix/blocking_simcall.hpp b/include/simgrid/simix/blocking_simcall.hpp
index 94774659ca..7fa0b25d6d 100644
--- a/include/simgrid/simix/blocking_simcall.hpp
+++ b/include/simgrid/simix/blocking_simcall.hpp
@@ -7,14 +7,13 @@
 #ifndef SIMGRID_SIMIX_BLOCKING_SIMCALL_HPP
 #define SIMGRID_SIMIX_BLOCKING_SIMCALL_HPP
 
-#include <iostream>
-
 #include <exception>
+#include <functional>
+#include <future>
+#include <utility>
 
 #include <xbt/sysdep.h>
 
-#include <future>
-
 #include <xbt/future.hpp>
 #include <simgrid/kernel/future.hpp>
 #include <simgrid/simix.h>
diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index d1e3fdf0f6..ce91604eeb 100644
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -46,8 +46,6 @@
 #include <stdlib.h>
 
 #ifdef __cplusplus
-#include <string>
-#include <vector>
 #include <stdexcept>
 #include <xbt/exception.hpp>
 #endif
diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index e4ab77636a..cf50e04fb2 100644
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -7,11 +7,11 @@
 #ifndef XBT_FUNCTIONAL_HPP
 #define XBT_FUNCTIONAL_HPP
 
+#include <cstddef>
 #include <cstdlib>
 
 #include <exception>
 #include <functional>
-#include <future>
 #include <utility>
 #include <tuple>
 
diff --git a/include/xbt/future.hpp b/include/xbt/future.hpp
index 7211c4ec77..578e7b2942 100644
--- a/include/xbt/future.hpp
+++ b/include/xbt/future.hpp
@@ -9,13 +9,11 @@
 
 #include <cstddef>
 
-#include <utility>
 #include <exception>
+#include <functional>
 #include <stdexcept>
-
 #include <type_traits>
-
-
+#include <utility>
 
 namespace simgrid {
 namespace xbt {
diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 6f4c1dac26..5721626757 100644
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -8,9 +8,7 @@
 #define SIMGRID_MC_COMM_PATTERN_H
 
 #include <cstddef>
-#include <cstring>
 
-#include <string>
 #include <vector>
 
 #include <simgrid_config.h>
diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index 23fbe10b07..8e0e164cd0 100644
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -9,7 +9,6 @@
 
 #include <stdint.h>
 
-#include <vector>
 #include <memory>
 
 #include <simgrid_config.h>
diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 6549bdba26..82691e1545 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -5,6 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <functional>
+#include <future>
+#include <memory>
 
 #include <signal.h> /* Signal handling */
 #include <stdlib.h>
diff --git a/src/smpi/smpi_memory.cpp b/src/smpi/smpi_memory.cpp
index 76ed963ed8..eb6a52bddf 100644
--- a/src/smpi/smpi_memory.cpp
+++ b/src/smpi/smpi_memory.cpp
@@ -4,9 +4,11 @@
 /* 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 <iostream>
+#include <cstdint>
+#include <climits>
+
+#include <vector>
 
-#include <limits.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
diff --git a/src/surf/AsClusterFatTree.cpp b/src/surf/AsClusterFatTree.cpp
index 8fea21e54c..18df2ff858 100644
--- a/src/surf/AsClusterFatTree.cpp
+++ b/src/surf/AsClusterFatTree.cpp
@@ -3,6 +3,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 <fstream>
+#include <sstream>
+
 #include "src/surf/AsClusterFatTree.hpp"
 #include "src/surf/network_interface.hpp"
 
@@ -11,10 +14,6 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
-
 #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
 
 
diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index 57ad84bd05..d457bcea04 100644
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -5,7 +5,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <utility>
-#include <vector>
 
 #include "simgrid/plugins/energy.h"
 #include "simgrid/simix.hpp"
diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index e42a2ebf5c..937297032b 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -7,8 +7,6 @@
 #define SURF_MODEL_H_
 
 #include <xbt.h>
-#include <string>
-#include <vector>
 #include <memory>
 #include <utility>
 
diff --git a/teshsuite/simix/generic_simcalls/generic_simcalls.cpp b/teshsuite/simix/generic_simcalls/generic_simcalls.cpp
index cf42eb708d..a1e0800592 100644
--- a/teshsuite/simix/generic_simcalls/generic_simcalls.cpp
+++ b/teshsuite/simix/generic_simcalls/generic_simcalls.cpp
@@ -4,8 +4,8 @@
 /* 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 <future>
-#include <list>
+#include <memory>
+#include <stdexcept>
 
 #include <xbt/future.hpp>
 
-- 
2.20.1