diff --git a/src/kernel/libroot/libroot.c b/src/kernel/libroot/libroot.c
index c0fc0fff5d..28b050496b 100755
--- a/src/kernel/libroot/libroot.c
+++ b/src/kernel/libroot/libroot.c
@@ -76,7 +76,7 @@ ssize_t	port_count(port_id port)
 { return sys_port_count(port); }
 
 // OK
-int set_port_owner(port_id port, team_id team) 
+status_t set_port_owner(port_id port, team_id team) 
 { return sys_port_set_owner(port, team); }
 
 // OK
@@ -137,7 +137,7 @@ status_t	_get_sem_info(sem_id sem, sem_info *info, size_t size)
 { return sys_get_sem_info(sem,info, size); }
 
 // OK
-int _get_next_sem_info(team_id team, int32 *cookie, sem_info *info, size_t size)
+status_t _get_next_sem_info(team_id team, int32 *cookie, sem_info *info, size_t size)
 { return sys_get_next_sem_info(team,cookie,info, size); }
 
 // TO DO
diff --git a/src/kernel/libroot/libroot_types.h b/src/kernel/libroot/libroot_types.h
index afe97959d9..fc1dee3368 100755
--- a/src/kernel/libroot/libroot_types.h
+++ b/src/kernel/libroot/libroot_types.h
@@ -1,11 +1,7 @@
 #ifndef _LIBROOT_TYPES_H
 #define _LIBROOT_TYPES_H
 
-#ifdef __cplusplus
- "C" {
-#endif
-#include <types.h>
-#include <ktypes.h>
+#include <sys/types.h>
 #include <defines.h>
 
 #define B_NO_LOCK			0	
@@ -37,7 +33,7 @@ enum {
 #define	B_URGENT_PRIORITY					110
 #define B_REAL_TIME_PRIORITY				120
 
-  thread_id spawn_thread (
+thread_id spawn_thread (
 	thread_func		function_name, 
 	const char 		*thread_name, 
 	int32			priority, 
@@ -206,8 +202,5 @@ struct {
 	} regs; 
 } cpuid_info;
 #endif
-#ifdef __cplusplus
-}
-#endif
 
 #endif		/* ifdef _LIBROOT_TYPES_ */