Index: uspace/lib/posix/include/posix/signal.h
===================================================================
--- uspace/lib/posix/include/posix/signal.h	(revision 06b0211b4ee03a6f5e22a538f727075215620bb6)
+++ uspace/lib/posix/include/posix/signal.h	(revision db3cef9f41ba1a15a45ea39c9e55155cf37ed463)
@@ -41,4 +41,5 @@
 
 #include "sys/types.h"
+#include <posix/ucontext.h>
 
 extern void __posix_default_signal_handler(int signo);
@@ -55,23 +56,4 @@
 #define SIG_IGN ((void (*)(int)) __posix_ignore_signal_handler)
 
-typedef int __POSIX_DEF__(sig_atomic_t);
-typedef uint32_t __POSIX_DEF__(sigset_t);
-typedef struct __POSIX_DEF__(mcontext) {
-	/* must not be empty to avoid compiler warnings (-pedantic) */
-	int dummy;
-} __POSIX_DEF__(mcontext_t);
-
-union __POSIX_DEF__(sigval) {
-	int sival_int;
-	void *sival_ptr;
-};
-
-struct __POSIX_DEF__(sigevent) {
-	int sigev_notify; /* Notification type. */
-	int sigev_signo; /* Signal number. */
-	union __POSIX_DEF__(sigval) sigev_value; /* Signal value. */
-	void (*sigev_notify_function)(union __POSIX_DEF__(sigval)); /* Notification function. */
-	__POSIX_DEF__(thread_attr_t) *sigev_notify_attributes; /* Notification attributes. */
-};
 
 typedef struct {
@@ -98,16 +80,4 @@
 };
 
-typedef struct {
-	void *ss_sp;
-	size_t ss_size;
-	int ss_flags;
-} __POSIX_DEF__(stack_t);
-
-typedef struct __POSIX_DEF__(ucontext) {
-	struct __POSIX_DEF__(ucontext) *uc_link;
-	__POSIX_DEF__(sigset_t) uc_sigmask;
-	__POSIX_DEF__(stack_t) uc_stack;
-	__POSIX_DEF__(mcontext_t) uc_mcontext;
-} __POSIX_DEF__(ucontext_t);
 
 /* Values of __POSIX_DEF__(sigevent)::sigev_notify */
Index: uspace/lib/posix/include/posix/ucontext.h
===================================================================
--- uspace/lib/posix/include/posix/ucontext.h	(revision db3cef9f41ba1a15a45ea39c9e55155cf37ed463)
+++ uspace/lib/posix/include/posix/ucontext.h	(revision db3cef9f41ba1a15a45ea39c9e55155cf37ed463)
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011 Jiri Zarevucky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libposix
+ * @{
+ */
+/** @file Userspace context handling.
+ */
+
+#ifndef POSIX_UCONTEXT_H_
+#define POSIX_UCONTEXT_H_
+
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
+
+#include "sys/types.h"
+
+typedef int __POSIX_DEF__(sig_atomic_t);
+typedef uint32_t __POSIX_DEF__(sigset_t);
+typedef struct __POSIX_DEF__(mcontext) {
+	/* must not be empty to avoid compiler warnings (-pedantic) */
+	int dummy;
+} __POSIX_DEF__(mcontext_t);
+
+union __POSIX_DEF__(sigval) {
+	int sival_int;
+	void *sival_ptr;
+};
+
+struct __POSIX_DEF__(sigevent) {
+	int sigev_notify; /* Notification type. */
+	int sigev_signo; /* Signal number. */
+	union __POSIX_DEF__(sigval) sigev_value; /* Signal value. */
+	void (*sigev_notify_function)(union __POSIX_DEF__(sigval)); /* Notification function. */
+	__POSIX_DEF__(thread_attr_t) *sigev_notify_attributes; /* Notification attributes. */
+};
+
+typedef struct {
+	void *ss_sp;
+	size_t ss_size;
+	int ss_flags;
+} __POSIX_DEF__(stack_t);
+
+typedef struct __POSIX_DEF__(ucontext) {
+	struct __POSIX_DEF__(ucontext) *uc_link;
+	__POSIX_DEF__(sigset_t) uc_sigmask;
+	__POSIX_DEF__(stack_t) uc_stack;
+	__POSIX_DEF__(mcontext_t) uc_mcontext;
+} __POSIX_DEF__(ucontext_t);
+
+
+#endif
+
+/** @}
+ */