Reduce the amount of implicit include directories

This is intrusive to quite a lot of files, but I think that it helps
making the source code more explicit about what's public and what's not.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c315f2c..6d7acad 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,19 +146,14 @@ if (APPLE)
   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()
-
-### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 ### Compute the include paths
 set(INCLUDES
   ${CMAKE_HOME_DIRECTORY}
   ${CMAKE_HOME_DIRECTORY}/include
-  ${CMAKE_HOME_DIRECTORY}/src
   ${CMAKE_HOME_DIRECTORY}/src/include
-  ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/include
-  ${CMAKE_BINARY_DIR}/src
   )
 
 if(WIN32)

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index fe1a013..5e2a82d 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -6,10 +6,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simgrid/msg.h"            /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
+#include "simgrid/msg.h"        /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
 #include "simgrid/simix.h"      /* semaphores for the barrier */
 #include "xbt.h"                /* calloc, printf */
-#include "instr/instr_private.h"
 #include <xbt/replay.h>
 
 /** @addtogroup MSG_examples

diff --git a/examples/msg/chord/chord.c b/examples/msg/chord/chord.c
index d4e786e..81d3da0 100644 (file)
--- a/examples/msg/chord/chord.c
+++ b/examples/msg/chord/chord.c
@@ -10,7 +10,7 @@
 #include "xbt/asserts.h"
 #include "simgrid/modelchecker.h"
 #include <xbt/RngStream.h>
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h" // FIXME: this is an internal header
 
 /** @addtogroup MSG_examples
  *

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index 7f0db32..cb5df55 100644 (file)
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/msg.h"
-#include "surf/surf_private.h"
 
 int host(int argc, char *argv[]);
 

diff --git a/examples/msg/io/file_unlink.c b/examples/msg/io/file_unlink.c
index 188b3e2..7b8e965 100644 (file)
--- a/examples/msg/io/file_unlink.c
+++ b/examples/msg/io/file_unlink.c
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/msg.h"
-#include "surf/surf_private.h"
 
 int host(int argc, char *argv[]);
 

diff --git a/examples/msg/io/remote.c b/examples/msg/io/remote.c
index a065254..0cfae31 100644 (file)
--- a/examples/msg/io/remote.c
+++ b/examples/msg/io/remote.c
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/msg.h"
-#include "surf/surf_private.h"
 
 #define INMEGA (1024*1024)
 

diff --git a/examples/msg/token_ring/ring_call.c b/examples/msg/token_ring/ring_call.c
index 5b7a39d..955c4b9 100644 (file)
--- a/examples/msg/token_ring/ring_call.c
+++ b/examples/msg/token_ring/ring_call.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/msg.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 
 int host(int argc, char *argv[]);
 unsigned int task_comp_size = 50000000;

diff --git a/examples/msg/token_ring/token_bypass.c b/examples/msg/token_ring/token_bypass.c
index 99002a2..c25f43d 100644 (file)
--- a/examples/msg/token_ring/token_bypass.c
+++ b/examples/msg/token_ring/token_bypass.c
@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "surf/surfxml_parse.h"
 #include "simgrid/msg.h"
-#include "surf/surf_private.h"
 
 int host(int argc, char *argv[]);
 unsigned int task_comp_size = 50000000;
@@ -92,7 +92,6 @@ static int surf_parse_bypass_platform(void)
 
   sg_platf_new_AS_end();
   sg_platf_end();
-  sg_platf_exit();
   return 0;
 }
 

diff --git a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
index d5681b9..f0b2daa 100644 (file)
--- a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
+++ b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
@@ -11,7 +11,6 @@
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
 #include "xbt/asserts.h"
-#include "smpi/private.h"
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index f406c84..cb090b5 100644 (file)
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -22,7 +22,7 @@
 
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
-#include "mc/mc_forward.h"
+#include "src/mc/mc_forward.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c
index ef416f9..21be518 100644 (file)
--- a/src/bindings/lua/lua_platf.c
+++ b/src/bindings/lua/lua_platf.c
@@ -14,9 +14,9 @@
 #include <ctype.h>
 #include <lauxlib.h>
 
-#include <msg/msg_private.h>
-#include <simix/smx_host_private.h>
-#include <surf/surf_private.h>
+#include "src/msg/msg_private.h"
+#include "src/simix/smx_host_private.h"
+#include "src/surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, bindings, "Lua bindings (platform module)");
 

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 3394673..3449a32 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -7,7 +7,7 @@
 #ifndef _SURF_MAXMIN_H
 #define _SURF_MAXMIN_H
 
-#include "portable.h"
+#include "src/portable.h"
 #include "xbt/misc.h"
 #include "xbt/asserts.h"
 #include "surf/datatypes.h"

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 25468da..2d9b4fb 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -12,8 +12,8 @@
 #include "xbt/dict.h"
 #include "xbt/graph.h"
 #include "xbt/misc.h"
-#include "portable.h"
 #include "xbt/config.h"
+#include "src/portable.h"
 #include "surf/datatypes.h"
 #include "xbt/lib.h"
 #include "surf/surf_routing.h"

diff --git a/src/instr/instr_TI_trace.c b/src/instr/instr_TI_trace.c
index f6a38a3..3a1ee51 100644 (file)
--- a/src/instr/instr_TI_trace.c
+++ b/src/instr/instr_TI_trace.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "xbt/virtu.h" /* sg_cmdline */
 #include "xbt/xbt_os_time.h"
 #include "simgrid/sg_config.h"

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 2c0ff84..978762e 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "simgrid/sg_config.h"
 #include "surf/surf.h"
 

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 123156b..9dbed96 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -6,9 +6,9 @@
 
 #include "simgrid_config.h"
 
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "surf/surf.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 
 typedef enum {
   INSTR_US_DECLARE,

diff --git a/src/instr/instr_paje_containers.c b/src/instr/instr_paje_containers.c
index 5e542c4..8566b30 100644 (file)
--- a/src/instr/instr_paje_containers.c
+++ b/src/instr/instr_paje_containers.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "xbt/lib.h"
 #include "surf/surf.h"
 #include "surf/surf_routing.h"

diff --git a/src/instr/instr_paje_header.c b/src/instr/instr_paje_header.c
index 2768fc9..2d76e28 100644 (file)
--- a/src/instr/instr_paje_header.c
+++ b/src/instr/instr_paje_header.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_header, instr, "Paje tracing event system (header)");
 

diff --git a/src/instr/instr_paje_trace.c b/src/instr/instr_paje_trace.c
index 5416d0a..2cce106 100644 (file)
--- a/src/instr/instr_paje_trace.c
+++ b/src/instr/instr_paje_trace.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "xbt/virtu.h" /* sg_cmdline */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr_trace, "tracing event system");

diff --git a/src/instr/instr_paje_types.c b/src/instr/instr_paje_types.c
index 196b01c..9d35be5 100644 (file)
--- a/src/instr/instr_paje_types.c
+++ b/src/instr/instr_paje_types.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
 

diff --git a/src/instr/instr_paje_values.c b/src/instr/instr_paje_values.c
index 19a8000..a45729b 100644 (file)
--- a/src/instr/instr_paje_values.c
+++ b/src/instr/instr_paje_values.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 437782f..1a5f367 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -11,7 +11,7 @@
 
 #include "simgrid/instr.h"
 #include "instr/instr_interface.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "simgrid_config.h"
 
 SG_BEGIN_DECL()

diff --git a/src/instr/instr_resource_utilization.c b/src/instr/instr_resource_utilization.c
index 32526d3..235321f 100644 (file)
--- a/src/instr/instr_resource_utilization.c
+++ b/src/instr/instr_resource_utilization.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_resource, instr, "tracing (un)-categorized resource utilization");
 

diff --git a/src/instr/instr_trace.c b/src/instr/instr_trace.c
index a571282..69fdf03 100644 (file)
--- a/src/instr/instr_trace.c
+++ b/src/instr/instr_trace.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "xbt/virtu.h" /* sg_cmdline */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_trace, instr, "tracing event system");

