Index: kernel/arch/ia32/include/mm/page.h
===================================================================
--- kernel/arch/ia32/include/mm/page.h	(revision b63f856913cad6bf9a61c703c32a10ba508f18a2)
+++ kernel/arch/ia32/include/mm/page.h	(revision eda8b8b798466f2e78a0f083d263fcbaf0bbd615)
@@ -129,4 +129,6 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
 /* Page fault error codes. */
Index: kernel/arch/ia32/include/smp/apic.h
===================================================================
--- kernel/arch/ia32/include/smp/apic.h	(revision b63f856913cad6bf9a61c703c32a10ba508f18a2)
+++ kernel/arch/ia32/include/smp/apic.h	(revision eda8b8b798466f2e78a0f083d263fcbaf0bbd615)
@@ -106,6 +106,6 @@
 
 /** Interrupt Command Register. */
-#define ICRlo		(0x300/sizeof(uint32_t))
-#define ICRhi		(0x310/sizeof(uint32_t))
+#define ICRlo		(0x300 / sizeof(uint32_t))
+#define ICRhi		(0x310 / sizeof(uint32_t))
 typedef struct {
 	union {
@@ -134,8 +134,8 @@
 
 /* End Of Interrupt. */
-#define EOI		(0x0b0/sizeof(uint32_t))
+#define EOI		(0x0b0 / sizeof(uint32_t))
 
 /** Error Status Register. */
-#define ESR		(0x280/sizeof(uint32_t))
+#define ESR		(0x280 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -155,5 +155,5 @@
 
 /* Task Priority Register */
-#define TPR		(0x080/sizeof(uint32_t))
+#define TPR		(0x080 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -165,5 +165,5 @@
 
 /** Spurious-Interrupt Vector Register. */
-#define SVR		(0x0f0/sizeof(uint32_t))
+#define SVR		(0x0f0 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -177,5 +177,5 @@
 
 /** Time Divide Configuration Register. */
-#define TDCR		(0x3e0/sizeof(uint32_t))
+#define TDCR		(0x3e0 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -187,11 +187,11 @@
 
 /* Initial Count Register for Timer */
-#define ICRT		(0x380/sizeof(uint32_t))
+#define ICRT		(0x380 / sizeof(uint32_t))
 
 /* Current Count Register for Timer */
-#define CCRT		(0x390/sizeof(uint32_t))
+#define CCRT		(0x390 / sizeof(uint32_t))
 
 /** LVT Timer register. */
-#define LVT_Tm		(0x320/sizeof(uint32_t))
+#define LVT_Tm		(0x320 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -208,6 +208,6 @@
 
 /** LVT LINT registers. */
-#define LVT_LINT0	(0x350/sizeof(uint32_t))
-#define LVT_LINT1	(0x360/sizeof(uint32_t))
+#define LVT_LINT0	(0x350 / sizeof(uint32_t))
+#define LVT_LINT1	(0x360 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -226,5 +226,5 @@
 
 /** LVT Error register. */
-#define LVT_Err		(0x370/sizeof(uint32_t))
+#define LVT_Err		(0x370 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -240,5 +240,5 @@
 
 /** Local APIC ID Register. */
-#define L_APIC_ID	(0x020/sizeof(uint32_t))
+#define L_APIC_ID	(0x020 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -250,12 +250,12 @@
 
 /** Local APIC Version Register */
-#define LAVR		(0x030/sizeof(uint32_t))
+#define LAVR		(0x030 / sizeof(uint32_t))
 #define LAVR_Mask	0xff
-#define is_local_apic(x)	(((x)&LAVR_Mask&0xf0)==0x1)
-#define is_82489DX_apic(x)	((((x)&LAVR_Mask&0xf0)==0x0))
-#define is_local_xapic(x)	(((x)&LAVR_Mask)==0x14)
+#define is_local_apic(x)	(((x) & LAVR_Mask & 0xf0) == 0x1)
+#define is_82489DX_apic(x)	((((x) & LAVR_Mask & 0xf0) == 0x0))
+#define is_local_xapic(x)	(((x) & LAVR_Mask) == 0x14)
 
 /** Logical Destination Register. */
-#define  LDR		(0x0d0/sizeof(uint32_t))
+#define  LDR		(0x0d0 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -267,5 +267,5 @@
 
 /** Destination Format Register. */
-#define DFR		(0x0e0/sizeof(uint32_t))
+#define DFR		(0x0e0 / sizeof(uint32_t))
 typedef union {
 	uint32_t value;
@@ -277,6 +277,6 @@
 
 /* IO APIC */
-#define IOREGSEL	(0x00/sizeof(uint32_t))
-#define IOWIN		(0x10/sizeof(uint32_t))
+#define IOREGSEL	(0x00 / sizeof(uint32_t))
+#define IOWIN		(0x10 / sizeof(uint32_t))
 
 #define IOAPICID	0x00
Index: kernel/arch/ia32/src/debug/panic.s
===================================================================
--- kernel/arch/ia32/src/debug/panic.s	(revision b63f856913cad6bf9a61c703c32a10ba508f18a2)
+++ kernel/arch/ia32/src/debug/panic.s	(revision eda8b8b798466f2e78a0f083d263fcbaf0bbd615)
@@ -31,4 +31,4 @@
 
 panic_printf:
-	movl $halt,(%esp)	# fake stack to make printf return to halt
+	movl $halt, (%esp)	# fake stack to make printf return to halt
 	jmp printf