From 8fc9ce399c820955c66bd0f1fefd7de7aa66de90 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sat, 21 Dec 2019 21:33:05 +0100
Subject: [PATCH] Kill unused includes, and put the remaining ones at the top
 of the file.

---
 examples/deprecated/msg/mc/bugged1_liveness.c |  1 +
 examples/smpi/mc/bugged1_liveness.c           |  1 +
 examples/smpi/mc/mutual_exclusion.c           |  1 +
 include/xbt/virtu.h                           | 21 +++++++++----------
 src/surf/surf_interface.hpp                   |  1 +
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/examples/deprecated/msg/mc/bugged1_liveness.c b/examples/deprecated/msg/mc/bugged1_liveness.c
index 8fd8490502..d519d5d7c8 100644
--- a/examples/deprecated/msg/mc/bugged1_liveness.c
+++ b/examples/deprecated/msg/mc/bugged1_liveness.c
@@ -17,6 +17,7 @@
 
 #include <simgrid/modelchecker.h>
 #include <simgrid/msg.h>
+#include <xbt/dynar.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(bugged1_liveness, "my log messages");
 
diff --git a/examples/smpi/mc/bugged1_liveness.c b/examples/smpi/mc/bugged1_liveness.c
index 7b34808a20..8b9a4e6211 100644
--- a/examples/smpi/mc/bugged1_liveness.c
+++ b/examples/smpi/mc/bugged1_liveness.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <mpi.h>
 #include <simgrid/modelchecker.h>
+#include <xbt/dynar.h>
 
 #define GRANT_TAG 0
 #define REQUEST_TAG 1
diff --git a/examples/smpi/mc/mutual_exclusion.c b/examples/smpi/mc/mutual_exclusion.c
index 9a3de8cf24..eec4663313 100644
--- a/examples/smpi/mc/mutual_exclusion.c
+++ b/examples/smpi/mc/mutual_exclusion.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <mpi.h>
 #include <simgrid/modelchecker.h>
+#include <xbt/dynar.h>
 
 #define GRANT_TAG 0
 #define REQUEST_TAG 1
diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h
index 05be643930..e19caa79c4 100644
--- a/include/xbt/virtu.h
+++ b/include/xbt/virtu.h
@@ -9,21 +9,11 @@
 #define XBT_VIRTU_H
 
 #include <xbt/base.h>
-#include <xbt/dynar.h>
-#include <xbt/function_types.h>
-#include <xbt/misc.h>
-
-SG_BEGIN_DECL
-
-XBT_PUBLIC const char* xbt_procname(void);
-
-XBT_PUBLIC int xbt_getpid(void);
-
-SG_END_DECL
 
 #ifdef __cplusplus
 #include <string>
 #include <vector>
+
 namespace simgrid {
 namespace xbt {
 
@@ -35,4 +25,13 @@ XBT_PUBLIC_DATA std::vector<std::string> cmdline;
 } // namespace xbt
 } // namespace simgrid
 #endif
+
+SG_BEGIN_DECL
+
+XBT_PUBLIC const char* xbt_procname(void);
+
+XBT_PUBLIC int xbt_getpid(void);
+
+SG_END_DECL
+
 #endif /* XBT_VIRTU_H */
diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index ef686755f1..d577c6d050 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -8,6 +8,7 @@
 
 #include "src/internal_config.h"
 #include "src/surf/surf_private.hpp"
+#include "xbt/function_types.h"
 
 #include <cmath>
 #include <set>
-- 
2.20.1