diff --git a/src/mc/ChunkedData.cpp b/src/mc/ChunkedData.cpp
index c1f3e2d..b0c1aae 100644 (file)
--- a/src/mc/ChunkedData.cpp
+++ b/src/mc/ChunkedData.cpp
@@ -1,4 +1,4 @@
-#include <mc/ChunkedData.hpp>
+#include "src/mc/ChunkedData.hpp"
 
 #define SOFT_DIRTY_BIT_NUMBER 55
 #define SOFT_DIRTY (((uint64_t)1) << SOFT_DIRTY_BIT_NUMBER)

diff --git a/src/mc/ChunkedData.hpp b/src/mc/ChunkedData.hpp
index 0ec1cb2..02e6bcc 100644 (file)
--- a/src/mc/ChunkedData.hpp
+++ b/src/mc/ChunkedData.hpp
@@ -6,9 +6,9 @@
 
 #include <vector>
 
-#include <mc/mc_forward.hpp>
-#include <mc/AddressSpace.hpp>
-#include <mc/PageStore.hpp>
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/PageStore.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/DwarfExpression.cpp b/src/mc/DwarfExpression.cpp
index 07b5f0d..3f88a7d 100644 (file)
--- a/src/mc/DwarfExpression.cpp
+++ b/src/mc/DwarfExpression.cpp
@@ -12,11 +12,11 @@
 
 #include "mc_object_info.h"
 #include "mc_private.h"
-#include "mc/LocationList.hpp"
-#include "mc/AddressSpace.hpp"
-#include "mc/Frame.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/DwarfExpression.hpp"
+#include "src/mc/LocationList.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/DwarfExpression.hpp"
 #include "mc_dwarf.hpp"
 
 using simgrid::mc::remote;

diff --git a/src/mc/DwarfExpression.hpp b/src/mc/DwarfExpression.hpp
index 946f83c..3ac1777 100644 (file)
--- a/src/mc/DwarfExpression.hpp
+++ b/src/mc/DwarfExpression.hpp
@@ -5,7 +5,7 @@
 
 #include <stdexcept>
 
