Index: kernel/arch/ia32/src/boot/multiboot.S
===================================================================
--- kernel/arch/ia32/src/boot/multiboot.S	(revision 8844e7075a44097c359d1ef79350efa377c39ec5)
+++ kernel/arch/ia32/src/boot/multiboot.S	(revision 57c2a87b03a0b6c08cef4f64f0cf52a7d8b38b62)
@@ -35,4 +35,5 @@
 #include <genarch/multiboot/multiboot.h>
 #include <arch/cpuid.h>
+#include <arch/cpu.h>
 
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
@@ -166,6 +167,6 @@
 	/* Paging features */
 	movl %cr4, %ecx
-	orl $(1 << 4), %ecx      /* PSE on */
-	andl $(~(1 << 5)), %ecx  /* PAE off */
+	orl $CR4_PSE, %ecx	/* PSE on */
+	andl $~CR4_PAE, %ecx	/* PAE off */
 	movl %ecx, %cr4
 	
@@ -191,5 +192,5 @@
 	
 	movl %cr0, %ebx
-	orl $(1 << 31), %ebx  /* paging on */
+	orl $CR0_PG, %ebx	/* paging on */
 	movl %ebx, %cr0
 	ret
@@ -205,5 +206,5 @@
 	/* Paging features */
 	movl %cr4, %ecx
-	andl $(~(1 << 5)), %ecx  /* PAE off */
+	andl $~CR4_PAE, %ecx  /* PAE off */
 	movl %ecx, %cr4
 	
@@ -277,5 +278,5 @@
 		
 		movl %cr0, %ebx
-		orl $(1 << 31), %ebx  /* paging on */
+		orl $CR0_PG, %ebx  /* paging on */
 		movl %ebx, %cr0
 		
Index: kernel/arch/ia32/src/boot/vesa_real.inc
===================================================================
--- kernel/arch/ia32/src/boot/vesa_real.inc	(revision 8844e7075a44097c359d1ef79350efa377c39ec5)
+++ kernel/arch/ia32/src/boot/vesa_real.inc	(revision 57c2a87b03a0b6c08cef4f64f0cf52a7d8b38b62)
@@ -49,5 +49,5 @@
 vesa_init_real:
 	mov %cr0, %eax
-	and $~1, %eax
+	and $~CR0_PE, %eax
 	mov %eax, %cr0
 	
@@ -352,5 +352,5 @@
 		
 			mov %cr0, %ecx
-			or $1, %ecx
+			or $CR0_PE, %ecx
 			mov %ecx, %cr0