/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-2011. The SimGrid Team.
+/* Copyright (c) 2007-2014. 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. */
-#include "portable.h" /* execinfo when available */
-#include "xbt/ex_interface.h"
+#include "src/portable.h" /* execinfo when available */
+#include "xbt/synchro_core.h" /* xbt_thread_self_name */
+#include "src/xbt/ex_interface.h"
#include "xbt/sysdep.h"
#include "xbt/strbuff.h"
-#include "xbt/log_private.h"
+#include "src/xbt/log_private.h"
#include "simgrid/simix.h" /* SIMIX_host_self_get_name */
#include "surf/surf.h"
#include <stdio.h>