Index: kernel/generic/include/interrupt.h
===================================================================
--- kernel/generic/include/interrupt.h	(revision 5b303ba8e7efb335494bc24c0a00abcab475cc09)
+++ kernel/generic/include/interrupt.h	(revision 7e5897971c2ec9ea1f833d1f148bc179a7abf5a7)
@@ -49,5 +49,5 @@
 { \
 	if (istate_from_uspace(istate)) { \
-		klog_printf("Task %lld killed due to an exception at %p.", TASK->taskid, istate_get_pc(istate)); \
+		klog_printf("Task %llu killed due to an exception at %p.", TASK->taskid, istate_get_pc(istate)); \
 		klog_printf("  " cmd, ##__VA_ARGS__); \
 		task_kill(TASK->taskid); \
Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 5b303ba8e7efb335494bc24c0a00abcab475cc09)
+++ kernel/generic/include/proc/task.h	(revision 7e5897971c2ec9ea1f833d1f148bc179a7abf5a7)
@@ -91,8 +91,8 @@
 	 * certain extent.
 	 */
-	atomic_t active_calls;  
+	atomic_t active_calls;
 	
 	/** Architecture specific task data. */
-	task_arch_t arch;	
+	task_arch_t arch;
 	
 	/**
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 5b303ba8e7efb335494bc24c0a00abcab475cc09)
+++ kernel/generic/include/proc/thread.h	(revision 7e5897971c2ec9ea1f833d1f148bc179a7abf5a7)
@@ -194,5 +194,5 @@
 	int priority;
 	/** Thread ID. */
-	uint32_t tid;
+	thread_id_t tid;
 	
 	/** Architecture-specific data. */
@@ -249,7 +249,7 @@
 
 /* Thread syscall prototypes. */
-unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name);
-unative_t sys_thread_exit(int uspace_status);
-unative_t sys_thread_get_id(void);
+extern unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name, thread_id_t *uspace_thread_id);
+extern unative_t sys_thread_exit(int uspace_status);
+extern unative_t sys_thread_get_id(thread_id_t *uspace_thread_id);
 
 #endif