#include "msg/msg.h"
#include "msg/private.h"
#include "simix/private.h"
-#include "xbt/xbt_context_private.h"
+#include "xbt/xbt_jcontext.h"
+#include "xbt/xbt_context_factory.h"
#include "jmsg_process.h"
#include "jmsg_host.h"
#include "jmsg.h"
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+
static JavaVM * __java_vm = NULL;
static jobject