diff --git a/sortix/clock.cpp b/sortix/clock.cpp
index b596be5d..461efc8d 100644
--- a/sortix/clock.cpp
+++ b/sortix/clock.cpp
@@ -29,11 +29,10 @@
 #include <sortix/kernel/clock.h>
 #include <sortix/kernel/interrupt.h>
 #include <sortix/kernel/kthread.h>
+#include <sortix/kernel/signal.h>
 #include <sortix/kernel/timer.h>
 #include <sortix/kernel/worker.h>
 
-#include "signal.h"
-
 namespace Sortix {
 
 Clock::Clock()
diff --git a/sortix/signal.h b/sortix/include/sortix/kernel/signal.h
similarity index 90%
rename from sortix/signal.h
rename to sortix/include/sortix/kernel/signal.h
index c56f7c9a..a70d4f00 100644
--- a/sortix/signal.h
+++ b/sortix/include/sortix/kernel/signal.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
+    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
 
     This file is part of Sortix.
 
@@ -17,13 +17,13 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    signal.h
+    sortix/kernel/signal.h
     Classes and functions making it easier to handle Unix signals.
 
 *******************************************************************************/
 
-#ifndef SORTIX_SIGNAL_H
-#define SORTIX_SIGNAL_H
+#ifndef INCLUDE_SORTIX_KERNEL_SIGNAL_H
+#define INCLUDE_SORTIX_KERNEL_SIGNAL_H
 
 #include <sortix/signal.h>
 
@@ -59,6 +59,7 @@ void Return(CPU::InterruptRegisters* regs, void* user = NULL);
 inline bool IsPending() { return asm_signal_is_pending != 0; }
 
 } // namespace Signal
+
 } // namespace Sortix
 
 #endif
diff --git a/sortix/interrupt.cpp b/sortix/interrupt.cpp
index d2645a0b..d128d664 100644
--- a/sortix/interrupt.cpp
+++ b/sortix/interrupt.cpp
@@ -26,6 +26,7 @@
 #include <sortix/kernel/syscall.h>
 #include <sortix/kernel/interrupt.h>
 #include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/signal.h>
 
 #include <assert.h>
 #include <errno.h>
@@ -33,7 +34,6 @@
 
 #include "x86-family/idt.h"
 #include "calltrace.h"
-#include "signal.h"
 #include "process.h"
 
 #include "sound.h" // Hack for SIGSEGV
diff --git a/sortix/kernel.cpp b/sortix/kernel.cpp
index 15b569a3..ef2ef80d 100644
--- a/sortix/kernel.cpp
+++ b/sortix/kernel.cpp
@@ -48,6 +48,7 @@
 #include <sortix/kernel/fcache.h>
 #include <sortix/kernel/string.h>
 #include <sortix/kernel/user-timer.h>
+#include <sortix/kernel/signal.h>
 
 #include <sortix/fcntl.h>
 #include <sortix/stat.h>
@@ -64,7 +65,6 @@
 #include "multiboot.h"
 #include "thread.h"
 #include "process.h"
-#include "signal.h"
 #include "alarm.h"
 #include "ata.h"
 #include "com.h"
diff --git a/sortix/kthread.cpp b/sortix/kthread.cpp
index 0036cf42..1e2ee989 100644
--- a/sortix/kthread.cpp
+++ b/sortix/kthread.cpp
@@ -22,14 +22,14 @@
 
 *******************************************************************************/
 
+#include <sortix/signal.h>
+
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/worker.h>
 #include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/signal.h>
 
-#include <sortix/signal.h>
-
-#include "signal.h"
 #include "thread.h"
 
 namespace Sortix {
diff --git a/sortix/pipe.cpp b/sortix/pipe.cpp
index f075e5bd..667fed64 100644
--- a/sortix/pipe.cpp
+++ b/sortix/pipe.cpp
@@ -44,6 +44,7 @@
 #include <sortix/kernel/syscall.h>
 #include <sortix/kernel/pipe.h>
 #include <sortix/kernel/poll.h>
+#include <sortix/kernel/signal.h>
 
 #include <sortix/signal.h>
 #include <sortix/stat.h>
@@ -52,7 +53,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "signal.h"
 #include "thread.h"
 #include "process.h"
 #include "pipe.h"
diff --git a/sortix/scheduler.cpp b/sortix/scheduler.cpp
index 5a08ec6b..e507fc31 100644
--- a/sortix/scheduler.cpp
+++ b/sortix/scheduler.cpp
@@ -38,12 +38,12 @@
 #include <sortix/kernel/interrupt.h>
 #include <sortix/kernel/time.h>
 #include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/signal.h>
 
 #include "x86-family/gdt.h"
 #include "x86-family/float.h"
 #include "thread.h"
 #include "process.h"
-#include "signal.h"
 
 namespace Sortix {
 namespace Scheduler {
diff --git a/sortix/signal.cpp b/sortix/signal.cpp
index eb680a46..3e917ee6 100644
--- a/sortix/signal.cpp
+++ b/sortix/signal.cpp
@@ -22,17 +22,17 @@
 
 *******************************************************************************/
 
+#include <sortix/signal.h>
+
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/panic.h>
 #include <sortix/kernel/interrupt.h>
-
-#include <sortix/signal.h>
+#include <sortix/kernel/signal.h>
 
 #include <assert.h>
 #include <string.h>
 
 #include "thread.h"
-#include "signal.h"
 
 namespace Sortix {
 
diff --git a/sortix/thread.h b/sortix/thread.h
index 04a87976..4384e2a9 100644
--- a/sortix/thread.h
+++ b/sortix/thread.h
@@ -28,8 +28,7 @@
 #include <sortix/signal.h>
 
 #include <sortix/kernel/scheduler.h>
-
-#include "signal.h"
+#include <sortix/kernel/signal.h>
 
 typedef struct multiboot_info multiboot_info_t;