2 files changed, 27 insertions, 25 deletions
diff --git a/otherlibs/threads/.depend b/otherlibs/threads/.depend
index 3a6c7f02b..ad7fef4be 100644
--- a/otherlibs/threads/.depend
+++ b/otherlibs/threads/.depend
@@ -1,14 +1,16 @@
-scheduler.o: scheduler.c ../../byterun/alloc.h \
-  ../../byterun/compatibility.h ../../byterun/misc.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/backtrace.h ../../byterun/callback.h \
-  ../../byterun/config.h ../../byterun/fail.h ../../byterun/io.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/misc.h \
-  ../../byterun/mlvalues.h ../../byterun/printexc.h ../../byterun/roots.h \
-  ../../byterun/memory.h ../../byterun/signals.h ../../byterun/stacks.h \
-  ../../byterun/sys.h
+scheduler.o: scheduler.c ../../byterun/caml/alloc.h \
+ ../../byterun/caml/compatibility.h ../../byterun/caml/misc.h \
+ ../../byterun/caml/config.h ../../byterun/caml/../../config/m.h \
+ ../../byterun/caml/../../config/s.h ../../byterun/caml/mlvalues.h \
+ ../../byterun/caml/backtrace.h ../../byterun/caml/callback.h \
+ ../../byterun/caml/config.h ../../byterun/caml/fail.h \
+ ../../byterun/caml/io.h ../../byterun/caml/memory.h \
+ ../../byterun/caml/gc.h ../../byterun/caml/major_gc.h \
+ ../../byterun/caml/freelist.h ../../byterun/caml/minor_gc.h \
+ ../../byterun/caml/misc.h ../../byterun/caml/mlvalues.h \
+ ../../byterun/caml/printexc.h ../../byterun/caml/roots.h \
+ ../../byterun/caml/memory.h ../../byterun/caml/signals.h \
+ ../../byterun/caml/stacks.h ../../byterun/caml/sys.h
 condition.cmi : mutex.cmi
 event.cmi :
 mutex.cmi :
diff --git a/otherlibs/threads/scheduler.c b/otherlibs/threads/scheduler.c
index 45ef854db..585a89030 100644
--- a/otherlibs/threads/scheduler.c
+++ b/otherlibs/threads/scheduler.c
@@ -17,20 +17,20 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "alloc.h"
-#include "backtrace.h"
-#include "callback.h"
-#include "config.h"
-#include "fail.h"
-#include "io.h"
-#include "memory.h"
-#include "misc.h"
-#include "mlvalues.h"
-#include "printexc.h"
-#include "roots.h"
-#include "signals.h"
-#include "stacks.h"
-#include "sys.h"
+#include "caml/alloc.h"
+#include "caml/backtrace.h"
+#include "caml/callback.h"
+#include "caml/config.h"
+#include "caml/fail.h"
+#include "caml/io.h"
+#include "caml/memory.h"
+#include "caml/misc.h"
+#include "caml/mlvalues.h"
+#include "caml/printexc.h"
+#include "caml/roots.h"
+#include "caml/signals.h"
+#include "caml/stacks.h"
+#include "caml/sys.h"
 
 #if ! (defined(HAS_SELECT) && \
        defined(HAS_SETITIMER) && \