-#include <mc/AddressSpace.hpp>
+#include "src/mc/AddressSpace.hpp"
 
 namespace simgrid {
 namespace dwarf {

diff --git a/src/mc/Frame.cpp b/src/mc/Frame.cpp
index 448cfa1..5a114d8 100644 (file)
--- a/src/mc/Frame.cpp
+++ b/src/mc/Frame.cpp
@@ -4,7 +4,7 @@
 /* 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 <mc/Frame.hpp>
+#include "src/mc/Frame.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp
index 67d638e..9e2c692 100644 (file)
--- a/src/mc/Frame.hpp
+++ b/src/mc/Frame.hpp
@@ -12,9 +12,9 @@
 #include <xbt/base.h>
 
 #include "mc_forward.h"
-#include "mc/LocationList.hpp"
-#include "mc/Variable.hpp"
-#include "mc/Frame.hpp"
+#include "src/mc/LocationList.hpp"
+#include "src/mc/Variable.hpp"
+#include "src/mc/Frame.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/LocationList.cpp b/src/mc/LocationList.cpp
index 34e55e4..f11ea28 100644 (file)
--- a/src/mc/LocationList.cpp
+++ b/src/mc/LocationList.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "mc_dwarf.hpp"
-#include <mc/ObjectInformation.hpp>
-#include <mc/LocationList.hpp>
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/LocationList.hpp"
 
 namespace simgrid {
 namespace dwarf {

diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index bfc53c5..e23ba40 100644 (file)
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -15,11 +15,11 @@
 #include <dwarf.h>
 #include <elfutils/libdw.h>
 
-#include <simgrid_config.h>
+#include "simgrid_config.h"
 #include "mc_base.h"
 #include "mc_forward.hpp"
-#include "mc/AddressSpace.hpp"
-#include "mc/DwarfExpression.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/DwarfExpression.hpp"
 
 namespace simgrid {
 namespace dwarf {

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 64db962..c9e58d9 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -14,8 +14,8 @@
 #include <xbt/base.h>
 
 #include "mc_forward.hpp"
-#include "mc/Process.hpp"
-#include "mc/PageStore.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/PageStore.hpp"
 #include "mc_protocol.h"
 
 namespace simgrid {

diff --git a/src/mc/ObjectInformation.cpp b/src/mc/ObjectInformation.cpp
index 0305fd5..62b793e 100644 (file)
--- a/src/mc/ObjectInformation.cpp
+++ b/src/mc/ObjectInformation.cpp
@@ -1,6 +1,6 @@
-#include "mc/Frame.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/ObjectInformation.hpp b/src/mc/ObjectInformation.hpp
index d589dac..2b25762 100644 (file)
--- a/src/mc/ObjectInformation.hpp
+++ b/src/mc/ObjectInformation.hpp
@@ -13,11 +13,11 @@
 
 #include <xbt/base.h>
 
-#include "mc/mc_forward.h"
-#include "mc/Type.hpp"
-#include "mc/Frame.hpp"
+#include "src/mc/mc_forward.h"
+#include "src/mc/Type.hpp"
+#include "src/mc/Frame.hpp"
 
-#include "smpi/private.h"
+#include "src/smpi/private.h"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index 3af20cb..3ad754e 100644 (file)
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -34,10 +34,10 @@
 #include "mc_smx.h"
 #include "mc_server.h"
 
-#include "mc/Process.hpp"
-#include "mc/AddressSpace.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index af42a12..ff36fa1 100644 (file)
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -21,12 +21,12 @@
 #include <xbt/mmalloc.h>
 
 #ifdef HAVE_MC
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 #endif
 
 #include <simgrid/simix.h>
-#include "simix/popping_private.h"
-#include "simix/smx_private.h"
+#include "src/simix/popping_private.h"
+#include "src/simix/smx_private.h"
 
 #include "mc_forward.hpp"
 #include "mc_base.h"

diff --git a/src/mc/RegionSnapshot.cpp b/src/mc/RegionSnapshot.cpp
index 74986e1..007fcd0 100644 (file)
--- a/src/mc/RegionSnapshot.cpp
+++ b/src/mc/RegionSnapshot.cpp
@@ -9,8 +9,8 @@
 #include "mc/mc.h"
 #include "mc_snapshot.h"
 
-#include <mc/ChunkedData.hpp>
-#include <mc/RegionSnapshot.hpp>
+#include "src/mc/ChunkedData.hpp"
+#include "src/mc/RegionSnapshot.hpp"
 
 extern "C" {
 

diff --git a/src/mc/RegionSnapshot.hpp b/src/mc/RegionSnapshot.hpp
index 9a9b219..04c1651 100644 (file)
--- a/src/mc/RegionSnapshot.hpp
+++ b/src/mc/RegionSnapshot.hpp
@@ -12,9 +12,9 @@
 
 #include <xbt/base.h>
 
-#include <mc/PageStore.hpp>
-#include <mc/AddressSpace.hpp>
-#include <mc/ChunkedData.hpp>
+#include "src/mc/PageStore.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/ChunkedData.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/Type.hpp b/src/mc/Type.hpp
index accea56..a3bffd5 100644 (file)
--- a/src/mc/Type.hpp
+++ b/src/mc/Type.hpp
@@ -13,7 +13,7 @@
 #include <xbt/base.h>
 
 #include "mc_forward.h"
-#include "mc/LocationList.hpp"
+#include "src/mc/LocationList.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/Variable.hpp b/src/mc/Variable.hpp
index 804a7a7..176cf46 100644 (file)
--- a/src/mc/Variable.hpp
+++ b/src/mc/Variable.hpp
@@ -12,7 +12,7 @@
 #include <xbt/base.h>
 
 #include "mc_forward.h"
-#include "mc/LocationList.hpp"
+#include "src/mc/LocationList.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index f38cf7b..ea5b647 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -9,15 +9,15 @@
 #include <simgrid/simix.h>
 
 #include "mc_base.h"
-#include "../simix/smx_private.h"
-#include "mc/mc_record.h"
-#include "mc/mc_replay.h"
+#include "src/simix/smx_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_replay.h"
 #include "mc/mc.h"
 #include "mc_protocol.h"
 
 #ifdef HAVE_MC
-#include "mc/Process.hpp"
-#include "mc/ModelChecker.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/ModelChecker.hpp"
 #include "mc_smx.h"
 #include "mc_server.h"
 #endif

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index 7b668d5..5b50e14 100644 (file)
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -10,8 +10,8 @@
 #include <xbt/misc.h>
 #include <simgrid/simix.h>
 #include "simgrid_config.h"
-#include "internal_config.h"
-#include "../simix/smx_private.h"
+#include "src/internal_config.h"
+#include "src/simix/smx_private.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 4360d06..01c5183 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -10,17 +10,17 @@
 #include <link.h>
 #include <dirent.h>
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "mc_memory_map.h"
 #include "mc_private.h"
 #include "xbt/module.h"
 #include <xbt/mmalloc.h>
-#include "../smpi/private.h"
+#include "src/smpi/private.h"
 #include <alloca.h>
 
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 
-#include "../simix/smx_private.h"
+#include "src/simix/smx_private.h"
 
 #include <libunwind.h>
 #include <libelf.h>
@@ -36,9 +36,9 @@
 #include "mc_smx.h"
 #include "mc_hash.hpp"
 
-#include "mc/ObjectInformation.hpp"
-#include "mc/Frame.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/Variable.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index 8c05cd1..1019fdb 100644 (file)
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -12,7 +12,7 @@
 
 #include <xbt/sysdep.h>
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "mc_object_info.h"
 #include "mc_safety.h"
 #include "mc_liveness.h"
@@ -20,18 +20,18 @@
 #include "mc_smx.h"
 #include "mc_dwarf.hpp"
 
-#include "mc/Frame.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 #ifdef HAVE_SMPI
-#include "smpi/private.h"
+#include "src/smpi/private.h"
 #endif
 
 #include "xbt/mmalloc.h"
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 
-#include <xbt/probes.h>
+#include "src/xbt/probes.h"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 147b38a..b863136 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -9,7 +9,7 @@
 #include <xbt/config.h>
 
 #include <mc/mc.h>
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 
 #include <simgrid/sg_config.h>
 

diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp
index 7b7ecb7..2abb326 100644 (file)
--- a/src/mc/mc_diff.cpp
+++ b/src/mc/mc_diff.cpp
@@ -6,16 +6,16 @@
 /* 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/ex_interface.h"   /* internals of backtrace setup */
+#include "src/xbt/ex_interface.h"   /* internals of backtrace setup */
 #include "xbt/str.h"
 #include "mc/mc.h"
 #include "xbt/mmalloc.h"
 #include "mc_object_info.h"
 #include "mc/datatypes.h"
-#include "mc/mc_private.h"
-#include "mc/mc_snapshot.h"
-#include "mc/mc_dwarf.hpp"
-#include "mc/Type.hpp"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_dwarf.hpp"
+#include "src/mc/Type.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index eeb6a36..efce4fd 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -16,19 +16,17 @@
 #include <elfutils/libdw.h>
 
 #include <simgrid_config.h>
-#include <simgrid/util.hpp>
+#include "src/simgrid/util.hpp"
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 
-#include <simgrid/util.hpp>
-
 #include "mc_object_info.h"
 #include "mc_private.h"
 #include "mc_dwarf.hpp"
 
-#include "mc/Process.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dwarf, mc, "DWARF processing");
 

diff --git a/src/mc/mc_dwarf.hpp b/src/mc/mc_dwarf.hpp
index b7ebf39..4ddeaa7 100644 (file)
--- a/src/mc/mc_dwarf.hpp
+++ b/src/mc/mc_dwarf.hpp
@@ -16,8 +16,8 @@
 #define DW_LANG_Objc DW_LANG_ObjC       /* fix spelling error in older dwarf.h */
 #include <dwarf.h>
 
-#include "mc/Variable.hpp"
-#include "mc/mc_memory_map.h"
+#include "src/mc/Variable.hpp"
+#include "src/mc/mc_memory_map.h"
 
 namespace simgrid {
 namespace dwarf {

diff --git a/src/mc/mc_ignore.cpp b/src/mc/mc_ignore.cpp
index 0c973ed..d758c7f 100644 (file)
--- a/src/mc/mc_ignore.cpp
+++ b/src/mc/mc_ignore.cpp
@@ -4,11 +4,11 @@
 /* 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 "internal_config.h"
+#include "src/internal_config.h"
 #include "mc_object_info.h"
 #include "mc_private.h"
-#include "smpi/private.h"
-#include "mc/mc_snapshot.h"
+#include "src/smpi/private.h"
+#include "src/mc/mc_snapshot.h"
 #include "mc_ignore.h"
 #include "mc_protocol.h"
 #include "mc_client.h"

diff --git a/src/mc/mc_ignore.h b/src/mc/mc_ignore.h
index a9b134d..c1a2aeb 100644 (file)
--- a/src/mc/mc_ignore.h
+++ b/src/mc/mc_ignore.h
@@ -10,7 +10,7 @@
 #include <xbt/dynar.h>
 
 #include "mc/datatypes.h"
-#include "mc/Process.hpp"
+#include "src/mc/Process.hpp"
 
 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 

diff --git a/src/mc/mc_member.cpp b/src/mc/mc_member.cpp
index d7003c4..bbe2eef 100644 (file)
--- a/src/mc/mc_member.cpp
+++ b/src/mc/mc_member.cpp
@@ -8,7 +8,7 @@
 
 #include "mc_object_info.h"
 #include "mc_private.h"
-#include "mc/Type.hpp"
+#include "src/mc/Type.hpp"
 
 namespace simgrid {
 namespace dwarf {

diff --git a/src/mc/mc_memory.cpp b/src/mc/mc_memory.cpp
index 1148634..a3ce18d 100644 (file)
--- a/src/mc/mc_memory.cpp
+++ b/src/mc/mc_memory.cpp
@@ -30,7 +30,7 @@ void MC_memory_init()
 }
 
 /* Finalize the memory subsystem */
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
 void MC_memory_exit(void)
 {
 }

diff --git a/src/mc/mc_page_snapshot.cpp b/src/mc/mc_page_snapshot.cpp
index 794b4f1..4463448 100644 (file)
--- a/src/mc/mc_page_snapshot.cpp
+++ b/src/mc/mc_page_snapshot.cpp
@@ -14,7 +14,7 @@
 #include "mc_snapshot.h"
 
 #include <xbt/mmalloc.h>
-#include <mc/ChunkedData.hpp>
+#include "src/mc/ChunkedData.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_safety.cpp b/src/mc/mc_safety.cpp
index 65f381a..84d5aa4 100644 (file)
--- a/src/mc/mc_safety.cpp
+++ b/src/mc/mc_safety.cpp
@@ -15,7 +15,7 @@
 #include "mc_client.h"
 #include "mc_exit.h"
 
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_server.cpp b/src/mc/mc_server.cpp
index b869b19..8368238 100644 (file)
--- a/src/mc/mc_server.cpp
+++ b/src/mc/mc_server.cpp
@@ -24,7 +24,7 @@
 #include "mc_ignore.h"
 #include "mcer_ignore.h"
 #include "mc_exit.h"
-#include "mc/mc_liveness.h"
+#include "src/mc/mc_liveness.h"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_server.h b/src/mc/mc_server.h
index f5457e1..e333a5c 100644 (file)
--- a/src/mc/mc_server.h
+++ b/src/mc/mc_server.h
@@ -17,7 +17,7 @@
 #include <xbt/misc.h>
 #include <xbt/base.h>
  
-#include "mc/Process.hpp"
+#include "src/mc/Process.hpp"
 #include "mc_exit.h"
 
 SG_BEGIN_DECL()

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 7ef07f5..ee53d1a 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -8,7 +8,7 @@
 
 #include <xbt/log.h>
 
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 
 #include "mc_smx.h"
 #include "ModelChecker.hpp"

diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h
index 827634d..d94c414 100644 (file)
--- a/src/mc/mc_smx.h
+++ b/src/mc/mc_smx.h
@@ -12,9 +12,9 @@
 #include <xbt/log.h>
 #include <simgrid/simix.h>
 
-#include "smpi/private.h"
+#include "src/smpi/private.h"
 
-#include "mc/Process.hpp"
+#include "src/mc/Process.hpp"
 #include "mc_protocol.h"
 
 /** @file

diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp
index 5892e0d..e1b67f1 100644 (file)
--- a/src/mc/mc_snapshot.cpp
+++ b/src/mc/mc_snapshot.cpp
@@ -6,8 +6,8 @@
 
 #include <stdbool.h>
 
-#include "internal_config.h"
-#include "smpi/private.h"
+#include "src/internal_config.h"
+#include "src/smpi/private.h"
 
 #include "mc_snapshot.h"
 #include "mc_private.h"

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 239d26d..1168934 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -24,7 +24,7 @@
 #include "ModelChecker.hpp"
 #include "PageStore.hpp"
 #include "mc_mmalloc.h"
-#include "mc/AddressSpace.hpp"
+#include "src/mc/AddressSpace.hpp"
 #include "mc_unw.h"
 #include "RegionSnapshot.hpp"
 

diff --git a/src/mc/mc_unw.cpp b/src/mc/mc_unw.cpp
index c537850..8879bde 100644 (file)
--- a/src/mc/mc_unw.cpp
+++ b/src/mc/mc_unw.cpp
@@ -19,9 +19,9 @@
 #include <libunwind.h>
 
 #include "mc_object_info.h"
-#include "mc/Process.hpp"
+#include "src/mc/Process.hpp"
 #include "mc_unw.h"
-#include "mc/Frame.hpp"
+#include "src/mc/Frame.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_unw.h b/src/mc/mc_unw.h
index 915c445..53982a0 100644 (file)
--- a/src/mc/mc_unw.h
+++ b/src/mc/mc_unw.h
@@ -28,7 +28,7 @@
 
 #include <xbt/base.h>
 
-#include "mc/Process.hpp"
+#include "src/mc/Process.hpp"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_visited.cpp b/src/mc/mc_visited.cpp
index 40db5aa..09385c1 100644 (file)
--- a/src/mc/mc_visited.cpp
+++ b/src/mc/mc_visited.cpp
@@ -11,7 +11,7 @@
 #include "mc_safety.h"
 #include "mc_liveness.h"
 #include "mc_private.h"
-#include "mc/Process.hpp"
+#include "src/mc/Process.hpp"
 #include "mc_smx.h"
 
 extern "C" {

diff --git a/src/mc/mc_xbt.cpp b/src/mc/mc_xbt.cpp
index 5f1780b..3be0e93 100644 (file)
--- a/src/mc/mc_xbt.cpp
+++ b/src/mc/mc_xbt.cpp
@@ -6,7 +6,7 @@
 
 #include <xbt/sysdep.h>
 
-#include "mc/AddressSpace.hpp"
+#include "src/mc/AddressSpace.hpp"
 #include "mc_xbt.hpp"
 
 namespace simgrid {

diff --git a/src/mc/mc_xbt.hpp b/src/mc/mc_xbt.hpp
index b83fb5f..e6dbd53 100644 (file)
--- a/src/mc/mc_xbt.hpp
+++ b/src/mc/mc_xbt.hpp
@@ -9,7 +9,7 @@
 
 #include <xbt/base.h>
 
-#include "mc/AddressSpace.hpp"
+#include "src/mc/AddressSpace.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mcer_ignore.cpp b/src/mc/mcer_ignore.cpp
index 5b0b6c7..ce0478e 100644 (file)
--- a/src/mc/mcer_ignore.cpp
+++ b/src/mc/mcer_ignore.cpp
@@ -6,18 +6,18 @@
 
 #include <xbt/base.h>
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "mc_object_info.h"
-#include "mc/mc_private.h"
-#include "smpi/private.h"
-#include "mc/mc_snapshot.h"
-#include "mc/mc_ignore.h"
-#include "mc/mc_protocol.h"
-#include "mc/mc_client.h"
-
-#include "mc/Frame.hpp"
-#include "mc/Variable.hpp"
-#include "mc/ObjectInformation.hpp"
+#include "src/mc/mc_private.h"
+#include "src/smpi/private.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
+
+#include "src/mc/Frame.hpp"
+#include "src/mc/Variable.hpp"
+#include "src/mc/ObjectInformation.hpp"
 
 extern "C" {
 

diff --git a/src/mc/mcer_ignore.h b/src/mc/mcer_ignore.h
index d5f5529..65f843f 100644 (file)
--- a/src/mc/mcer_ignore.h
+++ b/src/mc/mcer_ignore.h
@@ -10,7 +10,7 @@
 #include <xbt/dynar.h>
 
 #include "mc/datatypes.h"
-#include "mc/Process.hpp"
+#include "src/mc/Process.hpp"
 
 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index f56cc71..cd2e84b 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -26,7 +26,7 @@
 #include <xbt/log.h>
 
 #include "simgrid/sg_config.h"
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
 
 #include "mc_base.h"
 #include "mc_private.h"

diff --git a/src/msg/instr_msg_process.c b/src/msg/instr_msg_process.c
index ac0d3dc..1af7c96 100644 (file)
--- a/src/msg/instr_msg_process.c
+++ b/src/msg/instr_msg_process.c
@@ -5,7 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg_private.h"
-#include "simix/smx_process_private.h"
+#include "src/simix/smx_process_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 

diff --git a/src/msg/instr_msg_task.c b/src/msg/instr_msg_task.c
index a23302a..58aad0b 100644 (file)
--- a/src/msg/instr_msg_task.c
+++ b/src/msg/instr_msg_task.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "msg_private.h"
 #include "mc/mc.h"
 

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index 136a2ec..438c777 100644 (file)
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -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 "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "simgrid/simix.h"

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 01bbea5..43c65b3 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -9,14 +9,14 @@
 
 #include "simgrid/msg.h"
 #include "simgrid/simix.h"
-#include "surf/surf.h"
+#include "src/include/surf/surf.h"
 #include "xbt/base.h"
 #include "xbt/fifo.h"
 #include "xbt/dynar.h"
 #include "xbt/swag.h"
 #include "xbt/dict.h"
 #include "xbt/config.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 SG_BEGIN_DECL()
 
 /**************** datatypes **********************************/

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index 3398548..a1aa241 100644 (file)
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -7,7 +7,7 @@
 #include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "simix/smx_process_private.h"
+#include "src/simix/smx_process_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg,
                                 "Logging specific to MSG (process)");

diff --git a/src/msg/msg_task.c b/src/msg/msg_task.c
index 3db6204..74f25b0 100644 (file)
--- a/src/msg/msg_task.c
+++ b/src/msg/msg_task.c
@@ -5,7 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg_private.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 19e332f..a919d84 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/actor.hpp"
 #include "simgrid/s4u/comm.hpp"

diff --git a/src/s4u/s4u_async.cpp b/src/s4u/s4u_async.cpp
index 7088472..5bbce9a 100644 (file)
--- a/src/s4u/s4u_async.cpp
+++ b/src/s4u/s4u_async.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/async.hpp"
 

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 02f5e98..d26c4d6 100644 (file)
--- a/src/s4u/s4u_comm.cpp
+++ b/src/s4u/s4u_comm.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/comm.hpp"
 

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index dd50829..94a5947 100644 (file)
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -4,8 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/actor.hpp"
 #include "simgrid/s4u/comm.hpp"

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 8456370..ee6ea5b 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "simix/smx_process_private.h"
+#include "src/msg/msg_private.h"
+#include "src/simix/smx_process_private.h"
 
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index d18150d..a2a6a42 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/mailbox.hpp"
 

diff --git a/src/simdag/instr_sd_task.c b/src/simdag/instr_sd_task.c
index ed5005f..1194aae 100644 (file)
--- a/src/simdag/instr_sd_task.c
+++ b/src/simdag/instr_sd_task.c
@@ -4,7 +4,7 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "private.h"
 #include "simgrid/simdag.h"
 

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index c55d588..9fd6cd3 100644 (file)
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -8,7 +8,7 @@
 #include "simgrid/simdag.h"
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd,
                                 "Logging specific to SimDag (task)");

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 63655a9..069596f 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -45,11 +45,11 @@ int ROUTING_HOST_LEVEL;
 int SURF_CPU_LEVEL;
 
 
-#include "msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
-#include "simdag/private.h" // __SD_workstation_destroy. FIXME: killme
-#include "simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
-#include "surf/cpu_interface.hpp"
-#include "surf/surf_routing.hpp"
+#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
+#include "src/simdag/private.h" // __SD_workstation_destroy. FIXME: killme
+#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/surf_routing.hpp"
 
 static XBT_INLINE void surf_cpu_free(void *r) {
   delete static_cast<Cpu*>(r);

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 2ce94c9..624b6d8 100644 (file)
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -22,9 +22,9 @@
 #include "smpi/smpi_interface.h"
 #endif
 #include "mc/mc.h"
-#include "mc/mc_record.h"
+#include "src/mc/mc_record.h"
 #include "simgrid/instr.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
                                 "About the configuration of simgrid");
@@ -367,7 +367,7 @@ static void _sg_cfg_cb__surf_path(const char *name, int pos)
 }
 
 /* callback to decide if we want to use the model-checking */
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
 
 #ifdef HAVE_MC
 extern int _sg_do_model_check;   /* this variable lives in xbt_main until I find a right location for it */

diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c
index 25285dc..b7d9d02 100644 (file)
--- a/src/simix/libsmx.c
+++ b/src/simix/libsmx.c
@@ -11,9 +11,9 @@
 /* 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 "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 #include "smx_private.h"
-#include "mc/mc_forward.h"
+#include "src/mc/mc_forward.h"
 #include "xbt/ex.h"
 #include <math.h>         /* isfinite() */
 #include "mc/mc.h"

diff --git a/src/simix/popping.c b/src/simix/popping.c
index 0d510c5..1fb39ba 100644 (file)
--- a/src/simix/popping.c
+++ b/src/simix/popping.c
@@ -8,7 +8,7 @@
 #include "xbt/fifo.h"
 #include "xbt/xbt_os_thread.h"
 #ifdef HAVE_MC
-#include "mc/mc_private.h"
+#include "src/mc/mc_private.h"
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,

diff --git a/src/simix/popping_bodies.c b/src/simix/popping_bodies.c
index 2aa5171..ca4d382 100644 (file)
--- a/src/simix/popping_bodies.c
+++ b/src/simix/popping_bodies.c
@@ -14,7 +14,7 @@
  */
 
 #include "smx_private.h"
-#include "mc/mc_forward.h"
+#include "src/mc/mc_forward.h"
 #include "xbt/ex.h"
   
 inline static const char* simcall_BODY_host_get_name(sg_host_t host) {

diff --git a/src/simix/popping_generated.c b/src/simix/popping_generated.c
index a290148..ac7c775 100644 (file)
--- a/src/simix/popping_generated.c
+++ b/src/simix/popping_generated.c
@@ -16,7 +16,7 @@
 #include <xbt/base.h>
 #include "smx_private.h"
 #ifdef HAVE_MC
-#include "mc/mc_forward.h"
+#include "src/mc/mc_forward.h"
 #endif
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index 26e3662..4f31ac7 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -15,7 +15,7 @@ SG_BEGIN_DECL()
 XBT_PUBLIC_DATA(const char*) simcall_names[]; /* Name of each simcall */
 
 #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
-#include "mc/mc_forward.h" /* Definition of mc_snapshot_t, used by one simcall */
+#include "src/mc/mc_forward.h" /* Definition of mc_snapshot_t, used by one simcall */
 
 typedef int (*simix_match_func_t)(void *, void *, smx_synchro_t);
 typedef void (*simix_copy_data_func_t)(smx_synchro_t, void*, size_t);

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index aa2a54d..e65b78a 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -282,7 +282,7 @@ if __name__=='__main__':
   fd.write('#include <xbt/base.h>\n');
   fd.write('#include "smx_private.h"\n');
   fd.write('#ifdef HAVE_MC\n');
-  fd.write('#include "mc/mc_forward.h"\n');
+  fd.write('#include "src/mc/mc_forward.h"\n');
   fd.write('#endif\n');
   fd.write('\n');
   fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n');
@@ -329,7 +329,7 @@ if __name__=='__main__':
   ###
   fd = header('popping_bodies.c')
   fd.write('#include "smx_private.h"\n')
-  fd.write('#include "mc/mc_forward.h"\n')
+  fd.write('#include "src/mc/mc_forward.h"\n')
   fd.write('#include "xbt/ex.h"\n')
   handle(fd, Simcall.body, simcalls, simcalls_dict)
   fd.close()

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index e447ed3..72d9631 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -6,13 +6,13 @@
 /* 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"
+#include "src/portable.h"
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
 #include "simgrid/sg_config.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "simgrid/modelchecker.h"
 
 

diff --git a/src/simix/smx_context_boost.cpp b/src/simix/smx_context_boost.cpp
index 1ddf080..70bae9b 100644 (file)
--- a/src/simix/smx_context_boost.cpp
+++ b/src/simix/smx_context_boost.cpp
@@ -12,7 +12,7 @@
 
 #include "xbt/log.h"
 #include "smx_private.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index 0213163..0502499 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -10,8 +10,8 @@
 
 #include "xbt/parmap.h"
 #include "smx_private.h"
-#include "internal_config.h"
-#include "context_sysv_config.h"        /* loads context system definitions */
+#include "src/internal_config.h"
+#include "src/context_sysv_config.h"        /* loads context system definitions */
 #include "mc/mc.h"
 
 #ifdef _XBT_WIN32

diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c
index bb7bc84..a151abf 100644 (file)
--- a/src/simix/smx_context_thread.c
+++ b/src/simix/smx_context_thread.c
@@ -8,10 +8,10 @@
 
 #include "xbt/function_types.h"
 #include "smx_private.h"
-#include "portable.h"           /* loads context system definitions */
+#include "src/portable.h"           /* loads context system definitions */
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
-#include "xbt_modinter.h"       /* prototype of os thread module's init/exit in XBT */
+#include "src/xbt_modinter.h"       /* prototype of os thread module's init/exit in XBT */
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index d3337a3..25882af 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -13,24 +13,24 @@
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 #include "simgrid/sg_config.h"
 
 #ifdef HAVE_MC
-#include "mc/mc_private.h"
-#include "mc/mc_protocol.h"
-#include "mc/mc_client.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
 #endif
 
 #ifdef HAVE_MC
 #include <stdlib.h>
-#include "mc/mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 #endif 
 
-#include "mc/mc_record.h"
+#include "src/mc/mc_record.h"
 
 #ifdef HAVE_SMPI
-#include "smpi/private.h"
+#include "src/smpi/private.h"
 #endif
 
 XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 4b49e11..961ff9c 100644 (file)
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -9,7 +9,7 @@
 #include "xbt/log.h"
 #include "xbt/dict.h"
 #include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
                                 "SIMIX hosts");

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 129cfd7..29a59f3 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -7,7 +7,7 @@
 #include "smx_private.h"
 #include "xbt/log.h"
 #include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 #include "xbt/dict.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index d908a7d..572d474 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -17,8 +17,8 @@
 #include "xbt/config.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/function_types.h"
-#include "xbt/ex_interface.h"
-#include "instr/instr_private.h"
+#include "src/xbt/ex_interface.h"
+#include "src/instr/instr_private.h"
 #include "smx_process_private.h"
 #include "smx_host_private.h"
 #include "smx_io_private.h"

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index bc1a052..2fac9cf 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -9,8 +9,8 @@
 #include "xbt/log.h"
 #include "xbt/dict.h"
 #include "mc/mc.h"
-#include "mc/mc_replay.h"
-#include "mc/mc_client.h"
+#include "src/mc/mc_replay.h"
+#include "src/mc/mc_client.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
                                 "Logging specific to SIMIX (process)");

