diff --git a/headers/posix/signal.h b/headers/posix/signal.h
index d56cf2edfa..6b9da3d6c5 100644
--- a/headers/posix/signal.h
+++ b/headers/posix/signal.h
@@ -351,14 +351,4 @@ typedef struct vregs vregs;
 #include __HAIKU_ARCH_HEADER(signal.h)
 
 
-typedef struct vregs mcontext_t;
-
-typedef struct __ucontext_t {
-	struct __ucontext_t*	uc_link;
-	sigset_t				uc_sigmask;
-	stack_t					uc_stack;
-	mcontext_t				uc_mcontext;
-} ucontext_t;
-
-
 #endif /* _SIGNAL_H_ */
diff --git a/headers/posix/sys/ucontext.h b/headers/posix/sys/ucontext.h
new file mode 100644
index 0000000000..52ae543f82
--- /dev/null
+++ b/headers/posix/sys/ucontext.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _UCONTEXT_H_
+#define _UCONTEXT_H_
+
+
+typedef struct vregs mcontext_t;
+
+typedef struct __ucontext_t {
+	struct __ucontext_t*	uc_link;
+	sigset_t				uc_sigmask;
+	stack_t					uc_stack;
+	mcontext_t				uc_mcontext;
+} ucontext_t;
+
+
+#endif
diff --git a/headers/private/kernel/ksignal.h b/headers/private/kernel/ksignal.h
index 4727053c8d..55d756df32 100644
--- a/headers/private/kernel/ksignal.h
+++ b/headers/private/kernel/ksignal.h
@@ -17,6 +17,7 @@
 #include <heap.h>
 #include <util/DoublyLinkedList.h>
 #include <util/KernelReferenceable.h>
+#include <sys/ucontext.h>
 
 
 namespace BKernel {
diff --git a/headers/private/kernel/thread_types.h b/headers/private/kernel/thread_types.h
index bfa1ad1004..ef2ba672c3 100644
--- a/headers/private/kernel/thread_types.h
+++ b/headers/private/kernel/thread_types.h
@@ -25,6 +25,7 @@
 #include <util/DoublyLinkedList.h>
 #include <util/KernelReferenceable.h>
 #include <util/list.h>
+#include <sys/ucontext.h>
 
 
 enum additional_thread_state {