chop, chop, chop includes

diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp
index e554e81..663ecf3 100644 (file)
--- a/src/mc/Frame.hpp
+++ b/src/mc/Frame.hpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 
 #include "xbt/base.h"
-#include <xbt/range.hpp>
+#include "xbt/range.hpp"
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/LocationList.hpp"

diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index 2985abd..da1af22 100644 (file)
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -16,7 +16,7 @@
 #include <elfutils/libdw.h>
 
 #include "xbt/base.h"
-#include <xbt/range.hpp>
+#include "xbt/range.hpp"
 
 #include "src/mc/mc_base.h"
 #include "src/mc/mc_forward.hpp"

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 1a4f702..2f44304 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -14,10 +14,10 @@
 #include <memory>
 #include <system_error>
 
+#include "xbt/automaton.h"
+#include "xbt/automaton.hpp"
 #include "xbt/log.h"
-#include <xbt/automaton.h>
-#include <xbt/automaton.hpp>
-#include <xbt/system_error.hpp>
+#include "xbt/system_error.hpp"
 
 #include "simgrid/sg_config.h"
 

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 6c4bd78..13f3d72 100644 (file)
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -10,10 +10,10 @@
 #include <functional>
 
 #include "xbt/log.h"
+#include "xbt/system_error.hpp"
 #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 60317a7..8bc9f04 100644 (file)
--- a/src/mc/Session.hpp
+++ b/src/mc/Session.hpp
@@ -12,9 +12,9 @@
 #endif
 
 #include "xbt/sysdep.h"
+#include "xbt/system_error.hpp"
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <xbt/system_error.hpp>
 
 #include <functional>
 

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index 12b8716..1f94f1b 100644 (file)
--- 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 <simgrid/forward.h>
+#include "simgrid/forward.h"
 
 #ifdef __cplusplus
 

diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 8838043..b5ac841 100644 (file)
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -6,16 +6,10 @@
 #ifndef SIMGRID_MC_COMM_PATTERN_H
 #define SIMGRID_MC_COMM_PATTERN_H
 
-#include <cstddef>
-
 #include <vector>
 
+#include "smpi/smpi.h"
 #include "xbt/dynar.h"
-#include <simgrid_config.h>
-
-#include "src/simix/smx_private.h"
-#include "src/smpi/private.h"
-#include <smpi/smpi.h>
 
 #include "src/mc/mc_state.h"
 

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 4ad2251..b188bf7 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.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/config.h"
 #include "xbt/log.h"
-#include <xbt/config.h>
 #include <xbt/str.h>
 
 #include <mc/mc.h>

diff --git a/src/mc/mc_dwarf.hpp b/src/mc/mc_dwarf.hpp
index 8187dd7..3e2d8e3 100644 (file)
--- a/src/mc/mc_dwarf.hpp
+++ b/src/mc/mc_dwarf.hpp
@@ -1,18 +1,12 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2017. 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. */
 
-#if !defined(SIMGRID_MC_DWARF_HPP)
+#ifndef SIMGRID_MC_DWARF_HPP
 #define SIMGRID_MC_DWARF_HPP
 
-#include <memory>
-
-#include <string.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_global.cpp b/src/mc/mc_global.cpp
index 33f0d61..8713d54 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -12,9 +12,9 @@
 
 #include <vector>
 
+#include "xbt/automaton.h"
 #include "xbt/dynar.h"
-#include <xbt/automaton.h>
-#include <xbt/swag.h>
+#include "xbt/swag.h"
 
 #include "mc_base.h"
 

diff --git a/src/mc/mc_hash.hpp b/src/mc/mc_hash.hpp
index dc2e2d9..d7af9b1 100644 (file)
--- a/src/mc/mc_hash.hpp
+++ b/src/mc/mc_hash.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2015. 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,10 +6,7 @@
 #ifndef SIMGRID_MC_HASH_HPP
 #define SIMGRID_MC_HASH_HPP
 
-#include <cstdint>
-
 #include "xbt/base.h"
-
 #include "src/mc/mc_forward.hpp"
 
 namespace simgrid {

diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h
index 608be2b..c7d5b97 100644 (file)
--- a/src/mc/mc_mmu.h
+++ b/src/mc/mc_mmu.h
@@ -6,15 +6,7 @@
 #ifndef SIMGRID_MC_MMU_H
 #define SIMGRID_MC_MMU_H
 
-#include <cstdint>
-#include <cstddef>
-
-#include "xbt/asserts.h"
-#include "xbt/base.h" // xbt_pagesize...
-#include "xbt/misc.h"
-
-#include <simgrid_config.h>
-
+#include "xbt/misc.h" // xbt_pagesize...
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index f4538d0..0bdeb53 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -6,22 +6,8 @@
 #ifndef SIMGRID_MC_PRIVATE_H
 #define SIMGRID_MC_PRIVATE_H
 
-#include "simgrid_config.h"
-
-#include <sys/types.h>
-
-#include <stdio.h>
-
-#include "xbt/base.h"
-#include <simgrid/msg.h>
-#include <xbt/automaton.h>
-#include <xbt/config.h>
-
 #include "mc/mc.h"
-#include "mc/datatypes.h"
-#include "src/mc/mc_base.h"
-
-#include "src/simix/smx_private.h"
+#include "xbt/automaton.h"
 
 #ifdef __cplusplus
 #include "src/mc/mc_forward.hpp"

diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h
index c1617fb..56a3410 100644 (file)
--- a/src/mc/mc_record.h
+++ b/src/mc/mc_record.h
@@ -17,12 +17,10 @@
 #ifndef SIMGRID_MC_RECORD_H
 #define SIMGRID_MC_RECORD_H
 
-#include <string>
-#include <vector>
-
+#include "src/mc/Transition.hpp"
 #include "xbt/base.h"
 
-#include "src/mc/Transition.hpp"
+#include <vector>
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h
index b635496..2672208 100644 (file)
--- a/src/mc/mc_request.h
+++ b/src/mc/mc_request.h
@@ -6,10 +6,6 @@
 #ifndef SIMGRID_MC_REQUEST_H
 #define SIMGRID_MC_REQUEST_H
 
-#include <string>
-
-#include "xbt/base.h"
-
 #include "src/simix/smx_private.h"
 
 namespace simgrid {

diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index 22b0615..2c31b5d 100644 (file)
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -6,17 +6,8 @@
 #ifndef SIMGRID_MC_SAFETY_H
 #define SIMGRID_MC_SAFETY_H
 
-#include <stdint.h>
-
-#include <memory>
-
-#include <simgrid_config.h>
-
 #include "xbt/base.h"
 
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/mc_state.h"
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 68e9fda..fb0c109 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -6,18 +6,13 @@
 #ifndef SIMGRID_MC_SNAPSHOT_H
 #define SIMGRID_MC_SNAPSHOT_H
 
-#include <cstdint>
-#include <cstddef>
-
 #include <vector>
 #include <set>
 #include <string>
 #include <memory>
 
-#include <sys/types.h> // off_t
-
 #include "src/xbt/mmalloc/mmprivate.h"
-#include "xbt/asserts.h"
+//#include "xbt/asserts.h"
 #include "xbt/base.h"
 
 #include "src/mc/ModelChecker.hpp"