diff --git a/src/smpi/colls/colls.h b/src/smpi/colls/colls.h
index c1658db..ffd791a 100644 (file)
--- a/src/smpi/colls/colls.h
+++ b/src/smpi/colls/colls.h
@@ -9,7 +9,7 @@
 
 #include <math.h>
 #include "smpi/mpi.h"
-#include "smpi/private.h"
+#include "src/smpi/private.h"
 #include "xbt/ex.h"
 #include "xbt.h"
 

diff --git a/src/smpi/colls/smpi_automatic_selector.c b/src/smpi/colls/smpi_automatic_selector.c
index 72c62a7..40cebaf 100644 (file)
--- a/src/smpi/colls/smpi_automatic_selector.c
+++ b/src/smpi/colls/smpi_automatic_selector.c
@@ -6,7 +6,7 @@
 
 #include "colls_private.h"
 #ifdef HAVE_MC
-#include "mc/mc_private.h"
+#include "src/mc/mc_private.h"
 #endif
 #include <float.h>
 

diff --git a/src/smpi/private.h b/src/smpi/private.h
index ce49def..eb7a5ae 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -7,16 +7,16 @@
 #ifndef SMPI_PRIVATE_H
 #define SMPI_PRIVATE_H
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "xbt.h"
 #include "xbt/base.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/synchro_core.h"
 #include "simgrid/simix.h"
