From 7e34d26dd133ad8707b8322995fe7164d96a406b Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 10 Mar 2021 10:11:29 +0100
Subject: [PATCH] Cosmetics around #include.

---
 src/bindings/java/jxbt_utilities.cpp | 2 --
 src/kernel/activity/MutexImpl.cpp    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp
index d418b3f96f..2d61bc3e1f 100644
--- a/src/bindings/java/jxbt_utilities.cpp
+++ b/src/bindings/java/jxbt_utilities.cpp
@@ -9,8 +9,6 @@
 #include "xbt/string.hpp"
 #include "xbt/sysdep.h"
 
-#include <cstdlib> /* abort */
-
 jclass jxbt_get_class(JNIEnv * env, const char *name)
 {
   jclass cls = env->FindClass(name);
diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 2930115ed9..c0f2a198da 100644
--- a/src/kernel/activity/MutexImpl.cpp
+++ b/src/kernel/activity/MutexImpl.cpp
@@ -6,8 +6,6 @@
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space implementation");
-
 #if SIMGRID_HAVE_MC
 #include "simgrid/modelchecker.h"
 #include "src/mc/mc_safety.hpp"
@@ -18,6 +16,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space
 #define MC_CHECK_NO_DPOR() (void)0
 #endif
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space implementation");
+
 namespace simgrid {
 namespace kernel {
 namespace activity {
-- 
2.20.1