From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 25 May 2017 21:17:03 +0000 (+0200)
Subject: cut some more includes
X-Git-Tag: v3.16~212
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/22cae46149e1fb4988ad9e46060c3e7ecd4e0e44

cut some more includes
---

diff --git a/src/mc/ChunkedData.cpp b/src/mc/ChunkedData.cpp
index c860d453ff..b60f9386ff 100644
--- a/src/mc/ChunkedData.cpp
+++ b/src/mc/ChunkedData.cpp
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include <xbt/misc.h> 
-#include <xbt/asserts.h>
+#include "xbt/asserts.h"
+#include "xbt/misc.h"
 
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/ChunkedData.hpp"
diff --git a/src/mc/Frame.cpp b/src/mc/Frame.cpp
index 135b79cf57..4b25440723 100644
--- a/src/mc/Frame.cpp
+++ b/src/mc/Frame.cpp
@@ -6,7 +6,7 @@
 
 #include <libunwind.h>
 
-#include <xbt/sysdep.h>
+#include "xbt/sysdep.h"
 
 #include "src/mc/Frame.hpp"
 
diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp
index 0cc66304b6..e554e812f2 100644
--- a/src/mc/Frame.hpp
+++ b/src/mc/Frame.hpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <cstdint>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 #include <xbt/range.hpp>
 
 #include "src/mc/mc_forward.hpp"
diff --git a/src/mc/LocationList.cpp b/src/mc/LocationList.cpp
index 039bd2d038..0ad937520a 100644
--- a/src/mc/LocationList.cpp
+++ b/src/mc/LocationList.cpp
@@ -8,8 +8,8 @@
 #include <cstdint>
 #include <utility>
 
-#include <xbt/asserts.h>
-#include <xbt/sysdep.h>
+#include "xbt/asserts.h"
+#include "xbt/sysdep.h"
 
 #include <libunwind.h>
 
diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index 830f02437e..2985abd713 100644
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -15,7 +15,7 @@
 #include <dwarf.h>
 #include <elfutils/libdw.h>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 #include <xbt/range.hpp>
 
 #include "src/mc/mc_base.h"
diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index f611391742..1a4f7028ff 100644
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <system_error>
 
-#include <xbt/log.h>
+#include "xbt/log.h"
 #include <xbt/automaton.h>
 #include <xbt/automaton.hpp>
 #include <xbt/system_error.hpp>
diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 9d7101f262..c238d12c20 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -15,7 +15,7 @@
 
 #include <event2/event.h>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 #include <sys/types.h>
 
 #include "src/mc/PageStore.hpp"
diff --git a/src/mc/ObjectInformation.hpp b/src/mc/ObjectInformation.hpp
index 1a5b75f81f..61739713e6 100644
--- a/src/mc/ObjectInformation.hpp
+++ b/src/mc/ObjectInformation.hpp
@@ -12,7 +12,7 @@
 #include <memory>
 #include <vector>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "src/xbt/memory_map.hpp"
 #include "src/mc/mc_forward.hpp"
diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp
index a8e149aeb4..feef524b97 100644
--- a/src/mc/PageStore.cpp
+++ b/src/mc/PageStore.cpp
@@ -12,9 +12,9 @@
 # define MAP_POPULATE MAP_PREFAULT_READ
 #endif
 
-#include <xbt/base.h>
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/base.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 #include "src/internal_config.h"
 
diff --git a/src/mc/PageStore.hpp b/src/mc/PageStore.hpp
index 640e63c9e4..80332eaebc 100644
--- a/src/mc/PageStore.hpp
+++ b/src/mc/PageStore.hpp
@@ -13,7 +13,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "src/mc/mc_mmu.h"
 #include "src/mc/mc_forward.hpp"
diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index 47a0637e30..ed6f2d0d13 100644
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -28,8 +28,8 @@
 #include <libunwind.h>
 #include <libunwind-ptrace.h>
 
-#include <xbt/log.h>
-#include <xbt/base.h>
+#include "xbt/base.h"
+#include "xbt/log.h"
 #include <xbt/mmalloc.h>
 
 #include "src/mc/mc_unw.h"
diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index 68ebb05f0f..bb0a85d3a5 100644
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -19,7 +19,7 @@
 
 #include <simgrid_config.h>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 #include <xbt/mmalloc.h>
 
 #include "src/xbt/mmalloc/mmprivate.h"
