diff --git a/src/kaleid/common/common.h b/src/kaleid/common/common.h
index bc7a36f..45943dd 100644
--- a/src/kaleid/common/common.h
+++ b/src/kaleid/common/common.h
@@ -15,17 +15,17 @@
 #endif
 
 #if !defined(TRUE) && !defined(FALSE)
-#   define TRUE 1
-#   define FALSE 0
+#   define TRUE     (1)
+#   define FALSE    (0)
 #endif
 
 #ifdef _OSK_SOURCE
-#   define YES   1
-#   define NO    0
+#   define YES      (1)
+#   define NO       (0)
 #endif
 
 #ifndef NULL
-#   define NULL ((void*)0)
+#   define NULL ((void *)0)
 #endif
 
 #ifndef PACKED
@@ -42,7 +42,7 @@
 #endif
 
 #ifndef INITOK
-#   define INITOK 0xCAFEBABE
+#   define INITOK ((unsigned int)0xCAFEBABE)
 #endif
 
 #ifdef _KALEID_KERNEL