-#include "smpi/smpi_interface.h"
+#include "src/include/smpi/smpi_interface.h"
 #include "smpi/smpi.h"
 #include "smpi/smpi_cocci.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index da028de..baaee4b 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -7,10 +7,10 @@
 #include "private.h"
 #include "xbt/virtu.h"
 #include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 #include "xbt/replay.h"
 #include <errno.h>
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "surf/surf.h"
 #include "simgrid/sg_config.h"
 #include "colls/colls.h"

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 82a4190..6dbbddb 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -4,7 +4,7 @@
 /* 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 "internal_config.h"
+#include "src/internal_config.h"
 #include "private.h"
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
@@ -13,7 +13,7 @@
 #include "surf/surf.h"
 #include "simgrid/sg_config.h"
 #include "simgrid/modelchecker.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 
 #ifndef WIN32
 #include <sys/mman.h>

diff --git a/src/smpi/smpi_comm.c b/src/smpi/smpi_comm.c
index 82e276f..9f38c44 100644 (file)
--- a/src/smpi/smpi_comm.c
+++ b/src/smpi/smpi_comm.c
@@ -10,7 +10,7 @@
 #include "xbt/dict.h"
 #include "smpi_mpi_dt_private.h"
 #include "limits.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "colls/colls.h"
 #include "xbt/ex.h"
 

diff --git a/src/smpi/smpi_dvfs.c b/src/smpi/smpi_dvfs.c
index d609b93..04d2bcf 100644 (file)
--- a/src/smpi/smpi_dvfs.c
+++ b/src/smpi/smpi_dvfs.c
@@ -7,7 +7,7 @@
 #include "xbt/log.h"
 #include "simgrid/simix.h"
 #include "smpi/smpi.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi,
                                 "Logging specific to SMPI (experimental DVFS support)");

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index bada714..1aa59ee 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -7,12 +7,12 @@
 #include "private.h"
 #include "smpi_mpi_dt_private.h"
 #include "mc/mc.h"
-#include "mc/mc_record.h"
+#include "src/mc/mc_record.h"
 #include "xbt/replay.h"
 #include "surf/surf.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "simgrid/sg_config.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 
 #include <float.h>              /* DBL_MAX */
 #include <stdint.h>

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 8ca1d73..4c5dbca 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -6,7 +6,7 @@
 
 #include "host_interface.hpp"
 
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "cpu_cas01.hpp"
 #include "simgrid/sg_config.h"
 

