diff --git a/kaleid/include/base/assert.h b/kaleid/include/base/assert.h
index 97fadac..3f962bd 100644
--- a/kaleid/include/base/assert.h
+++ b/kaleid/include/base/assert.h
@@ -84,16 +84,6 @@ noreturn void __assert_handler(const char *, const char *, int, const char *);
 //
 #define KalAssert KalAlwaysAssert
 
-#ifndef _OSK_SOURCE
-
-// When not building for OS/K, use the system's assert
-#include <assert.h>
-
-#undef KalAlwaysAssert
-#define KalAlwaysAssert assert
-
-#endif
-
 //------------------------------------------//
 //           When not debugging             //
 //------------------------------------------//
diff --git a/kaleid/include/kernel/base.h b/kaleid/include/kernel/base.h
index f951a42..f8bdf6e 100644
--- a/kaleid/include/kernel/base.h
+++ b/kaleid/include/kernel/base.h
@@ -60,7 +60,6 @@ typedef enum TermColor_t        TermColor_t;
 
 // Get Process_t structure of current CPU
 #define GetCurCPU() (cpuTable[_GetCurCPU()])
-#define PANICSTR_SIZE 1024
 
 //------------------------------------------//
 
@@ -72,9 +71,6 @@ struct Processor_t
     // CPU number, index in CPU list
     int             index;
 
-    // Panic string
-    char            panicStr[PANICSTR_SIZE];
-
     // Number of ticks since boot time
     ulong          ticks;
 
diff --git a/kaleid/include/kernel/panic.h b/kaleid/include/kernel/panic.h
index ac80e6e..cdb53be 100644
--- a/kaleid/include/kernel/panic.h
+++ b/kaleid/include/kernel/panic.h
@@ -31,7 +31,8 @@
 
 //------------------------------------------//
 
-extern volatile char *PanicStr;
+#define PANICSTR_SIZE 1024
+extern volatile char PanicStr[PANICSTR_SIZE];
 
 //------------------------------------------//