diff --git a/src/mc/RegionSnapshot.hpp b/src/mc/RegionSnapshot.hpp
index e9339f77e8..cc135f432e 100644
--- a/src/mc/RegionSnapshot.hpp
+++ b/src/mc/RegionSnapshot.hpp
@@ -13,7 +13,7 @@
 #include <memory>
 #include <vector>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/ChunkedData.hpp"
diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 664fe3eb8e..6c4bd78a81 100644
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -9,11 +9,11 @@
 
 #include <functional>
 
-#include <xbt/log.h>
-#include <xbt/system_error.hpp>
-#include <simgrid/sg_config.h>
-#include <simgrid/modelchecker.h>
+#include "xbt/log.h"
 #include <mc/mc.h>
+#include <simgrid/modelchecker.h>
+#include <simgrid/sg_config.h>
+#include <xbt/system_error.hpp>
 
 #include "src/mc/Session.hpp"
 #include "src/mc/mc_state.h"
diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index caccae0b58..60317a785b 100644
--- a/src/mc/Session.hpp
+++ b/src/mc/Session.hpp
@@ -11,14 +11,14 @@
 #include <sys/prctl.h>
 #endif
 
-#include <sys/types.h>
+#include "xbt/sysdep.h"
 #include <sys/socket.h>
-#include <xbt/sysdep.h>
+#include <sys/types.h>
 #include <xbt/system_error.hpp>
 
 #include <functional>
 
-#include <xbt/log.h>
+#include "xbt/log.h"
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/ModelChecker.hpp"
diff --git a/src/mc/Type.hpp b/src/mc/Type.hpp
index d1391bd9e6..5d2ed59e83 100644
--- a/src/mc/Type.hpp
+++ b/src/mc/Type.hpp
@@ -12,8 +12,8 @@
 #include <vector>
 #include <string>
 
-#include <xbt/base.h>
-#include <xbt/asserts.h>
+#include "xbt/asserts.h"
+#include "xbt/base.h"
 
 #include <dwarf.h>
 
diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp
index 1464be4436..a59df31fa7 100644
--- a/src/mc/VisitedState.cpp
+++ b/src/mc/VisitedState.cpp
@@ -10,8 +10,8 @@
 
 #include <boost/range/algorithm.hpp>
 
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_private.h"
diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index 37ee087f8d..bdc2339ae3 100644
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -13,8 +13,8 @@
 #include <utility>
 #include <unordered_set>
 
-#include <xbt/sysdep.h>
-#include <xbt/dynar.h>
+#include "xbt/dynar.h"
+#include "xbt/sysdep.h"
 #include <xbt/mmalloc.h>
 
 #include <mc/mc.h>
diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index 5fcffaa33e..12b87169d8 100644
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -6,8 +6,7 @@
 #ifndef SIMGRID_MC_BASE_H
 #define SIMGRID_MC_BASE_H
 
-
-#include <xbt/base.h>
+#include "xbt/base.h"
 #include <simgrid/forward.h>
 
 #ifdef __cplusplus
diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index e21f2d985f..3cf1ff7343 100644
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.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 <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 #include <simgrid/modelchecker.h>
 
 #include "src/mc/ModelChecker.hpp"
diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index e0f5904190..cc1aa14419 100644
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -6,8 +6,8 @@
 
 #include <string.h>
 
-#include <xbt/sysdep.h>
-#include <xbt/dynar.h>
+#include "xbt/dynar.h"
+#include "xbt/sysdep.h"
 #include <xbt/dynar.hpp>
 
 #include "src/mc/mc_comm_pattern.h"
diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 3390b5671a..8838043f16 100644
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -10,8 +10,8 @@
 
 #include <vector>
 
+#include "xbt/dynar.h"
 #include <simgrid_config.h>
-#include <xbt/dynar.h>
 
 #include "src/simix/smx_private.h"
 #include "src/smpi/private.h"
diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 8ef5d0ba8f..4ad2251e96 100644
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -4,9 +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 <xbt/str.h>
-#include <xbt/log.h>
+#include "xbt/log.h"
 #include <xbt/config.h>
+#include <xbt/str.h>
 
 #include <mc/mc.h>
 #include "src/mc/mc_replay.h"
diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index 5fd061a435..8cc387cfa0 100644
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -20,10 +20,10 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <simgrid_config.h>
 #include "src/simgrid/util.hpp"
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
+#include <simgrid_config.h>
 
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_dwarf.hpp"
diff --git a/src/mc/mc_dwarf.hpp b/src/mc/mc_dwarf.hpp
index d2475529dc..8187dd72b0 100644
--- a/src/mc/mc_dwarf.hpp
+++ b/src/mc/mc_dwarf.hpp
@@ -11,8 +11,8 @@
 
 #include <string.h>
 
-#include <xbt/base.h>
-#include <xbt/sysdep.h>
+#include "xbt/base.h"
+#include "xbt/sysdep.h"
 
 #define DW_LANG_Objc DW_LANG_ObjC       /* fix spelling error in older dwarf.h */
 #include <dwarf.h>
diff --git a/src/mc/mc_dwarf_attrnames.cpp b/src/mc/mc_dwarf_attrnames.cpp
index a1e00e5725..ce4ddd4432 100644
--- a/src/mc/mc_dwarf_attrnames.cpp
+++ b/src/mc/mc_dwarf_attrnames.cpp
@@ -9,7 +9,7 @@
 #include <dwarf.h>
 #include <src/mc/mc_dwarf.hpp>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 namespace simgrid {
 namespace dwarf  {
diff --git a/src/mc/mc_dwarf_tagnames.cpp b/src/mc/mc_dwarf_tagnames.cpp
index cb73e9d2c1..f19d0f497f 100644
--- a/src/mc/mc_dwarf_tagnames.cpp
+++ b/src/mc/mc_dwarf_tagnames.cpp
@@ -10,7 +10,7 @@
 #include <elfutils/libdw.h>
 #include "src/mc/mc_dwarf.hpp"
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 namespace simgrid {
 namespace dwarf {
diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 80ecca598c..33f0d619b2 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -12,7 +12,7 @@
 
 #include <vector>
 
-#include <xbt/dynar.h>
+#include "xbt/dynar.h"
 #include <xbt/automaton.h>
 #include <xbt/swag.h>
 
diff --git a/src/mc/mc_hash.cpp b/src/mc/mc_hash.cpp
index 8e9dc17fca..d537cfef30 100644
--- a/src/mc/mc_hash.cpp
+++ b/src/mc/mc_hash.cpp
@@ -8,7 +8,7 @@
 
 #include <cstdint>
 
-#include <xbt/log.h>
+#include "xbt/log.h"
 
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_snapshot.h"
diff --git a/src/mc/mc_hash.hpp b/src/mc/mc_hash.hpp
index 68a408a98c..dc2e2d9e6a 100644
--- a/src/mc/mc_hash.hpp
+++ b/src/mc/mc_hash.hpp
@@ -9,7 +9,7 @@
 
 #include <cstdint>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "src/mc/mc_forward.hpp"
 
diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h
index 9e2aaa5180..608be2be0a 100644
--- a/src/mc/mc_mmu.h
+++ b/src/mc/mc_mmu.h
@@ -9,9 +9,9 @@
 #include <cstdint>
 #include <cstddef>
 
-#include <xbt/asserts.h>
-#include <xbt/base.h> // xbt_pagesize...
-#include <xbt/misc.h>
+#include "xbt/asserts.h"
+#include "xbt/base.h" // xbt_pagesize...
+#include "xbt/misc.h"
 
 #include <simgrid_config.h>
 
diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index a49d3e42f8..f4538d0577 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -12,10 +12,10 @@
 
 #include <stdio.h>
 
+#include "xbt/base.h"
 #include <simgrid/msg.h>
-#include <xbt/config.h>
-#include <xbt/base.h>
 #include <xbt/automaton.h>
+#include <xbt/config.h>
 
 #include "mc/mc.h"
 #include "mc/datatypes.h"
diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 7896df8f71..62a4fa852b 100644
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -12,8 +12,8 @@
 #include <sstream>
 #include <string>
 
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 #include "simgrid/simix.h"
 
diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h
index a25777057a..c1617fbdc5 100644
--- a/src/mc/mc_record.h
+++ b/src/mc/mc_record.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "src/mc/Transition.hpp"
 
diff --git a/src/mc/mc_replay.h b/src/mc/mc_replay.h
index c824d44a6a..fa295af75f 100644
--- a/src/mc/mc_replay.h
+++ b/src/mc/mc_replay.h
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_MC_REPLAY_H
 #define SIMGRID_MC_REPLAY_H
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 SG_BEGIN_DECL()
 
diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h
index 953d83e3bc..b635496b21 100644
--- a/src/mc/mc_request.h
+++ b/src/mc/mc_request.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "src/simix/smx_private.h"
 
diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index 2aa3902498..22b061503c 100644
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -12,7 +12,7 @@
 
 #include <simgrid_config.h>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_state.h"
diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp
index 32f035bf9c..80c0817be5 100644
--- a/src/mc/mc_snapshot.cpp
+++ b/src/mc/mc_snapshot.cpp
@@ -9,8 +9,8 @@
 #include <memory>
 #include <utility>
 
-#include <xbt/asserts.h>
-#include <xbt/sysdep.h>
+#include "xbt/asserts.h"
+#include "xbt/sysdep.h"
 
 #include "src/internal_config.h"
 #include "src/smpi/private.h"
diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index f19fb12fa6..68e9fdadce 100644
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -17,15 +17,13 @@
 #include <sys/types.h> // off_t
 
 #include "src/xbt/mmalloc/mmprivate.h"
-#include <xbt/asserts.h>
-#include <xbt/base.h>
+#include "xbt/asserts.h"
+#include "xbt/base.h"
 
-#include "src/mc/mc_forward.hpp"
 #include "src/mc/ModelChecker.hpp"
-#include "src/mc/PageStore.hpp"
-#include "src/mc/AddressSpace.hpp"
-#include "src/mc/mc_unw.h"
 #include "src/mc/RegionSnapshot.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_unw.h"
 
 SG_BEGIN_DECL()
 
diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 8b04805b6a..9d041d76c4 100644
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -7,8 +7,8 @@
 
 #include <boost/range/algorithm.hpp>
 
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 #include "src/simix/smx_private.h"
 #include "src/mc/mc_state.h"
diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index e2117f8ace..1e65beb721 100644
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -9,15 +9,6 @@
 #include <list>
 #include <memory>
 
-#include <xbt/base.h>
-#include <xbt/dynar.h>
-
-#include "src/simix/smx_private.h"
-#include "src/kernel/activity/SynchroIo.hpp"
-#include "src/kernel/activity/SynchroComm.hpp"
-#include "src/kernel/activity/SynchroRaw.hpp"
-#include "src/kernel/activity/SynchroSleep.hpp"
-#include "src/kernel/activity/SynchroExec.hpp"
 #include "src/mc/mc_snapshot.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/Transition.hpp"
diff --git a/src/mc/mc_unw.h b/src/mc/mc_unw.h
index 31dfb9b9da..2200b5f91d 100644
--- a/src/mc/mc_unw.h
+++ b/src/mc/mc_unw.h
@@ -25,13 +25,10 @@
  *  much here.
  */
 
-#include <sys/types.h>
-
-#include <xbt/base.h>
+#include "src/mc/mc_forward.hpp"
 
 #include <libunwind.h>
-
-#include "src/mc/mc_forward.hpp"
+#include <sys/types.h>
 
 namespace simgrid {
 namespace unw {
diff --git a/src/mc/mc_xbt.cpp b/src/mc/mc_xbt.cpp
index 86c0144275..257ebb47f6 100644
--- a/src/mc/mc_xbt.cpp
+++ b/src/mc/mc_xbt.cpp
@@ -10,8 +10,8 @@
 #include "src/mc/mc_xbt.hpp"
 #include "src/mc/remote/RemotePtr.hpp"
 
-#include <xbt/dynar.h>
-#include <xbt/sysdep.h>
+#include "xbt/dynar.h"
+#include "xbt/sysdep.h"
 
 namespace simgrid {
 namespace mc {
diff --git a/src/mc/mc_xbt.hpp b/src/mc/mc_xbt.hpp
index 14940a99d3..ed7ea0cd60 100644
--- a/src/mc/mc_xbt.hpp
+++ b/src/mc/mc_xbt.hpp
@@ -7,9 +7,7 @@
 #ifndef SIMGRID_MC_XBT_HPP
 #define SIMGRID_MC_XBT_HPP
 
-#include <cstddef>
-
-#include <xbt/dynar.h>
+#include "xbt/dynar.h"
 
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/remote/RemotePtr.hpp"