Index: kernel/arch/ia32/src/pm.c
===================================================================
--- kernel/arch/ia32/src/pm.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
+++ kernel/arch/ia32/src/pm.c	(revision 99d6fd07a4e12eb667d2cfa2d3fdb3b5f63800b2)
@@ -113,5 +113,5 @@
 void tss_initialize(tss_t *t)
 {
-	memsetb(t, sizeof(struct tss), 0);
+	memsetb(t, sizeof(tss_t), 0);
 }
 
Index: kernel/arch/ia32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia32/src/proc/scheduler.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
+++ kernel/arch/ia32/src/proc/scheduler.c	(revision 99d6fd07a4e12eb667d2cfa2d3fdb3b5f63800b2)
@@ -60,12 +60,12 @@
 	uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE -
 	    SP_DELTA];
-
+	
 	/* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
 	write_msr(IA32_MSR_SYSENTER_ESP, kstk);
-
+	
 	/* Set kernel stack for CPL3 -> CPL0 switch via interrupt */
 	CPU->arch.tss->esp0 = kstk;
 	CPU->arch.tss->ss0 = gdtselector(KDATA_DES);
-
+	
 	/* Set up TLS in GS register */
 	set_tls_desc(THREAD->arch.tls);
Index: kernel/arch/ia32/src/smp/smp.c
===================================================================
--- kernel/arch/ia32/src/smp/smp.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
+++ kernel/arch/ia32/src/smp/smp.c	(revision 99d6fd07a4e12eb667d2cfa2d3fdb3b5f63800b2)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32	
+/** @addtogroup ia32
  * @{
  */
@@ -132,6 +132,6 @@
 
 	for (i = 0; i < ops->cpu_count(); i++) {
-		struct descriptor *gdt_new;
-	
+		descriptor_t *gdt_new;
+		
 		/*
 		 * Skip processors marked unusable.
@@ -160,12 +160,12 @@
 		 * the memory subsystem
 		 */
-		gdt_new = (struct descriptor *) malloc(GDT_ITEMS *
-		    sizeof(struct descriptor), FRAME_ATOMIC);
+		gdt_new = (descriptor_t *) malloc(GDT_ITEMS *
+		    sizeof(descriptor_t), FRAME_ATOMIC);
 		if (!gdt_new)
 			panic("Cannot allocate memory for GDT.");
 
-		memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(struct descriptor));
-		memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
-		protected_ap_gdtr.limit = GDT_ITEMS * sizeof(struct descriptor);
+		memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(descriptor_t));
+		memsetb(&gdt_new[TSS_DES], sizeof(descriptor_t), 0);
+		protected_ap_gdtr.limit = GDT_ITEMS * sizeof(descriptor_t);
 		protected_ap_gdtr.base = KA2PA((uintptr_t) gdt_new);
 		gdtr.base = (uintptr_t) gdt_new;