Index: kernel/arch/ia64/include/arch.h
===================================================================
--- kernel/arch/ia64/include/arch.h	(revision 9a5b556abb26634c82cbd3954b0fdb4db62b828e)
+++ kernel/arch/ia64/include/arch.h	(revision 34d9469e3b197174b8bbc9c194e03a69d4ef5c36)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup ia64	
+/** @addtogroup ia64	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ia64_ARCH_H__
-#define __ia64_ARCH_H__
+#ifndef KERN_ia64_ARCH_H_
+#define KERN_ia64_ARCH_H_
 
 #define LOADED_PROG_STACK_PAGES_NO 2
@@ -42,5 +42,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision 9a5b556abb26634c82cbd3954b0fdb4db62b828e)
+++ kernel/arch/ia64/src/interrupt.c	(revision 34d9469e3b197174b8bbc9c194e03a69d4ef5c36)
@@ -158,24 +158,24 @@
 
 	switch (istate->cr_isr.ge_code) {
-	    case GE_ILLEGALOP:
+	case GE_ILLEGALOP:
 		desc = "Illegal Operation fault";
 		break;
-	    case GE_PRIVOP:
+	case GE_PRIVOP:
 		desc = "Privileged Operation fault";
 		break;
-	    case GE_PRIVREG:
+	case GE_PRIVREG:
 		desc = "Privileged Register fault";
 		break;
-	    case GE_RESREGFLD:
+	case GE_RESREGFLD:
 		desc = "Reserved Register/Field fault";
 		break;
-	    case GE_DISBLDISTRAN:
+	case GE_DISBLDISTRAN:
 		desc = "Disabled Instruction Set Transition fault";
 		break;
-	    case GE_ILLEGALDEP:
+	case GE_ILLEGALDEP:
 		desc = "Illegal Dependency fault";
 		break;
-	    default:
-	    	desc = "unknown";
+	default:
+		desc = "unknown";
 		break;
 	}
@@ -186,6 +186,4 @@
 	panic("General Exception (%s)\n", desc);
 }
-
-void fpu_enable(void);
 
 void disabled_fp_register(uint64_t vector, istate_t *istate)
@@ -204,5 +202,4 @@
 {
 }
-
 
 
@@ -243,11 +240,11 @@
 
 	switch(ivr.vector) {
-	    case INTERRUPT_TIMER:
+	case INTERRUPT_TIMER:
 		it_interrupt();
-	    	break;
-	    case INTERRUPT_SPURIOUS:
+		break;
+	case INTERRUPT_SPURIOUS:
 	    	printf("cpu%d: spurious interrupt\n", CPU->id);
 		break;
-	    default:
+	default:
 		panic("\nUnhandled External Interrupt Vector %d\n", ivr.vector);
 		break;
@@ -255,12 +252,13 @@
 }
 
-void virtual_interrupt(uint64_t irq,void *param)
+void virtual_interrupt(uint64_t irq, void *param)
 {
 	switch(irq) {
-		case IRQ_KBD:
-			if(kbd_uspace) ipc_irq_send_notif(irq);
-			break;
-		default:
-			panic("\nUnhandled Virtual Interrupt request %d\n", irq);
+	case IRQ_KBD:
+		if (kbd_uspace)
+			ipc_irq_send_notif(irq);
+		break;
+	default:
+		panic("\nUnhandled Virtual Interrupt request %d\n", irq);
 		break;
 	}
@@ -270,6 +268,6 @@
 void irq_ipc_bind_arch(unative_t irq)
 {
-	if(irq==IRQ_KBD) {
-		kbd_uspace=1;
+	if(irq == IRQ_KBD) {
+		kbd_uspace = 1;
 		return;
 	}
@@ -281,3 +279,2 @@
 /** @}
  */
-