9 files changed, 20 insertions, 34 deletions
diff --git a/testsuite/tests/asmcomp/mainarith.c b/testsuite/tests/asmcomp/mainarith.c
index d102c16dc..94ff371e3 100644
--- a/testsuite/tests/asmcomp/mainarith.c
+++ b/testsuite/tests/asmcomp/mainarith.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../../byterun/config.h"
+#include "../../../byterun/caml/config.h"
 #define FMT ARCH_INTNAT_PRINTF_FORMAT
 
 void caml_ml_array_bound_error(void)
diff --git a/testsuite/tests/basic-manyargs/manyargsprim.c b/testsuite/tests/basic-manyargs/manyargsprim.c
index 65e9cf5eb..55fbc2e03 100644
--- a/testsuite/tests/basic-manyargs/manyargsprim.c
+++ b/testsuite/tests/basic-manyargs/manyargsprim.c
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-#include "mlvalues.h"
+#include "caml/mlvalues.h"
 #include "stdio.h"
 
 value manyargs(value a, value b, value c, value d, value e, value f,
diff --git a/testsuite/tests/callback/callbackprim.c b/testsuite/tests/callback/callbackprim.c
index f3c598110..71a123d18 100644
--- a/testsuite/tests/callback/callbackprim.c
+++ b/testsuite/tests/callback/callbackprim.c
@@ -10,9 +10,9 @@
 /*                                                                     */
 /***********************************************************************/
 
-#include "mlvalues.h"
-#include "memory.h"
-#include "callback.h"
+#include "caml/mlvalues.h"
+#include "caml/memory.h"
+#include "caml/callback.h"
 
 value mycallback1(value fun, value arg)
 {
diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile
index a8de4dc00..3d8661d9b 100644
--- a/testsuite/tests/embedded/Makefile
+++ b/testsuite/tests/embedded/Makefile
@@ -18,16 +18,12 @@ default:
 	$(MAKE) run
 
 .PHONY: compile
-compile: caml
-	@$(OCAMLC) -ccopt -I -ccopt . cmstub.c
-	@$(OCAMLC) -ccopt -I -ccopt . cmmain.c
+compile:
+	@$(OCAMLC) -ccopt -I -ccopt $(TOPDIR)/byterun/caml cmstub.c
+	@$(OCAMLC) -ccopt -I -ccopt $(TOPDIR)/byterun/caml cmmain.c
 	@$(OCAMLC) -c cmcaml.ml
 	@$(OCAMLC) -custom -o program cmstub.$(O) cmcaml.cmo cmmain.$(O)
 
-caml:
-	@mkdir -p caml || :
-	@cp -f $(TOPDIR)/byterun/*.h caml/
-
 .PHONY: run
 run:
 	@printf " ... testing 'cmmain':"
@@ -41,6 +37,5 @@ promote: defaultpromote
 .PHONY: clean
 clean: defaultclean
 	@rm -f *.result program
-	@rm -rf caml
 
 include $(BASEDIR)/makefiles/Makefile.common
diff --git a/testsuite/tests/gc-roots/globrootsprim.c b/testsuite/tests/gc-roots/globrootsprim.c
index f7bb32cea..5c540acf5 100644
--- a/testsuite/tests/gc-roots/globrootsprim.c
+++ b/testsuite/tests/gc-roots/globrootsprim.c
@@ -13,10 +13,10 @@
 
 /* For testing global root registration */
 
-#include "mlvalues.h"
-#include "memory.h"
-#include "alloc.h"
-#include "gc.h"
+#include "caml/mlvalues.h"
+#include "caml/memory.h"
+#include "caml/alloc.h"
+#include "caml/gc.h"
 
 struct block { value header; value v; };
 
diff --git a/testsuite/tests/lib-bigarray-2/bigarrfstub.c b/testsuite/tests/lib-bigarray-2/bigarrfstub.c
index 354082848..728729874 100644
--- a/testsuite/tests/lib-bigarray-2/bigarrfstub.c
+++ b/testsuite/tests/lib-bigarray-2/bigarrfstub.c
@@ -11,7 +11,7 @@
 /***********************************************************************/
 
 #include <stdio.h>
-#include <mlvalues.h>
+#include <caml/mlvalues.h>
 #include <bigarray.h>
 
 extern void filltab_(void);
diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile
index 832e367ee..edda6c625 100644
--- a/testsuite/tests/lib-dynlink-bytecode/Makefile
+++ b/testsuite/tests/lib-dynlink-bytecode/Makefile
@@ -24,10 +24,10 @@ default:
 	fi
 
 .PHONY: compile
-compile: caml
+compile:
 	@$(OCAMLC) -c registry.ml
 	@for file in stub*.c; do \
-	  $(OCAMLC) -ccopt -I -ccopt . -c $$file; \
+	  $(OCAMLC) -ccopt -I -ccopt $(TOPDIR)/byterun/caml -c $$file; \
 	  $(OCAMLMKLIB) -o `echo $$file | sed -e 's/stub/plug/' -e 's/\.c//'` \
 	                `basename $$file c`$(O); \
 	done
@@ -43,10 +43,6 @@ compile: caml
 	@$(OCAMLC) -o custom$(EXE) -custom -linkall registry.cmo plug2.cma \
 	           plug1.cma -I .
 
-caml:
-	@mkdir -p caml || :
-	@cp -f $(TOPDIR)/byterun/*.h caml/
-
 .PHONY: run
 run:
 	@printf " ... testing 'main'"
@@ -70,6 +66,5 @@ promote: defaultpromote
 .PHONY: clean
 clean: defaultclean
 	@rm -f main static custom custom.exe *.result marshal.data
-	@rm -rf caml
 
 include $(BASEDIR)/makefiles/Makefile.common
diff --git a/testsuite/tests/lib-dynlink-native/Makefile b/testsuite/tests/lib-dynlink-native/Makefile
index f4f9d0994..f27438c29 100644
--- a/testsuite/tests/lib-dynlink-native/Makefile
+++ b/testsuite/tests/lib-dynlink-native/Makefile
@@ -102,14 +102,11 @@ mypack.cmx: packed1.cmx
 mylib.cmxa: plugin.cmx plugin2.cmx
 	@$(OCAMLOPT) $(COMPFLAGS) -a -o mylib.cmxa plugin.cmx plugin2.cmx
 
-factorial.$(O): factorial.c caml
-	@$(OCAMLOPT) -c -ccopt "$(SHAREDCCCOMPOPTS)" -ccopt -I -ccopt . \
+factorial.$(O): factorial.c
+	@$(OCAMLOPT) -c -ccopt "$(SHAREDCCCOMPOPTS)" -ccopt -I \
+	             -ccopt $(TOPDIR)/byterun/caml \
 	             factorial.c
 
-caml:
-	@mkdir -p caml || :
-	@cp $(TOPDIR)/byterun/*.h caml/
-
 .PHONY: promote
 promote:
 	@cp result reference
@@ -120,6 +117,5 @@ clean: defaultclean
 	@rm -f *.a *.lib
 	@rm -f sub/*.so sub/*.o sub/*.cm* sub/*.s sub/*.asm sub/*.obj
 	@rm -f marshal.data
-	@rm -rf caml
 
 include $(BASEDIR)/makefiles/Makefile.common
diff --git a/testsuite/tests/lib-marshal/intextaux.c b/testsuite/tests/lib-marshal/intextaux.c
index 924b896e5..03688462d 100644
--- a/testsuite/tests/lib-marshal/intextaux.c
+++ b/testsuite/tests/lib-marshal/intextaux.c
@@ -10,8 +10,8 @@
 /*                                                                     */
 /***********************************************************************/
 
-#include <mlvalues.h>
-#include <intext.h>
+#include <caml/mlvalues.h>
+#include <caml/intext.h>
 
 value marshal_to_block(value vbuf, value vlen, value v, value vflags)
 {