diff --git a/src/surf/instr_routing.c b/src/surf/instr_routing.c
index 06ed961..fbb9117 100644 (file)
--- a/src/surf/instr_routing.c
+++ b/src/surf/instr_routing.c
@@ -4,9 +4,9 @@
 /* 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 "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 #include "xbt/graph.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy");

diff --git a/src/surf/instr_surf.c b/src/surf/instr_surf.c
index 880e503..1cf1af9 100644 (file)
--- a/src/surf/instr_surf.c
+++ b/src/surf/instr_surf.c
@@ -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 "instr/instr_private.h"
-#include "surf/surf_private.h"
+#include "src/instr/instr_private.h"
+#include "src/surf/surf_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
 

diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c
index 091e6c2..74210ed 100644 (file)
--- a/src/surf/random_mgr.c
+++ b/src/surf/random_mgr.c
@@ -6,7 +6,7 @@
 
 #include "surf/random_mgr.h"
 #include "xbt/sysdep.h"
-#include "internal_config.h" /*_XBT_WIN32*/
+#include "src/internal_config.h" /*_XBT_WIN32*/
 #include <math.h>
 #include <stdlib.h>
 

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 8d26f4b..dabe0c2 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -8,7 +8,7 @@
 #include "surf_interface.hpp"
 #include "network_interface.hpp"
 #include "surf_routing_cluster.hpp"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "plugins/energy.hpp"
 #include "vm_interface.hpp"
 

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 8c78bcc..54788a7 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -9,7 +9,7 @@
 #include "network_interface.hpp"
 #include "cpu_interface.hpp"
 #include "host_interface.hpp"
-#include "simix/smx_host_private.h"
+#include "src/simix/smx_host_private.h"
 #include "surf_routing.hpp"
 #include "simgrid/sg_config.h"
 #include "mc/mc.h"

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 61bfdca..c9e52ac 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -18,8 +18,8 @@
 #include "surf/surf_routing.h"
 #include "simgrid/platf_interface.h"
 #include "surf/surf.h"
-#include "surf/surf_private.h"
-#include "internal_config.h"
+#include "src/surf/surf_private.h"
+#include "src/internal_config.h"
 
 #ifdef LIBSIGC
 #include <sigc++/sigc++.h>

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index da772b5..ad73b45 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -15,7 +15,7 @@
 #include "xbt/log.h"
 #include "surf/surfxml_parse.h"
 #include "surf/random_mgr.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "surf/surfxml_parse_values.h"
 
 #define NO_MAX_DURATION -1.0

diff --git a/src/surf/surf_routing_private.hpp b/src/surf/surf_routing_private.hpp
index 4892818..4f10bc1 100644 (file)
--- a/src/surf/surf_routing_private.hpp
+++ b/src/surf/surf_routing_private.hpp
@@ -8,7 +8,7 @@
 #define _SURF_SURF_ROUTING_PRIVATE_H
 
 #include <float.h>
-#include "internal_config.h"
+#include "src/internal_config.h"
 
 #include "surf_interface.hpp"
 #include "xbt/base.h"

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 4764cb9..7904fcb 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -14,7 +14,7 @@
 #include "xbt/file.h"
 #include "xbt/dict.h"
 #include "surf/surfxml_parse.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 #include "surf/random_mgr.h"
 #include "simgrid/sg_config.h"
 

diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c
index 238d328..3a0f327 100644 (file)
--- a/src/surf/surfxml_parseplatf.c
+++ b/src/surf/surfxml_parseplatf.c
@@ -10,11 +10,11 @@
 #include "xbt/dict.h"
 #include "simgrid/platf.h"
 #include "surf/surfxml_parse.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 
 #ifdef HAVE_LUA
