From e2f2a59f2531219ab56c998d0379c3f6b6936a5c Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 24 May 2017 19:17:12 +0200
Subject: [PATCH 1/1] remove some useless includes

---
 src/mc/ModelChecker.hpp                            |  1 -
 src/mc/VisitedState.cpp                            |  1 -
 src/mc/checker/CommunicationDeterminismChecker.cpp |  1 -
 src/mc/checker/LivenessChecker.cpp                 |  1 -
 src/mc/checker/SafetyChecker.cpp                   |  3 ---
 src/mc/compare.cpp                                 |  1 -
 src/mc/mc_config.cpp                               |  3 +--
 src/mc/mc_request.cpp                              |  9 +--------
 src/mc/mc_smx.h                                    | 10 ----------
 src/mc/mc_snapshot.h                               |  1 -
 src/mc/mc_state.h                                  |  1 -
 11 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index cae6e5a6ad..9d7101f262 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -15,7 +15,6 @@
 
 #include <event2/event.h>
 
-#include <simgrid_config.h>
 #include <xbt/base.h>
 #include <sys/types.h>
 
diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp
index 68b1990b15..1464be4436 100644
--- a/src/mc/VisitedState.cpp
+++ b/src/mc/VisitedState.cpp
@@ -14,7 +14,6 @@
 #include <xbt/sysdep.h>
 
 #include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_safety.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/Process.hpp"
 #include "src/mc/mc_smx.h"
diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index 89e553e9ab..a98f55bc29 100644
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -17,7 +17,6 @@
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
 #include "src/mc/mc_smx.h"
 #include "src/mc/mc_state.h"
 #include "src/mc/remote/Client.hpp"
diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp
index a0016e15b5..0dda3dd3b1 100644
--- a/src/mc/checker/LivenessChecker.cpp
+++ b/src/mc/checker/LivenessChecker.cpp
@@ -29,7 +29,6 @@
 #include "src/mc/mc_record.h"
 #include "src/mc/mc_replay.h"
 #include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
 #include "src/mc/mc_smx.h"
 #include "src/mc/remote/Client.hpp"
 
diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp
index 44612d56d3..d38281572c 100644
--- a/src/mc/checker/SafetyChecker.cpp
+++ b/src/mc/checker/SafetyChecker.cpp
@@ -22,10 +22,7 @@
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
 #include "src/mc/mc_smx.h"
-#include "src/mc/mc_state.h"
-#include "src/mc/remote/Client.hpp"
 
 #include "src/xbt/mmalloc/mmprivate.h"
 
diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index 334e3b85db..37ee087f8d 100644
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -29,7 +29,6 @@
 #endif
 
 #include "src/mc/mc_forward.hpp"
-#include "src/mc/mc_safety.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_smx.h"
 #include "src/mc/mc_dwarf.hpp"
diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 5f7ed7b996..8ef5d0ba8f 100644
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -20,8 +20,7 @@
 
 #include "src/mc/mc_record.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc,
-                                "Configuration of MC");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc, "Configuration of the Model Checker");
 
 #if SIMGRID_HAVE_MC
 namespace simgrid {
diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index f8c4cf2d3d..261360d903 100644
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -6,15 +6,8 @@
 
 #include <cassert>
 
-#include <xbt/log.h>
-#include <xbt/str.h>
-#include <xbt/sysdep.h>
-#include <xbt/dynar.h>
-#include <xbt/swag.h>
-
+#include "src/mc/ModelChecker.hpp"
 #include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_private.h"
 #include "src/mc/mc_smx.h"
 #include "src/mc/mc_xbt.hpp"
 
diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h
index 609807ca19..28d20b7b47 100644
--- a/src/mc/mc_smx.h
+++ b/src/mc/mc_smx.h
@@ -6,17 +6,7 @@
 #ifndef SIMGRID_MC_SMX_H
 #define SIMGRID_MC_SMX_H
 
-#include <stddef.h>
-
-#include <xbt/base.h>
-#include <xbt/log.h>
-
-#include <simgrid/simix.h>
-
-#include "src/smpi/private.h"
-
 #include "src/mc/Process.hpp"
-#include "src/mc/remote/mc_protocol.h"
 
 /** @file
  *  @brief (Cross-process, MCer/MCed) Access to SMX structures
diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 16b4f2be68..f19fb12fa6 100644
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -16,7 +16,6 @@
 
 #include <sys/types.h> // off_t
 
-#include <simgrid_config.h>
 #include "src/xbt/mmalloc/mmprivate.h"
 #include <xbt/asserts.h>
 #include <xbt/base.h>
diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index 68198c71fc..e2117f8ace 100644
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -12,7 +12,6 @@
 #include <xbt/base.h>
 #include <xbt/dynar.h>
 
-#include <simgrid_config.h>
 #include "src/simix/smx_private.h"
 #include "src/kernel/activity/SynchroIo.hpp"
 #include "src/kernel/activity/SynchroComm.hpp"
-- 
2.20.1