From b193c425928081a5534a14fb22501b24f7aac48a Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 16 Mar 2016 09:44:33 +0100
Subject: [PATCH 1/1] [mc] Remove pointless #includes

---
 src/mc/ChunkedData.cpp     | 1 +
 src/mc/ChunkedData.hpp     | 1 -
 src/mc/DwarfExpression.hpp | 1 +
 src/mc/Frame.hpp           | 1 -
 src/mc/LocationList.hpp    | 1 -
 src/mc/PageStore.cpp       | 4 +++-
 src/mc/Process.cpp         | 1 -
 src/mc/Process.hpp         | 1 -
 src/mc/malloc.hpp          | 1 -
 src/mc/mc_client_api.cpp   | 1 -
 src/mc/mc_diff.cpp         | 1 -
 src/mc/mc_dwarf.hpp        | 2 +-
 src/mc/mc_global.cpp       | 3 ---
 src/mc/mc_smx.cpp          | 3 ++-
 src/mc/mc_smx.h            | 1 -
 src/mc/mc_state.cpp        | 1 -
 16 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/mc/ChunkedData.cpp b/src/mc/ChunkedData.cpp
index 4e8499e453..8d5a8e0c7b 100644
--- a/src/mc/ChunkedData.cpp
+++ b/src/mc/ChunkedData.cpp
@@ -14,6 +14,7 @@
 
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/ChunkedData.hpp"
+#include "src/mc/PageStore.hpp"
 
 #define SOFT_DIRTY_BIT_NUMBER 55
 #define SOFT_DIRTY (((uint64_t)1) << SOFT_DIRTY_BIT_NUMBER)
diff --git a/src/mc/ChunkedData.hpp b/src/mc/ChunkedData.hpp
index 3c414be4e4..706c749fb6 100644
--- a/src/mc/ChunkedData.hpp
+++ b/src/mc/ChunkedData.hpp
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "src/mc/mc_forward.hpp"
-#include "src/mc/AddressSpace.hpp"
 #include "src/mc/PageStore.hpp"
 
 namespace simgrid {
diff --git a/src/mc/DwarfExpression.hpp b/src/mc/DwarfExpression.hpp
index 6cb4fea66a..4f1616440e 100644
--- a/src/mc/DwarfExpression.hpp
+++ b/src/mc/DwarfExpression.hpp
@@ -17,6 +17,7 @@
 #include <elfutils/libdw.h>
 
 #include "src/mc/mc_forward.hpp"
+#include "src/mc/AddressSpace.hpp"
 
 /** @file DwarfExession.hpp
  *
diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp
index 2619402bb7..0cc66304b6 100644
--- a/src/mc/Frame.hpp
+++ b/src/mc/Frame.hpp
@@ -16,7 +16,6 @@
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/LocationList.hpp"
 #include "src/mc/Variable.hpp"
-#include "src/mc/Frame.hpp"
 
 namespace simgrid {
 namespace mc {
diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index 9759836e50..1e1ed75c5f 100644
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -20,7 +20,6 @@
 
 #include "src/mc/mc_base.h"
 #include "src/mc/mc_forward.hpp"
-#include "src/mc/AddressSpace.hpp"
 #include "src/mc/DwarfExpression.hpp"
 
 namespace simgrid {
diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp
index 9b196b8cde..8634716406 100644
--- a/src/mc/PageStore.cpp
+++ b/src/mc/PageStore.cpp
@@ -9,7 +9,9 @@
 
 #include <sys/mman.h>
 
-#include <xbt.h>
+#include <xbt/base.h>
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
 
 #include "src/mc/PageStore.hpp"
 
diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index 33eb20113f..12a1499d48 100644
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -24,7 +24,6 @@
 #include <libunwind.h>
 #include <libunwind-ptrace.h>
 
-#include <xbt/dynar.h>
 #include <xbt/log.h>
 #include <xbt/base.h>
 #include <xbt/mmalloc.h>
diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index fe648f8103..5a9e3068f7 100644
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -19,7 +19,6 @@
 #include <simgrid_config.h>
 
 #include <xbt/base.h>
-#include <xbt/dynar.h>
 #include <xbt/mmalloc.h>
 
 #include "src/xbt/mmalloc/mmprivate.h"
diff --git a/src/mc/malloc.hpp b/src/mc/malloc.hpp
index 82acd86f0b..0447cc4175 100644
--- a/src/mc/malloc.hpp
+++ b/src/mc/malloc.hpp
@@ -12,7 +12,6 @@
 
 #include <vector>
 
-#include <xbt/dynar.h>
 #include <xbt/mmalloc.h>
 
 #include "src/mc/mc_forward.hpp"
diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index 9f6c5751cb..cb8a785041 100644
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -5,7 +5,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <xbt/log.h>
-#include <xbt/fifo.h>
 #include <xbt/sysdep.h>
 #include <simgrid/modelchecker.h>
 
diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp
index f0d0896d4f..2a15fe2b21 100644
--- a/src/mc/mc_diff.cpp
+++ b/src/mc/mc_diff.cpp
@@ -7,7 +7,6 @@
 /* mc_diff - Memory snapshooting and comparison                             */
 
 #include "src/xbt/ex_interface.h"   /* internals of backtrace setup */
-#include "xbt/str.h"
 #include "mc/mc.h"
 #include "xbt/mmalloc.h"
 #include "mc/datatypes.h"
diff --git a/src/mc/mc_dwarf.hpp b/src/mc/mc_dwarf.hpp
index 62fb9a18a9..d2475529dc 100644
--- a/src/mc/mc_dwarf.hpp
+++ b/src/mc/mc_dwarf.hpp
@@ -17,7 +17,7 @@
 #define DW_LANG_Objc DW_LANG_ObjC       /* fix spelling error in older dwarf.h */
 #include <dwarf.h>
 
-#include "src/mc/Variable.hpp"
+#include "src/mc/mc_forward.hpp"
 
 namespace simgrid {
 namespace dwarf {
diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 2c40f43e26..e92fcaf53b 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -21,9 +21,6 @@
 #include <sys/time.h>
 #endif
 
-#include <xbt/fifo.h>
-#include <xbt/automaton.h>
-
 #include "src/simix/smx_process_private.h"
 
 #if HAVE_MC
diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index c10d758a0d..3f6102ffdd 100644
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -7,8 +7,9 @@
 #include <cassert>
 #include <cstdlib>
 
+#include <vector>
+
 #include <xbt/log.h>
-#include <xbt/dynar.h>
 #include <xbt/str.h>
 #include <xbt/swag.h>
 
diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h
index cecce1b235..ba19d94027 100644
--- a/src/mc/mc_smx.h
+++ b/src/mc/mc_smx.h
@@ -10,7 +10,6 @@
 #include <stddef.h>
 
 #include <xbt/base.h>
-#include <xbt/dynar.h>
 #include <xbt/log.h>
 
 #include <simgrid/simix.h>
diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 741ba37a1e..fdb9e10009 100644
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -8,7 +8,6 @@
 
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
-#include <xbt/fifo.h>
 
 #include "src/simix/smx_private.h"
 #include "src/mc/mc_state.h"
-- 
2.20.1