-#include "bindings/lua/simgrid_lua.h"
-#include "bindings/lua/lua_state_cloner.h"
+#include "src/bindings/lua/simgrid_lua.h"
+#include "src/bindings/lua/lua_state_cloner.h"
 
 #include <lua.h>                /* Always include this when calling Lua */
 #include <lauxlib.h>            /* Always include this when calling Lua */

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index 82a3c66..55813c4 100644 (file)
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -15,7 +15,7 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/module.h"         /* xbt_binary_name */
-#include "xbt_modinter.h"       /* backtrace initialization headers */
+#include "src/xbt_modinter.h"       /* backtrace initialization headers */
 #ifdef HAVE_MC
 #define UNW_LOCAL_ONLY
 #include <libunwind.h>

diff --git a/src/xbt/cunit.c b/src/xbt/cunit.c
index 08f52bb..58e7fc7 100644 (file)
--- a/src/xbt/cunit.c
+++ b/src/xbt/cunit.c
@@ -8,7 +8,7 @@
 
 /* This is partially inspirated from the OSSP ts (Test Suite Library)       */
 
-#include "portable.h"
+#include "src/portable.h"
 
 #include "xbt/sysdep.h"         /* bvprintf */
 #include "xbt/cunit.h"

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 674b7b4..b486403 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -11,7 +11,7 @@
 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
 #include "xbt/str.h"
 #include "dict_private.h"
 

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index a54869f..c4438a5 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -45,13 +45,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "portable.h"           /* execinfo when available */
+#include "src/portable.h"           /* execinfo when available */
 #include "xbt/ex.h"
 #include "xbt/str.h"
 #include "xbt/synchro_core.h"
-#include "xbt_modinter.h"       /* backtrace initialization headers */
+#include "src/xbt_modinter.h"       /* backtrace initialization headers */
 
-#include "xbt/ex_interface.h"
+#include "src/xbt/ex_interface.h"
 #include "simgrid/sg_config.h"  /* Configuration mechanism of SimGrid */
 
 
@@ -124,11 +124,11 @@ void xbt_backtrace_display_current(void)
 }
 
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
-# include "backtrace_linux.c"
+# include "src/xbt/backtrace_linux.c"
 #elif (defined(_XBT_WIN32) && defined (_M_IX86)) && !defined(__GNUC__)
-# include "backtrace_windows.c"
+# include "src/xbt/backtrace_windows.c"
 #else
-# include "backtrace_dummy.c"
+# include "src/xbt/backtrace_dummy.c"
 #endif
 
 /** @brief shows an exception content and the associated stack if available */

diff --git a/src/xbt/fifo.c b/src/xbt/fifo.c
index b13b9e1..6647ae9 100644 (file)
--- a/src/xbt/fifo.c
+++ b/src/xbt/fifo.c
@@ -8,7 +8,7 @@
 #include "xbt/log.h"
 #include "xbt/mallocator.h"
 #include "fifo_private.h"
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_fifo, xbt, "FIFO");
 

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 002ca12..0ce0cd4 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -11,15 +11,15 @@
 #include <stdio.h>              /* snprintf */
 #include <stdlib.h>             /* snprintf */
 
-#include "portable.h"           /* to get a working stdarg.h */
+#include "src/portable.h"           /* to get a working stdarg.h */
 
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
 
 #include "xbt/misc.h"
 #include "xbt/ex.h"
 #include "xbt/str.h"
 #include "xbt/sysdep.h"
-#include "xbt/log_private.h"
+#include "src/xbt/log_private.h"
 #include "xbt/dynar.h"
 #include "xbt/xbt_os_thread.h"
 

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index aeaaeb9..e9e250f 100644 (file)
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -11,12 +11,12 @@
 
 #include <dlfcn.h>
 
-#include "../../mc/mc_base.h"
+#include "src/mc/mc_base.h"
 #include "mmprivate.h"
-#include "xbt_modinter.h"
-#include "internal_config.h"
+#include "src/xbt_modinter.h"
+#include "src/internal_config.h"
 #include <math.h>
-#include "../mc/mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 
 /* ***** Whether to use `mmalloc` of the undrlying malloc ***** */
 

diff --git a/src/xbt/mmalloc/mm_module.c b/src/xbt/mmalloc/mm_module.c
index 621ff10..8b9ebaa 100644 (file)
--- a/src/xbt/mmalloc/mm_module.c
+++ b/src/xbt/mmalloc/mm_module.c
@@ -36,7 +36,7 @@
 #endif
 #include "mmprivate.h"
 #include "xbt/ex.h"
-#include "xbt_modinter.h" /* declarations of mmalloc_preinit and friends that live here */
+#include "src/xbt_modinter.h" /* declarations of mmalloc_preinit and friends that live here */
 
 #ifndef SEEK_SET
 #define SEEK_SET 0

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 12441e7..63e45bc 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -17,7 +17,7 @@
 #include <xbt/base.h>
 #include <xbt/misc.h>
 
-#include "portable.h"
+#include "src/portable.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt/mmalloc.h"
 #include "xbt/ex.h"

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index b30d67d..6c0e7e7 100644 (file)
--- a/src/xbt/parmap.cpp
+++ b/src/xbt/parmap.cpp
@@ -6,7 +6,7 @@
 
 #include <atomic>
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -26,7 +26,7 @@
 #include "xbt/dynar.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt/sysdep.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_parmap, xbt, "parmap: parallel map");
 

diff --git a/src/xbt/setset.c b/src/xbt/setset.c
index 8dbf6ec..86781e2 100644 (file)
--- a/src/xbt/setset.c
+++ b/src/xbt/setset.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include "setset_private.h"
 #include "xbt/sysdep.h"
-#include "internal_config.h" /*_XBT_WIN32*/
+#include "src/internal_config.h" /*_XBT_WIN32*/
 
 /*The function ffs doesn't exist for windows*/
 #ifdef _XBT_WIN32

diff --git a/src/xbt/snprintf.c b/src/xbt/snprintf.c
index 92313a5..1122d7e 100644 (file)
--- a/src/xbt/snprintf.c
+++ b/src/xbt/snprintf.c
@@ -321,7 +321,7 @@
 #define LINUX_COMPATIBLE
 #endif
 
-#include "portable.h"           /* to get a working stdarg.h */
+#include "src/portable.h"           /* to get a working stdarg.h */
 
 #include <sys/types.h>
 #include <string.h>

diff --git a/src/xbt/xbt_log_appender_file.c b/src/xbt/xbt_log_appender_file.c
index 5342776..7033d6e 100644 (file)
--- a/src/xbt/xbt_log_appender_file.c
+++ b/src/xbt/xbt_log_appender_file.c
@@ -7,9 +7,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/sysdep.h"
-#include "xbt/log_private.h"
+#include "src/xbt/log_private.h"
 #ifdef HAVE_SMPI
-#include "smpi/private.h" // to access bench_begin/end. Not ultraclean, I confess
+#include "src/smpi/private.h" // to access bench_begin/end. Not ultraclean, I confess
 #endif
 #include <stdio.h>
 

diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c
index 3667667..4d08ca6 100644 (file)
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -6,12 +6,12 @@
 /* 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 "src/portable.h"       /* execinfo when available */
 #include "xbt/synchro_core.h"   /* xbt_thread_self_name */
-#include "xbt/ex_interface.h"
+#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>

diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c
index 174e343..988d374 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -8,12 +8,12 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/strbuff.h"        /* For dynamic version when the static one fails */
-#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>
-#include "portable.h"
+#include "src/portable.h"
 
 extern const char *xbt_log_priority_names[8];
 extern int xbt_log_no_loc;

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index e1a234f..9c718df 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -10,8 +10,8 @@
 
 #include "xbt/misc.h"
 #include "simgrid_config.h"     /* _XBT_WIN32 */
-#include "internal_config.h"    /* MMALLOC_WANT_OVERRIDE_LEGACY */
-#include "portable.h"
+#include "src/internal_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */
+#include "src/portable.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dynar.h"
@@ -19,7 +19,7 @@
 
 #include "xbt/module.h"         /* this module */
 
