diff --git a/headers/posix/signal.h b/headers/posix/signal.h
index 6b9da3d6c5..d56cf2edfa 100644
--- a/headers/posix/signal.h
+++ b/headers/posix/signal.h
@@ -351,4 +351,14 @@ 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
deleted file mode 100644
index 52ae543f82..0000000000
--- a/headers/posix/sys/ucontext.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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 55d756df32..4727053c8d 100644
--- a/headers/private/kernel/ksignal.h
+++ b/headers/private/kernel/ksignal.h
@@ -17,7 +17,6 @@
 #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 ef2ba672c3..bfa1ad1004 100644
--- a/headers/private/kernel/thread_types.h
+++ b/headers/private/kernel/thread_types.h
@@ -25,7 +25,6 @@
 #include <util/DoublyLinkedList.h>
 #include <util/KernelReferenceable.h>
 #include <util/list.h>
-#include <sys/ucontext.h>
 
 
 enum additional_thread_state {