Index: generic/include/proc/task.h
===================================================================
--- generic/include/proc/task.h	(revision 9a8d91b75a1fd931c8f781ec517362f92ed670d3)
+++ generic/include/proc/task.h	(revision a6d4cebe4e2af4fd70f49dc2ffb18186d4447b4a)
@@ -36,4 +36,5 @@
 #include <ipc/ipc.h>
 #include <security/cap.h>
+#include <arch/proc/task.h>
 
 /** Task structure. */
@@ -51,4 +52,6 @@
 	phone_t phones[IPC_MAX_PHONES];
 	atomic_t active_calls;  /**< Active asynchronous messages */
+	
+	task_arch_t arch;
 };
 
Index: generic/include/proc/thread.h
===================================================================
--- generic/include/proc/thread.h	(revision 9a8d91b75a1fd931c8f781ec517362f92ed670d3)
+++ generic/include/proc/thread.h	(revision a6d4cebe4e2af4fd70f49dc2ffb18186d4447b4a)
@@ -30,5 +30,5 @@
 #define __THREAD_H__
 
-#include <arch/thread.h>
+#include <arch/proc/thread.h>
 #include <synch/spinlock.h>
 #include <arch/context.h>
@@ -118,5 +118,5 @@
 	__u32 tid;				/**< Thread ID. */
 	
-	ARCH_THREAD_DATA;			/**< Architecture-specific data. */
+	thread_arch_t arch;			/**< Architecture-specific data. */
 
 	__u8 *kstack;				/**< Thread's kernel stack. */