Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ HelenOS.config	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -70,8 +70,8 @@
 @ "pentium4" Pentium 4
 @ "pentium3" Pentium 3
-@ "i486" i486
 @ "core" Core Solo/Duo
 @ "athlon_xp" Athlon XP
 @ "athlon_mp" Athlon MP
+@ "i486" i486
 ! [PLATFORM=ia32] PROCESSOR (choice)
 
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ kernel/arch/ia32/Makefile.inc	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -44,4 +44,8 @@
 #
 
+ifeq ($(PROCESSOR),i486)
+	CMN2 = -march=i486
+endif
+
 ifeq ($(PROCESSOR),athlon_xp)
 	CMN2 = -march=athlon-xp
@@ -62,8 +66,4 @@
 	CMN2 = -march=pentium4
 	SUNCC_CFLAGS += -xarch=sse2
-endif
-
-ifeq ($(PROCESSOR),i486)
-	CMN2 = -march=i486
 endif
 
Index: kernel/arch/ia32/include/asm.h
===================================================================
--- kernel/arch/ia32/include/asm.h	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ kernel/arch/ia32/include/asm.h	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -312,4 +312,5 @@
 
 #ifndef PROCESSOR_i486
+
 /** Write to MSR */
 NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
@@ -336,5 +337,6 @@
 	return ((uint64_t) dx << 32) | ax;
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 
Index: kernel/arch/ia32/src/asm.S
===================================================================
--- kernel/arch/ia32/src/asm.S	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ kernel/arch/ia32/src/asm.S	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -407,6 +407,6 @@
 #ifdef PROCESSOR_i486
 	jz 0f
-	movl %eax, %ebp
-0:
+		movl %eax, %ebp
+	0:
 #else
 	cmovnzl %eax, %ebp
Index: kernel/arch/ia32/src/syscall.c
===================================================================
--- kernel/arch/ia32/src/syscall.c	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ kernel/arch/ia32/src/syscall.c	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -40,4 +40,5 @@
 
 #ifndef PROCESSOR_i486
+
 /** Enable & setup support for SYSENTER/SYSEXIT */
 void syscall_setup_cpu(void)
@@ -50,5 +51,6 @@
 	write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 /** @}
Index: uspace/lib/c/arch/ia32/Makefile.common
===================================================================
--- uspace/lib/c/arch/ia32/Makefile.common	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ uspace/lib/c/arch/ia32/Makefile.common	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -28,8 +28,9 @@
 
 CLANG_ARCH = i386
+
 ifeq ($(PROCESSOR),i486)
-GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer
+	GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer
 else
-GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
+	GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
 endif
 
Index: uspace/lib/c/arch/ia32/src/entry.S
===================================================================
--- uspace/lib/c/arch/ia32/src/entry.S	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ uspace/lib/c/arch/ia32/src/entry.S	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -46,5 +46,5 @@
 	mov %ax, %fs
 	# Do not set %gs, it contains descriptor that can see TLS
-
+	
 #ifndef PROCESSOR_i486	
 	# Detect the mechanism used for making syscalls
@@ -53,8 +53,9 @@
 	bt $(INTEL_SEP), %edx
 	jnc 0f
-	leal __syscall_fast_func, %eax
-	movl $__syscall_fast, (%eax)
-0:
+		leal __syscall_fast_func, %eax
+		movl $__syscall_fast, (%eax)
+	0:
 #endif
+	
 	#
 	# Create the first stack frame.
Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ uspace/lib/c/generic/async.c	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -98,4 +98,5 @@
 #include <ipc/ipc.h>
 #include <async.h>
+#include "private/async.h"
 #undef LIBC_ASYNC_C_
 
@@ -113,5 +114,4 @@
 #include <stdlib.h>
 #include <macros.h>
-#include "private/async.h"
 
 #define CLIENT_HASH_TABLE_BUCKETS  32
Index: uspace/lib/c/generic/async_obsolete.c
===================================================================
--- uspace/lib/c/generic/async_obsolete.c	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ uspace/lib/c/generic/async_obsolete.c	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -38,4 +38,5 @@
 #include <async.h>
 #include <async_obsolete.h>
+#include "private/async.h"
 #undef LIBC_ASYNC_C_
 #undef LIBC_ASYNC_OBSOLETE_C_
@@ -44,5 +45,4 @@
 #include <malloc.h>
 #include <errno.h>
-#include "private/async.h"
 
 /** Send message and return id of the sent message.
Index: uspace/lib/c/generic/private/async.h
===================================================================
--- uspace/lib/c/generic/private/async.h	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ uspace/lib/c/generic/private/async.h	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -36,9 +36,52 @@
 #define LIBC_PRIVATE_ASYNC_H_
 
-#include <ipc/common.h>
+#include <async.h>
 #include <adt/list.h>
 #include <fibril.h>
+#include <fibril_synch.h>
 #include <sys/time.h>
 #include <bool.h>
+
+/** Session data */
+struct _async_sess {
+	/** List of inactive exchanges */
+	list_t exch_list;
+	
+	/** Exchange management style */
+	exch_mgmt_t mgmt;
+	
+	/** Session identification */
+	int phone;
+	
+	/** First clone connection argument */
+	sysarg_t arg1;
+	
+	/** Second clone connection argument */
+	sysarg_t arg2;
+	
+	/** Third clone connection argument */
+	sysarg_t arg3;
+	
+	/** Exchange mutex */
+	fibril_mutex_t mutex;
+	
+	/** Number of opened exchanges */
+	atomic_t refcnt;
+};
+
+/** Exchange data */
+struct _async_exch {
+	/** Link into list of inactive exchanges */
+	link_t sess_link;
+	
+	/** Link into global list of inactive exchanges */
+	link_t global_link;
+	
+	/** Session pointer */
+	async_sess_t *sess;
+	
+	/** Exchange identification */
+	int phone;
+};
 
 /** Structures of this type are used to track the timeout events. */
Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision ab34cc996f19066bcba82ddd7e2ec4967374ee4b)
+++ uspace/lib/c/include/async.h	(revision 7b2a7ad2d18b562e1cc4e78a77043cc16945474a)
@@ -42,5 +42,4 @@
 #include <ipc/common.h>
 #include <fibril.h>
-#include <fibril_synch.h>
 #include <sys/time.h>
 #include <atomic.h>
@@ -96,45 +95,10 @@
 } exch_mgmt_t;
 
-/** Session data */
-typedef struct {
-	/** List of inactive exchanges */
-	list_t exch_list;
-	
-	/** Exchange management style */
-	exch_mgmt_t mgmt;
-	
-	/** Session identification */
-	int phone;
-	
-	/** First clone connection argument */
-	sysarg_t arg1;
-	
-	/** Second clone connection argument */
-	sysarg_t arg2;
-	
-	/** Third clone connection argument */
-	sysarg_t arg3;
-	
-	/** Exchange mutex */
-	fibril_mutex_t mutex;
-	
-	/** Number of opened exchanges */
-	atomic_t refcnt;
-} async_sess_t;
-
-/** Exchange data */
-typedef struct {
-	/** Link into list of inactive exchanges */
-	link_t sess_link;
-	
-	/** Link into global list of inactive exchanges */
-	link_t global_link;
-	
-	/** Session pointer */
-	async_sess_t *sess;
-	
-	/** Exchange identification */
-	int phone;
-} async_exch_t;
+/** Forward declarations */
+struct _async_exch;
+struct _async_sess;
+
+typedef struct _async_sess async_sess_t;
+typedef struct _async_exch async_exch_t;
 
 extern atomic_t threads_in_ipc_wait;