diff --git a/src/bin/coreutils/lib/Jamfile b/src/bin/coreutils/lib/Jamfile
index 969f9eae95..2120a97587 100644
--- a/src/bin/coreutils/lib/Jamfile
+++ b/src/bin/coreutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src bin coreutils6 lib ;
+SubDir HAIKU_TOP src bin coreutils lib ;
 
 # filter warnings we don't want here
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
diff --git a/src/bin/coreutils/lib/fcntl.h b/src/bin/coreutils/lib/fcntl.h
index 017e0f728d..f9810c0b97 100644
--- a/src/bin/coreutils/lib/fcntl.h
+++ b/src/bin/coreutils/lib/fcntl.h
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "///boot/home/svnhaiku/trunk/headers/posix/fcntl.h"
+#include_next "fcntl.h"
 
 #if !defined O_DIRECT && defined O_DIRECTIO
 /* Tru64 spells it `O_DIRECTIO'.  */
diff --git a/src/bin/coreutils/lib/inttypes.h b/src/bin/coreutils/lib/inttypes.h
index db3dfe270a..30f1aecc70 100644
--- a/src/bin/coreutils/lib/inttypes.h
+++ b/src/bin/coreutils/lib/inttypes.h
@@ -22,7 +22,7 @@
    which in turn includes this file.  */
 #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
 # if 1
-#  include "///boot/home/svnhaiku/trunk/headers/posix/inttypes.h"
+#  include_next "inttypes.h"
 # endif
 #endif
 
diff --git a/src/bin/coreutils/lib/stdint.h b/src/bin/coreutils/lib/stdint.h
index 798afcc283..3987ca17f0 100644
--- a/src/bin/coreutils/lib/stdint.h
+++ b/src/bin/coreutils/lib/stdint.h
@@ -44,7 +44,7 @@
      Include it before <inttypes.h>, since any "#include <stdint.h>"
      in <inttypes.h> would reinclude us, skipping our contents because
      _GL_STDINT_H is defined.  */
-# include "///boot/home/svnhaiku/trunk/headers/posix/stdint.h"
+# include_next "stdint.h"
 #endif
 
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
diff --git a/src/bin/coreutils/lib/sys/stat.h b/src/bin/coreutils/lib/sys/stat.h
index 978b6c59b8..a178ece601 100644
--- a/src/bin/coreutils/lib/sys/stat.h
+++ b/src/bin/coreutils/lib/sys/stat.h
@@ -24,7 +24,7 @@
 /* This file is supposed to be used on platforms where <sys/stat.h> is
    incomplete.  It is intended to provide definitions and prototypes
    needed by an application.  Start with what the system provides.  */
-#include "///boot/home/svnhaiku/trunk/headers/posix/sys/stat.h"
+#include_next "sys/stat.h"
 
 #ifndef S_IFMT
 # define S_IFMT 0170000