diff --git a/tests/builtins/alloc.c b/tests/builtins/alloc.c
index 241a309e3336d2910dae5f5cac4a523228452f3e..983009cd568e406ee3aed4b6cb9490bc23062edc 100644
--- a/tests/builtins/alloc.c
+++ b/tests/builtins/alloc.c
@@ -5,7 +5,7 @@
 */
 
 
-#include "share/libc/stdlib.c"
+#include "stdlib.c"
 
 int *p,*q,*r,a,b;
 char *t,*u,*v;
diff --git a/tests/builtins/malloc_individual.c b/tests/builtins/malloc_individual.c
index 790ffba5e5b8e51afd50bc2b27c2eff238af28bc..bf5218700c9449bf9952365cb7f91c1ea1dcd839 100644
--- a/tests/builtins/malloc_individual.c
+++ b/tests/builtins/malloc_individual.c
@@ -2,7 +2,7 @@
    STDOPT: #"-eva-alloc-builtin fresh"
 */
 
-#include "share/libc/stdlib.c"
+#include "stdlib.c"
 
 int *p;
 int A,B,C;
diff --git a/tests/libc/fc_libc.c b/tests/libc/fc_libc.c
index 8563ea2a4ed32ecd4b801324bf86699058099f5f..7b1e11d5a7fca2ade7f3553ea51e6200046fbac5 100644
--- a/tests/libc/fc_libc.c
+++ b/tests/libc/fc_libc.c
@@ -22,7 +22,7 @@
 #define _POSIX_C_SOURCE 200112L
 #define _GNU_SOURCE 1
 
-#include "share/libc/__fc_runtime.c"
+#include "__fc_runtime.c"
 
 #include "alloca.h"
 #include "arpa/inet.h"
diff --git a/tests/rte/divmod.c b/tests/rte/divmod.c
index 8920e6031b5d6ec0e499e820761caa45754db400..13d9737ece5480dad993959c2eb136eecb831545 100644
--- a/tests/rte/divmod.c
+++ b/tests/rte/divmod.c
@@ -2,7 +2,7 @@
    OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32 -journal-disable
 */
 
