Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 80bcaed11c2e767559657092d6c13d1a7fdd449c)
+++ kernel/generic/include/ipc/ipc.h	(revision 8b243f295e54de841c17a2606bdc9a2fe484dbbb)
@@ -38,11 +38,11 @@
 /* Length of data being transfered with IPC call */
 /* - the uspace may not be able to utilize full length */
-#define IPC_CALL_LEN    4
+#define IPC_CALL_LEN		4
 
 /** Maximum active async calls per thread */
 #ifdef CONFIG_DEBUG
-# define IPC_MAX_ASYNC_CALLS  4
+#define IPC_MAX_ASYNC_CALLS	4
 #else
-# define IPC_MAX_ASYNC_CALLS  4000
+#define IPC_MAX_ASYNC_CALLS	4000
 #endif
 
@@ -62,13 +62,15 @@
 #define IPC_CALL_NOTIF		(1 << 5)
 
-/* Flags of callid (the addresses are aligned at least to 4, 
- * that is why we can use bottom 2 bits of the call address
- */
-/** Type of this msg is 'answer' */
+/*
+ * Bits used in call hashes.
+ * The addresses are aligned at least to 4 that is why we can use the 2 least
+ * significant bits of the call address.
+ */
+/** Type of this call is 'answer' */
 #define IPC_CALLID_ANSWERED	1
-/** Type of this msg is 'notification' */
+/** Type of this call is 'notification' */
 #define IPC_CALLID_NOTIFICATION	2
 
-/* Return values from IPC_ASYNC */
+/* Return values from sys_ipc_call_async(). */
 #define IPC_CALLRET_FATAL	-1
 #define IPC_CALLRET_TEMPORARY	-2
@@ -112,5 +114,5 @@
  *                     - the caller obtains taskid of the called thread
  */
-#define IPC_M_CONNECT_TO_ME     1
+#define IPC_M_CONNECT_TO_ME	1
 /** Protocol for CONNECT - ME - TO
  *
@@ -131,9 +133,9 @@
  *
  */
-#define IPC_M_CONNECT_ME_TO     2
+#define IPC_M_CONNECT_ME_TO	2
 /** This message is sent to answerbox when the phone
  * is hung up
  */
-#define IPC_M_PHONE_HUNGUP      3
+#define IPC_M_PHONE_HUNGUP	3
 
 /** Send as_area over IPC 
@@ -145,5 +147,5 @@
  * - ARG1 - dst as_area base adress
  */
-#define IPC_M_AS_AREA_SEND      5
+#define IPC_M_AS_AREA_SEND	5
 
 /** Get as_area over IPC
@@ -157,12 +159,12 @@
  * - ARG2 - flags that will be used for sharing
  */
-#define IPC_M_AS_AREA_RECV      6
+#define IPC_M_AS_AREA_RECV	6
 
 
 /* Well-known methods */
-#define IPC_M_LAST_SYSTEM     511
-#define IPC_M_PING            512
+#define IPC_M_LAST_SYSTEM	511
+#define IPC_M_PING		512
 /* User methods */
-#define FIRST_USER_METHOD     1024
+#define FIRST_USER_METHOD	1024
 
 #ifdef KERNEL
@@ -204,15 +206,15 @@
 	waitq_t wq;
 
-	/** Phones connected to this answerbox */
+	/** Phones connected to this answerbox. */
 	link_t connected_phones;
-	/** Received calls */
+	/** Received calls. */
 	link_t calls;			
 	link_t dispatched_calls;	/* Should be hash table in the future */
 
-	/** Answered calls */
+	/** Answered calls. */
 	link_t answers;
 
 	SPINLOCK_DECLARE(irq_lock);
-	/** Notifications from IRQ handlers */
+	/** Notifications from IRQ handlers. */
 	link_t irq_notifs;
 	/** IRQs with notifications to this answerbox. */
@@ -230,15 +232,14 @@
 	int flags;
 
-	/* Identification of the caller */
+	/** Identification of the caller. */
 	struct task *sender;
-	/* The caller box is different from sender->answerbox
-	 * for synchronous calls
-	 */
+	/** The caller box is different from sender->answerbox for synchronous
+	 *  calls. */
 	answerbox_t *callerbox;
 
-	/** Private data to internal IPC */
+	/** Private data to internal IPC. */
 	unative_t priv;
 
-	/** Data passed from/to userspace */
+	/** Data passed from/to userspace. */
 	ipc_data_t data;
 } call_t;
Index: kernel/generic/include/ipc/ipcrsc.h
===================================================================
--- kernel/generic/include/ipc/ipcrsc.h	(revision 80bcaed11c2e767559657092d6c13d1a7fdd449c)
+++ kernel/generic/include/ipc/ipcrsc.h	(revision 8b243f295e54de841c17a2606bdc9a2fe484dbbb)
@@ -36,8 +36,8 @@
 #define KERN_IPCRSC_H_
 
-call_t * get_call(unative_t callid);
-int phone_alloc(void);
-void phone_connect(int phoneid, answerbox_t *box);
-void phone_dealloc(int phoneid);
+extern call_t * get_call(unative_t callid);
+extern int phone_alloc(void);
+extern void phone_connect(int phoneid, answerbox_t *box);
+extern void phone_dealloc(int phoneid);
 
 #endif
Index: kernel/generic/include/ipc/irq.h
===================================================================
--- kernel/generic/include/ipc/irq.h	(revision 80bcaed11c2e767559657092d6c13d1a7fdd449c)
+++ kernel/generic/include/ipc/irq.h	(revision 8b243f295e54de841c17a2606bdc9a2fe484dbbb)
@@ -37,5 +37,5 @@
 
 /** Maximum length of IPC IRQ program */
-#define IRQ_MAX_PROG_SIZE 10
+#define IRQ_MAX_PROG_SIZE	10
 
 #include <ipc/ipc.h>
@@ -47,5 +47,6 @@
     unative_t method, irq_code_t *ucode);
 extern void ipc_irq_send_notif(irq_t *irq);
-extern void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2, unative_t a3);
+extern void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2,
+    unative_t a3);
 extern void ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno);
 extern void ipc_irq_cleanup(answerbox_t *box);