diff --git a/src/kernel/Jamfile b/src/kernel/Jamfile
index dfbdc83e5a..1ae734ec83 100644
--- a/src/kernel/Jamfile
+++ b/src/kernel/Jamfile
@@ -121,8 +121,6 @@ KernelLd kernel
 	<$(SOURCE_GRIST)!core>thread.o 
 	<$(SOURCE_GRIST)!core>timer.o
 
-	linkhack.so
-
 	libbus.a
 	libfs.a
 	libvm.a
@@ -168,8 +166,6 @@ KernelLd kernel.so
 	<$(SOURCE_GRIST)!core>thread.o 
 	<$(SOURCE_GRIST)!core>timer.o
 
-	linkhack.so
-
 	libbus.a
 	libfs.a
 	libvm.a
@@ -268,8 +264,6 @@ KernelStaticLibraryObjects libc.a :
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>rand.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>random.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>realpath.o
-	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoq.o
-	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtouq.o
 
 	<$(SOURCE_GRIST)!libroot!posix!string>memchr.o
 	<$(SOURCE_GRIST)!libroot!posix!string>memcmp.o
@@ -415,8 +409,6 @@ KernelLd libroot.so :
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>rand.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>random.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>realpath.o
-	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoq.o
-	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtouq.o
 
 	<$(SOURCE_GRIST)!libroot!posix!string>memchr.o
 	<$(SOURCE_GRIST)!libroot!posix!string>memcmp.o
diff --git a/src/kernel/core/Jamfile b/src/kernel/core/Jamfile
index 6de473162c..79ee837449 100644
--- a/src/kernel/core/Jamfile
+++ b/src/kernel/core/Jamfile
@@ -13,7 +13,6 @@ KernelObjects
 	<$(SOURCE_GRIST)>heap.c 
 	<$(SOURCE_GRIST)>int.c 
 	<$(SOURCE_GRIST)>khash.c 
-	<$(SOURCE_GRIST)>linkhack.c 
 	<$(SOURCE_GRIST)>lock.c 
 	<$(SOURCE_GRIST)>main.c 
 	<$(SOURCE_GRIST)>misc.c 
@@ -34,12 +33,6 @@ KernelObjects
 	-fno-pic -D_KERNEL_MODE
 	;
 
-KernelLd linkhack.so :
-	<$(SOURCE_GRIST)>linkhack.o
-	:
-	:
-	-shared -Bdynamic
-	;
 
 SubInclude OBOS_TOP src kernel core addons ;
 SubInclude OBOS_TOP src kernel core arch ;
diff --git a/src/kernel/libroot/posix/stdlib/Jamfile b/src/kernel/libroot/posix/stdlib/Jamfile
index 77a6b4e216..d3cf1b5df0 100644
--- a/src/kernel/libroot/posix/stdlib/Jamfile
+++ b/src/kernel/libroot/posix/stdlib/Jamfile
@@ -16,8 +16,6 @@ KernelObjects
 	<$(SOURCE_GRIST)>rand.c 
 	<$(SOURCE_GRIST)>random.c
 	<$(SOURCE_GRIST)>realpath.c
-	<$(SOURCE_GRIST)>strtoq.c
-	<$(SOURCE_GRIST)>strtouq.c
 	:
 	-fPIC -DPIC
 	;