-#include "share/libc/limits.h"
+#include "limits.h"
 
 
 int main() {
diff --git a/tests/rte/divmod_typedef.c b/tests/rte/divmod_typedef.c
index 3fd9e3f6bebfc22865fd21bc529abf5caf18791f..d3c6b330e52951b1c3354e94ea756efdcf1e8d9b 100644
--- a/tests/rte/divmod_typedef.c
+++ b/tests/rte/divmod_typedef.c
@@ -2,7 +2,7 @@
    OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32 -journal-disable
 */
 
-#include "share/libc/limits.h"
+#include "limits.h"
 
 typedef int tint;
 typedef unsigned int tuint;
diff --git a/tests/saveload/bool.c b/tests/saveload/bool.c
index 8b313889c4bb740461194736e696f5ec1b0807cf..f90635c4440b48bc7fdd4446bd6f9adadd8a22a6 100644
--- a/tests/saveload/bool.c
+++ b/tests/saveload/bool.c
@@ -5,7 +5,7 @@
  */
 
 #include "stdbool.h"
-#include "share/libc/stdio.h"
+#include "stdio.h"
 
 bool x;
 int y;
diff --git a/tests/slicing/adpcm.c b/tests/slicing/adpcm.c
index db74838ea8cc62ee290af5b976c9bd3f1b65d405..a3efe43e78c4a5e1416afd4fcae84f65229c0037 100644
--- a/tests/slicing/adpcm.c
+++ b/tests/slicing/adpcm.c
@@ -4,4 +4,4 @@
    OPT: @EVA_OPTIONS@ -machdep x86_32 -ulevel -1 -deps -slicing-level 2 -journal-disable
 */
 
-#include "tests/test/adpcm.c"
+#include "../test/adpcm.c"
diff --git a/tests/slicing/min_call.c b/tests/slicing/min_call.c
index 3f5ef7299a4fef9e747966c520b17c0e93534465..5e833483762d7496d8e66d6b48b4d2f4faf700bf 100644
--- a/tests/slicing/min_call.c
+++ b/tests/slicing/min_call.c
@@ -7,4 +7,4 @@
 /* dummy source file in order to test minimal calls feature
  * on select_return.i  */
 
-#include "tests/slicing/select_return.i"
+#include "select_return.i"
diff --git a/tests/slicing/select_simple.c b/tests/slicing/select_simple.c
index 7846ecbe2ca7cfbd9f302b1664ae2da7908ebd90..de81f2fc724128d61174270a1dfdb78987911e02 100644
--- a/tests/slicing/select_simple.c
+++ b/tests/slicing/select_simple.c
@@ -6,4 +6,4 @@
 
 /* dummy source file in order to test select_simple.ml */
 
-#include "tests/slicing/simple_intra_slice.i"
+#include "simple_intra_slice.i"
diff --git a/tests/spec/acsl_basic_allocator.c b/tests/spec/acsl_basic_allocator.c
index 577f211c7e1807f133e5474800f5d32fcff3b72a..1a0c0b714c7fd2f59d9b676d807e26e8c6dabeef 100644
--- a/tests/spec/acsl_basic_allocator.c
+++ b/tests/spec/acsl_basic_allocator.c
@@ -8,7 +8,7 @@
 /* This file presents the basic version of the allocator.                    */
 /*****************************************************************************/
 
-#include "share/libc/stdlib.h"
+#include "stdlib.h"
 
 #define DEFAULT_BLOCK_SIZE 1000
 
diff --git a/tests/spec/axiom_included.c b/tests/spec/axiom_included.c
index 5e3448567abd8fd3479d736698eb6463b95926c4..f10f0a86488cc7f2bbc3043c1c26b394fd13eab5 100644
--- a/tests/spec/axiom_included.c
+++ b/tests/spec/axiom_included.c
@@ -2,4 +2,4 @@
    STDOPT: +"tests/spec/axiom_included_1.c"
 */
 
-#include "tests/spec/axiom_included.h"
+#include "axiom_included.h"
diff --git a/tests/spec/axiom_included_1.c b/tests/spec/axiom_included_1.c
index 52d482b1ca50e2f29c7c228a6f6653b2ee8772a5..5ae91cf678f5195b398f0906bb5687a2bd21a80f 100644
--- a/tests/spec/axiom_included_1.c
+++ b/tests/spec/axiom_included_1.c
@@ -2,4 +2,4 @@
    DONTRUN: main test is in axiom_included.c
 */
 
-#include "tests/spec/axiom_included.h"
+#include "axiom_included.h"
diff --git a/tests/spec/merge_bts938.c b/tests/spec/merge_bts938.c
index 433a2ae65586d9a5231e4b813e083df574d7aaf2..895091f24348f18b115f4553e2652261a9b88725 100644
--- a/tests/spec/merge_bts938.c
+++ b/tests/spec/merge_bts938.c
@@ -2,7 +2,7 @@
    STDOPT: +"tests/spec/merge_bts938_1.c"
 */
 
-#include "tests/spec/merge_bts938.h"
+#include "merge_bts938.h"
 
 //@ ensures test:\true;
 int main(void) { }
diff --git a/tests/spec/merge_bts938_1.c b/tests/spec/merge_bts938_1.c
index f5dec063b930f9594db2b81ea2a59ff085b4f3fe..46f93726de1b799701efd8243ee277d20941be6b 100644
--- a/tests/spec/merge_bts938_1.c
+++ b/tests/spec/merge_bts938_1.c
@@ -2,7 +2,7 @@
    DONTRUN: main test is merge_bts938.c
 */
 
-#include "tests/spec/merge_bts938.h"
+#include "merge_bts938.h"
 
 //@ ensures test1: \true;
 int main(void);
diff --git a/tests/spec/model1.c b/tests/spec/model1.c
index e5256808de69420779b5fa3525d59ff7eebd86f0..cbb6027b55c34e9aaa0690a0f30a82363be509a8 100644
--- a/tests/spec/model1.c
+++ b/tests/spec/model1.c
@@ -2,7 +2,7 @@
 STDOPT: +"tests/spec/model2.c"
 */
 
-#include "tests/spec/model1.h"
+#include "model1.h"
 
 void main () {
   struct S s;
diff --git a/tests/spec/model2.c b/tests/spec/model2.c
index 0a9e2fbce9837b769e4850a08b8f867e19350bf5..afe511b2750c30f6352f6ddb62b78e604d69284b 100644
--- a/tests/spec/model2.c
+++ b/tests/spec/model2.c
@@ -2,7 +2,7 @@
 DONTRUN: main test is in tests/spec/model1.c
 */
 
-#include "tests/spec/model1.h"
+#include "model1.h"
 
 struct S { int bar; };
 
diff --git a/tests/spec/purse.c b/tests/spec/purse.c
index 2d444b25ee4a8baabc067e2bab89ad0fb8bc025d..fdef9a9ee1a3887037f60a5fa4eb9265e6b03622 100644
--- a/tests/spec/purse.c
+++ b/tests/spec/purse.c
@@ -21,7 +21,7 @@
 /*  (enclosed in the file GPL).                                           */
 /*                                                                        */
 /**************************************************************************/
-#include "share/libc/stdlib.h"
+#include "stdlib.h"
 typedef struct purse {
   int balance;
 } purse;
diff --git a/tests/spec/use.c b/tests/spec/use.c
index a8d49aefc95dad014ff2b5d84e9f8e1e3200c361..2cb544a89d28c33aa3b3a8f31c7e6dd4814a18a9 100644
--- a/tests/spec/use.c
+++ b/tests/spec/use.c
@@ -4,7 +4,7 @@
 
 // BTS 0887
 
-#include "tests/spec/dec.h"
+#include "dec.h"
 
 //@ ensures X > 0 ; ensures F(1) > 0 ;
 void f(void) {}
diff --git a/tests/spec/use2.c b/tests/spec/use2.c
index 92d815717ef2c02a550725430d744739acf246b4..b58d1bc30c2589deefc074b7ee5f8a7e975bca88 100644
--- a/tests/spec/use2.c
+++ b/tests/spec/use2.c
@@ -2,7 +2,7 @@
    DONTRUN: main test is in use.c
 */
 
-#include "tests/spec/dec.h"
+#include "dec.h"
 
 //@ ensures X > 0 ; ensures F(1)>0 ;
 void g(void) {}
diff --git a/tests/spec/volatile.c b/tests/spec/volatile.c
index c675ca21a02008d16a2b2594fffcae19f848930b..d01a2689624af10118c6328ebe2104f6c707d071 100644
--- a/tests/spec/volatile.c
+++ b/tests/spec/volatile.c
@@ -2,7 +2,7 @@
    OPT: tests/spec/volatile_aux.c -print -copy
 */
 
-#include "tests/spec/volatile.h"
+#include "volatile.h"
 
 //@volatile x,y writes w ;
 //@volatile y,z reads r writes w; // partially KO: y already has a writes
diff --git a/tests/spec/volatile_aux.c b/tests/spec/volatile_aux.c
index b980903e0ba8416f43f84f81df699624780ddafa..901606d6525a843b77b3394d3ff1d193305607da 100644
--- a/tests/spec/volatile_aux.c
+++ b/tests/spec/volatile_aux.c
@@ -2,7 +2,7 @@
    DONTRUN: main test file is volatile.c
 */
 
-#include "tests/spec/volatile.h"
+#include "volatile.h"
 
 int f (int x) {
   x++;
diff --git "a/tests/syntax/foo\".c" "b/tests/syntax/foo\".c"
index fa4ba0ab9ae9b4f51247cc78b369db0154bdfa9a..5933f9603a0e136d34c0680af6714d936839eaa5 100644
--- "a/tests/syntax/foo\".c"
+++ "b/tests/syntax/foo\".c"
@@ -1,4 +1,4 @@
-#include "share/libc/assert.h"
+#include "assert.h"
 
 int test = 1;
 
diff --git a/tests/syntax/gcc_builtins.c b/tests/syntax/gcc_builtins.c
index d6ff8e598a2c634f393708eab6643d1200c7bdae..00a9054c8b191a212b70e1b5000c4b710c4984ae 100644
--- a/tests/syntax/gcc_builtins.c
+++ b/tests/syntax/gcc_builtins.c
@@ -2,7 +2,7 @@
    STDOPT: +"-machdep gcc_x86_32"
  */
 
-#include "share/libc/stdint.h"
+#include "stdint.h"
 
 #define likely(x)  __builtin_expect((x),1)
 #define unlikely(x)  __builtin_expect((x),0)
diff --git a/tests/syntax/offsetof.c b/tests/syntax/offsetof.c
index 06a79ecae3b9f960d5824f81c79f950d653634f1..1d378d9b65851455bf52e29dfa15c9a06e94f378 100644
--- a/tests/syntax/offsetof.c
+++ b/tests/syntax/offsetof.c
@@ -1,4 +1,4 @@
-#include "share/libc/stddef.h"
+#include "stddef.h"
 
 struct c {char ca;};
 void main(void) {
diff --git a/tests/syntax/typedef_multi_1.c b/tests/syntax/typedef_multi_1.c
index 37f3f89dbf588ced4590c9bb1c4a08bb7fc77178..3749c3f6e498d3498b09ade7dafbcca304d89e90 100644
--- a/tests/syntax/typedef_multi_1.c
+++ b/tests/syntax/typedef_multi_1.c
@@ -3,6 +3,6 @@
    OPT: -no-autoload-plugins tests/syntax/typedef_multi_2.c
 */
 
-#include "tests/syntax/typedef_multi.h"
+#include "typedef_multi.h"
 
 void f () {  while(x<y) x++; }
diff --git a/tests/syntax/typedef_multi_2.c b/tests/syntax/typedef_multi_2.c
index 3186ebf41169ddaf27f40b274dd238e3ed990dc1..97f9547151e0df7d66409784e26a6487e6c0f082 100644
--- a/tests/syntax/typedef_multi_2.c
+++ b/tests/syntax/typedef_multi_2.c
@@ -2,7 +2,7 @@
 DONTRUN: main test is at tests/syntax/typedef_multi_1.c
 */
 
-#include "tests/syntax/typedef_multi.h"
+#include "typedef_multi.h"
 
 void g() { 
   /*@ loop invariant x<=(3+2); */ 
diff --git a/tests/value/abstract_struct_1.c b/tests/value/abstract_struct_1.c
index ccc737e525a0b5ae85217e983ea5e078f6b9080b..c764cc4dbbdecd2a85578be37e23df9397bb3415 100644
--- a/tests/value/abstract_struct_1.c
+++ b/tests/value/abstract_struct_1.c
@@ -1,7 +1,7 @@
 /* run.config*
    STDOPT: #"tests/value/abstract_struct_2.c -lib-entry -eva-msg-key initial-state"
 */
-#include "share/libc/stdlib.h"
+#include "stdlib.h"
 
 struct abstracttype;
 struct something {
diff --git a/tests/value/wide_string.c b/tests/value/wide_string.c
index bf27d1585cf474a2ee7dc565ee8beb030c0f780c..75a975feaec078898583c80c613aa76312ee8422 100644
--- a/tests/value/wide_string.c
+++ b/tests/value/wide_string.c
@@ -1,4 +1,4 @@
-#include "share/libc/stddef.h"
+#include "stddef.h"
 
 int main(volatile int v) {