Index: kernel/generic/include/mm/frame.h
===================================================================
--- kernel/generic/include/mm/frame.h	(revision f47fd19f9885f194c0b816b7814357789c9565e2)
+++ kernel/generic/include/mm/frame.h	(revision 32fffef00aa36a7913892cc0d7ff6eff828b2e7e)
@@ -28,5 +28,5 @@
  */
 
- /** @addtogroup genericmm
+/** @addtogroup genericmm
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef __FRAME_H__
-#define __FRAME_H__
+#ifndef KERN_FRAME_H_
+#define KERN_FRAME_H_
 
 #include <arch/types.h>
@@ -62,8 +62,4 @@
 #define FRAME_NO_RECLAIM        0x4     /* do not start reclaiming when no free memory */
 
-#define FRAME_OK		0	/* frame_alloc return status */
-#define FRAME_NO_MEMORY		1	/* frame_alloc return status */
-#define FRAME_ERROR		2	/* frame_alloc return status */
-
 static inline uintptr_t PFN2ADDR(pfn_t frame)
 {
@@ -89,5 +85,5 @@
 #define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame)	(((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
 
-#define frame_alloc(order, flags)				frame_alloc_generic(order, flags, NULL)
+#define frame_alloc(order, flags)		frame_alloc_generic(order, flags, NULL)
 
 extern void frame_init(void);
@@ -112,5 +108,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision f47fd19f9885f194c0b816b7814357789c9565e2)
+++ kernel/generic/include/proc/thread.h	(revision 32fffef00aa36a7913892cc0d7ff6eff828b2e7e)
@@ -53,5 +53,5 @@
 #define THREAD_STACK_SIZE	STACK_SIZE
 
-/**< Thread states. */
+/** Thread states. */
 enum state {
 	Invalid,	/**< It is an error, if thread is found in this state. */
@@ -66,5 +66,5 @@
 extern char *thread_states[];
 
-/**< Join types. */
+/** Join types. */
 typedef enum {
 	None,
@@ -73,6 +73,8 @@
 } thread_join_type_t;
 
-#define X_WIRED		(1<<0)
-#define X_STOLEN	(1<<1)
+/* Thread flags */
+#define THREAD_FLAG_WIRED	(1<<0)	/**< Thread cannot be migrated to another CPU. */
+#define THREAD_FLAG_STOLEN	(1<<1)	/**< Thread was migrated to another CPU and has not run yet. */
+#define THREAD_FLAG_USPACE	(1<<2)	/**< Thread executes in userspace. */
 
 #define THREAD_NAME_BUFLEN	20
@@ -128,5 +130,5 @@
 	 * Defined only if thread doesn't run.
 	 * It means that fpu context is in CPU that last time executes this thread.
-	 * This disables migration
+	 * This disables migration.
 	 */
 	int fpu_context_engaged;
@@ -150,5 +152,5 @@
 	thread_arch_t arch;			/**< Architecture-specific data. */
 
-	uint8_t *kstack;				/**< Thread's kernel stack. */
+	uint8_t *kstack;			/**< Thread's kernel stack. */
 };
 
@@ -171,4 +173,10 @@
 extern void thread_create_arch(thread_t *t);
 #endif
+#ifndef thr_constructor_arch
+extern void thr_constructor_arch(thread_t *t);
+#endif
+#ifndef thr_destructor_arch
+extern void thr_destructor_arch(thread_t *t);
+#endif
 
 extern void thread_sleep(uint32_t sec);