From 909864a6927db2f6105ab740ad185de7aa7e5a71 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 13 Apr 2016 15:35:23 +0200
Subject: [PATCH] [mc] Remove useless bits

---
 src/include/mc/datatypes.h | 2 --
 src/mc/mc_checkpoint.cpp   | 4 ++++
 src/mc/mc_memory.cpp       | 2 +-
 src/mc/mc_private.h        | 8 --------
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 403a264a9a..ff7fa02fa4 100644
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -16,8 +16,6 @@
 
 SG_BEGIN_DECL()
 
-typedef struct s_mc_transition *mc_transition_t;
-
 typedef struct s_stack_region{
   void *address;
 #if HAVE_UCONTEXT_H
diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 3658048dc0..36ed86313d 100644
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -11,6 +11,10 @@
 #include <link.h>
 #include <dirent.h>
 
+#ifndef WIN32
+#include <sys/mman.h>
+#endif
+
 #include "src/internal_config.h"
 #include "src/mc/mc_private.h"
 #include "xbt/module.h"
diff --git a/src/mc/mc_memory.cpp b/src/mc/mc_memory.cpp
index 1db534b1c4..866015fc2c 100644
--- a/src/mc/mc_memory.cpp
+++ b/src/mc/mc_memory.cpp
@@ -11,6 +11,7 @@
 
 #include "mc/mc.h"
 #include "src/mc/mc_private.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
                                 "Logging specific to MC (memory)");
@@ -26,7 +27,6 @@ void MC_memory_init()
 }
 
 /* Finalize the memory subsystem */
-#include "src/xbt_modinter.h"
 void MC_memory_exit(void)
 {
 }
diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index f5a789b807..0ef9cfb2a8 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -12,11 +12,6 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifndef WIN32
-#include <sys/mman.h>
-#endif
-
-#include <elfutils/libdw.h>
 
 #include <simgrid/msg.h>
 #include <xbt/config.h>
@@ -28,15 +23,12 @@
 #include "src/mc/mc_base.h"
 
 #include "src/simix/smx_private.h"
-#include "src/xbt/mmalloc/mmprivate.h"
 
 #ifdef __cplusplus
 #include "src/mc/mc_forward.hpp"
 #include "src/xbt/memory_map.hpp"
 #endif
 
-#include "src/mc/mc_protocol.h"
-
 #ifdef __cplusplus
 namespace simgrid {
 namespace mc {
-- 
2.20.1