From 506def212fd32cd837f8ac85f6bb7a1f25a829f7 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 23 Jun 2018 11:33:02 +0200
Subject: [PATCH] another attempt at fixing the include madness in mc for Mac

---
 src/mc/DwarfExpression.cpp |  7 +------
 src/mc/DwarfExpression.hpp |  4 +++-
 src/mc/LocationList.hpp    | 11 +++--------
 src/mc/mc_base.cpp         |  2 +-
 src/mc/mc_dwarf.cpp        |  2 --
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/mc/DwarfExpression.cpp b/src/mc/DwarfExpression.cpp
index 4f13379a69..8c7885b79b 100644
--- a/src/mc/DwarfExpression.cpp
+++ b/src/mc/DwarfExpression.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-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,10 +6,6 @@
 #include <cstddef>
 #include <cstdint>
 
-#include <dwarf.h>
-#include <elfutils/libdw.h>
-#include <libunwind.h>
-
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/DwarfExpression.hpp"
 #include "src/mc/Frame.hpp"
diff --git a/src/mc/DwarfExpression.hpp b/src/mc/DwarfExpression.hpp
index 35227bc702..2266e1ca8b 100644
--- a/src/mc/DwarfExpression.hpp
+++ b/src/mc/DwarfExpression.hpp
@@ -14,9 +14,11 @@
 #include <vector>
 
 #include <elfutils/libdw.h>
+#include <libunwind.h>
 
-#include "src/mc/mc_forward.hpp"
 #include "src/mc/AddressSpace.hpp"
+#include "src/mc/mc_dwarf.hpp"
+#include "src/mc/mc_forward.hpp"
 
 /** @file DwarfExpression.hpp
  *
diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index dc9e797022..9eec0b11e2 100644
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -6,14 +6,6 @@
 #ifndef SIMGRID_MC_OBJECT_LOCATION_H
 #define SIMGRID_MC_OBJECT_LOCATION_H
 
-#include <cstdint>
-
-#include <vector>
-
-#include <libunwind.h>
-#include <dwarf.h>
-#include <elfutils/libdw.h>
-
 #include "xbt/base.h"
 #include "xbt/range.hpp"
 
@@ -21,6 +13,9 @@
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/DwarfExpression.hpp"
 
+#include <cstdint>
+#include <vector>
+
 namespace simgrid {
 namespace dwarf {
 
diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index c1968fc35a..b525f40b24 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -10,13 +10,13 @@
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_replay.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
 #include "src/simix/smx_private.hpp"
 
 #include "src/kernel/activity/MutexImpl.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
+#include "src/mc/remote/RemoteClient.hpp"
 
 using simgrid::mc::remote;
 #endif
diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index d97c7107cb..26b59542bf 100644
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -14,8 +14,6 @@
 
 #include <fcntl.h>
 #include <cstdlib>
-#define DW_LANG_Objc DW_LANG_ObjC       /* fix spelling error in older dwarf.h */
-#include <dwarf.h>
 #include <elfutils/libdw.h>
 
 #include <boost/algorithm/string/predicate.hpp>
-- 
2.20.1