Index: uspace/lib/c/arch/abs32le/src/entry.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/entry.c	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/abs32le/src/entry.c	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -37,5 +37,4 @@
 {
 	__main(NULL);
-	__exit();
 }
 
Index: uspace/lib/c/arch/abs32le/src/thread_entry.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/thread_entry.c	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/abs32le/src/thread_entry.c	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -30,7 +30,4 @@
  */
 
-#include <unistd.h>
-#include <thread.h>
-
 void __thread_entry(void)
 {
Index: uspace/lib/c/arch/amd64/src/entry.s
===================================================================
--- uspace/lib/c/arch/amd64/src/entry.s	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/amd64/src/entry.s	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -47,4 +47,2 @@
 	# Pass PCB pointer to __main (no operation)
 	call __main
-
-	call __exit
Index: uspace/lib/c/arch/arm32/src/entry.s
===================================================================
--- uspace/lib/c/arch/arm32/src/entry.s	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/arm32/src/entry.s	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -42,5 +42,5 @@
 	ldr r0, =ras_page
 	str r2, [r0]
-
+	
 	#
 	# Create the first stack frame.
@@ -50,10 +50,8 @@
 	push {fp, ip, lr, pc}
 	sub fp, ip, #4
-
+	
 	# Pass pcb_ptr to __main as the first argument (in r0)
 	mov r0, r1
 	bl __main
-
-	bl __exit
 
 .data
@@ -62,3 +60,2 @@
 ras_page:
 	.long 0
-
Index: uspace/lib/c/arch/ia32/src/entry.s
===================================================================
--- uspace/lib/c/arch/ia32/src/entry.s	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/ia32/src/entry.s	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -46,5 +46,5 @@
 	mov %ax, %fs
 	# Do not set %gs, it contains descriptor that can see TLS
-
+	
 	# Detect the mechanism used for making syscalls
 	movl $(INTEL_CPUID_STANDARD), %eax
@@ -58,10 +58,8 @@
 	# Create the first stack frame.
 	#
-	pushl $0 
+	pushl $0
 	movl %esp, %ebp
-
+	
 	# Pass the PCB pointer to __main as the first argument
 	pushl %edi
 	call __main
-
-	call __exit
Index: uspace/lib/c/arch/ia64/src/entry.s
===================================================================
--- uspace/lib/c/arch/ia64/src/entry.s	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/ia64/src/entry.s	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -40,8 +40,6 @@
 	alloc loc0 = ar.pfs, 0, 1, 2, 0
 	movl gp = _gp
-
+	
 	# Pass PCB pointer as the first argument to __main
 	mov out0 = r2
 	br.call.sptk.many b0 = __main
-0:
-	br.call.sptk.many b0 = __exit
Index: uspace/lib/c/arch/mips32/src/entry.s
===================================================================
--- uspace/lib/c/arch/mips32/src/entry.s	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/mips32/src/entry.s	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -56,7 +56,4 @@
 	jal __main
 	nop
-	
-	jal __exit
-	nop
 .end
 
Index: uspace/lib/c/arch/ppc32/src/entry.s
===================================================================
--- uspace/lib/c/arch/ppc32/src/entry.s	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/ppc32/src/entry.s	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -44,9 +44,7 @@
 	stw %r3, 0(%r1)
 	stwu %r1, -16(%r1)
-
+	
 	# Pass the PCB pointer to __main() as the first argument.
 	# The first argument is passed in r3.
 	mr %r3, %r6
 	bl __main
-
-	bl __exit
Index: uspace/lib/c/arch/sparc64/src/entry.s
===================================================================
--- uspace/lib/c/arch/sparc64/src/entry.s	(revision e26a4633d919e99d0bcd5a697eea196163abc3cf)
+++ uspace/lib/c/arch/sparc64/src/entry.s	(revision 47b70062180b321b58ca43746901c748ff7a6b2d)
@@ -45,5 +45,5 @@
 	flushw
 	add %g0, -0x7ff, %fp
-
+	
 	# Pass pcb_ptr as the first argument to __main()
 	mov %i1, %o0
@@ -51,5 +51,2 @@
 	call __main
 	or %l7, %lo(_gp), %l7
-
-	call __exit
-	nop