cut some includes in MC

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index 77c0c6d..f071a26 100644 (file)
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -14,12 +14,11 @@
 #ifndef SIMGRID_MODELCHECKER_H
 #define SIMGRID_MODELCHECKER_H
 
-#include <stddef.h> /* size_t */
-
 #include <simgrid/config.h> /* SIMGRID_HAVE_MC ? */
-
 #include <xbt/base.h>
 
+#include <stddef.h> /* size_t */
+
 SG_BEGIN_DECL()
 
 XBT_PUBLIC int MC_random(int min, int max);

diff --git a/src/mc/mc_replay.hpp b/src/mc/mc_replay.hpp
index eb50e3f..ad36981 100644 (file)
--- a/src/mc/mc_replay.hpp
+++ b/src/mc/mc_replay.hpp
@@ -6,9 +6,6 @@
 #ifndef SIMGRID_MC_REPLAY_H
 #define SIMGRID_MC_REPLAY_H
 
-#include "xbt/base.h"
-#include <string>
-
 #include "src/mc/mc_config.hpp"
 
 /** Replay path (if any) in string representation

diff --git a/src/mc/remote/RemoteClient.hpp b/src/mc/remote/RemoteClient.hpp
index 2809fd6..e55df1a 100644 (file)
--- a/src/mc/remote/RemoteClient.hpp
+++ b/src/mc/remote/RemoteClient.hpp
@@ -6,37 +6,12 @@
 #ifndef SIMGRID_MC_PROCESS_H
 #define SIMGRID_MC_PROCESS_H
 
-#include <cstddef>
-#include <cstdint>
-
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include <sys/types.h>
-
-#include <simgrid/config.h>
-
-#include "xbt/base.h"
-#include <xbt/mmalloc.h>
-
 #include "src/xbt/mmalloc/mmprivate.h"
-
 #include "src/mc/remote/Channel.hpp"
-#include "src/mc/remote/RemotePtr.hpp"
-
-#include "src/simix/popping_private.hpp"
 #include "src/simix/smx_private.hpp"
-#include <simgrid/simix.h>
-
-#include "src/xbt/memory_map.hpp"
-
-#include "src/mc/AddressSpace.hpp"
 #include "src/mc/ObjectInformation.hpp"
-#include "src/mc/mc_base.h"
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/remote/mc_protocol.h"
+
+#include <vector>
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/remote/RemotePtr.hpp b/src/mc/remote/RemotePtr.hpp
index 6288fd5..f8d09f7 100644 (file)
--- a/src/mc/remote/RemotePtr.hpp
+++ b/src/mc/remote/RemotePtr.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -7,7 +6,6 @@
 #ifndef SIMGRID_MC_REMOTE_PTR_HPP
 #define SIMGRID_MC_REMOTE_PTR_HPP
 
-#include <cstddef>
 #include <cstdint>
 #include <cstring>
 

diff --git a/src/mc/remote/mc_protocol.h b/src/mc/remote/mc_protocol.h
index 44f61c9..6770bf0 100644 (file)
--- a/src/mc/remote/mc_protocol.h
+++ b/src/mc/remote/mc_protocol.h
@@ -6,13 +6,11 @@
 #ifndef SIMGRID_MC_PROTOCOL_H
 #define SIMGRID_MC_PROTOCOL_H
 
-#include <stdint.h>
-
-#include <xbt/base.h>
-
 #include "mc/datatypes.h"
 #include "simgrid/forward.h"
 
+#include <stdint.h>
+
 SG_BEGIN_DECL()
 
 // ***** Environment variables for passing context to the model-checked process