-#include "xbt_modinter.h"       /* prototype of other module's init/exit in XBT */
+#include "src/xbt_modinter.h"       /* prototype of other module's init/exit in XBT */
 
 #include "simgrid/sg_config.h"
 

diff --git a/src/xbt/xbt_os_file.c b/src/xbt/xbt_os_file.c
index 43c30bb..2083693 100644 (file)
--- a/src/xbt/xbt_os_file.c
+++ b/src/xbt/xbt_os_file.c
@@ -9,7 +9,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/file.h"    /* this module */
 #include "xbt/log.h"
-#include "portable.h"
+#include "src/portable.h"
 
 #ifndef _MSC_VER
 #include "libgen.h" /* POSIX dirname */

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index 91db34b..f7ed95e 100644 (file)
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -17,14 +17,14 @@
 #include <unistd.h>
 #endif
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "xbt/sysdep.h"
 #include "xbt/ex.h"
-#include "xbt/ex_interface.h"   /* We play crude games with exceptions */
-#include "portable.h"
+#include "src/xbt/ex_interface.h"   /* We play crude games with exceptions */
+#include "src/portable.h"
 #include "xbt/xbt_os_time.h"    /* Portable time facilities */
 #include "xbt/xbt_os_thread.h"  /* This module */
-#include "xbt_modinter.h"       /* Initialization/finalization of this module */
+#include "src/xbt_modinter.h"       /* Initialization/finalization of this module */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt,
                                 "Synchronization mechanism (OS-level)");

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index 8187da1..e617186 100644 (file)
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -9,7 +9,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/xbt_os_time.h"    /* this module */
 #include "xbt/log.h"
-#include "portable.h"
+#include "src/portable.h"
 #include <math.h>               /* floor */
 
 #ifdef _XBT_WIN32

diff --git a/src/xbt/xbt_replay.c b/src/xbt/xbt_replay.c
index 2802f52..b9eef79 100644 (file)
--- a/src/xbt/xbt_replay.c
+++ b/src/xbt/xbt_replay.c
@@ -4,7 +4,7 @@
 /* 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 "internal_config.h"
+#include "src/internal_config.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/str.h"

diff --git a/src/xbt/xbt_sg_stubs.c b/src/xbt/xbt_sg_stubs.c
index c8d83be..5935010 100644 (file)
--- a/src/xbt/xbt_sg_stubs.c
+++ b/src/xbt/xbt_sg_stubs.c
@@ -15,10 +15,10 @@
 /* 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_modinter.h"
+#include "src/xbt_modinter.h"
 #include "xbt/sysdep.h"
 #include "xbt/xbt_os_thread.h"
-#include "portable.h"           /* CONTEXT_THREADS */
+#include "src/portable.h"           /* CONTEXT_THREADS */
 
 #ifndef CONTEXT_THREADS
 #ifndef WIN32

diff --git a/src/xbt/xbt_str.c b/src/xbt/xbt_str.c
index 5943a11..c2384f1 100644 (file)
--- a/src/xbt/xbt_str.c
+++ b/src/xbt/xbt_str.c
@@ -6,7 +6,7 @@
 /* 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"
+#include "src/portable.h"
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
 #include "xbt/str.h"            /* headers of these functions */

diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp
index 383fbf5..91df00c 100644 (file)
--- a/teshsuite/mc/dwarf/dwarf.cpp
+++ b/teshsuite/mc/dwarf/dwarf.cpp
@@ -15,13 +15,13 @@
 #include <mc/mc.h>
 
 #include "mc/datatypes.h"
-#include "mc/mc_object_info.h"
-#include "mc/mc_private.h"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_private.h"
 
-#include "mc/Process.hpp"
-#include "mc/Type.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/Type.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 int test_some_array[4][5][6];
 struct some_struct { int first; int second[4][5]; } test_some_struct;

diff --git a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp b/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
index e9655c8..4a1b342 100644 (file)
--- a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
+++ b/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
@@ -12,13 +12,13 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "mc/mc_private.h"
-#include "mc/mc_object_info.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_object_info.h"
 
-#include "mc/Process.hpp"
-#include "mc/Type.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/Type.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 static simgrid::mc::Process* process;
 

diff --git a/teshsuite/simdag/platforms/Evaluate_get_route_time.c b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
index 7f303de..7bc2794 100644 (file)
--- a/teshsuite/simdag/platforms/Evaluate_get_route_time.c
+++ b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/simdag.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 #include "xbt/xbt_os_time.h"
 
 #define BILLION  1000000000L;

diff --git a/teshsuite/simdag/platforms/Evaluate_parse_time.c b/teshsuite/simdag/platforms/Evaluate_parse_time.c
index 82a4c22..33ea0cc 100644 (file)
--- a/teshsuite/simdag/platforms/Evaluate_parse_time.c
+++ b/teshsuite/simdag/platforms/Evaluate_parse_time.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/simdag.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 #include "xbt/xbt_os_time.h"
 
 extern routing_platf_t routing_platf;

diff --git a/teshsuite/simdag/platforms/basic_link_test.c b/teshsuite/simdag/platforms/basic_link_test.c
index f4943eb..04a3566 100644 (file)
--- a/teshsuite/simdag/platforms/basic_link_test.c
+++ b/teshsuite/simdag/platforms/basic_link_test.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/simdag.h"
-#include "surf/surf_private.h"
 #include "xbt/log.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic_link_test, sd,

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c
index f273c69..40ebac3 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/simdag.h"
-#include "surf/surf_private.h"
 
 int main(int argc, char **argv)
 {

diff --git a/teshsuite/simdag/platforms/basic_tracing.c b/teshsuite/simdag/platforms/basic_tracing.c
index 9eef8f1..006ab59 100644 (file)
--- a/teshsuite/simdag/platforms/basic_tracing.c
+++ b/teshsuite/simdag/platforms/basic_tracing.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "simgrid/msg.h"
-#include "surf/surf_private.h"
 
 int host(int argc, char *argv[]);
 

diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c
index 2fcac34..3115c3f 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.c
+++ b/teshsuite/simdag/platforms/flatifier.c
@@ -21,7 +21,7 @@
 #include "xbt/ex.h"
 #include "xbt/xbt_os_time.h"
 #include "surf/surf.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 
 static const char link_ctn_v2[] =  "link:ctn";
 static const char link_ctn_v3[] = "link_ctn";

diff --git a/teshsuite/simdag/platforms/is_router_test.c b/teshsuite/simdag/platforms/is_router_test.c
index b7622b4..49d05ce 100644 (file)
--- a/teshsuite/simdag/platforms/is_router_test.c
+++ b/teshsuite/simdag/platforms/is_router_test.c
@@ -6,8 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simgrid/simdag.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
 
 extern routing_platf_t routing_platf;
 

diff --git a/teshsuite/xbt/parmap_bench/parmap_bench.c b/teshsuite/xbt/parmap_bench/parmap_bench.c
index e6558bc..ed890de 100644 (file)
--- a/teshsuite/xbt/parmap_bench/parmap_bench.c
+++ b/teshsuite/xbt/parmap_bench/parmap_bench.c
@@ -9,7 +9,7 @@
 #include <xbt/dynar.h>
 #include <xbt/parmap.h>
 #include <xbt/sysdep.h>
-#include <internal_config.h>        /* HAVE_FUTEX_H */
+#include "src/internal_config.h"        /* HAVE_FUTEX_H */
 #include "simgrid/simix.h"
 #include "xbt/xbt_os_time.h"
 

diff --git a/teshsuite/xbt/parmap_test/parmap_test.c b/teshsuite/xbt/parmap_test/parmap_test.c
index f21e9f7..8337604 100644 (file)
--- a/teshsuite/xbt/parmap_test/parmap_test.c
+++ b/teshsuite/xbt/parmap_test/parmap_test.c
@@ -10,7 +10,7 @@
 #include "xbt.h"
 #include "xbt/ex.h"
 #include "xbt/xbt_os_time.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(parmap_test, "Test for parmap");