Index: kernel/generic/include/stdbool.h
===================================================================
--- kernel/generic/include/stdbool.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ kernel/generic/include/stdbool.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -41,5 +41,5 @@
 #define true   1
 
-#define __bool_true_false_are_defined 1
+#define __bool_true_false_are_defined  1
 
 #endif
Index: uspace/lib/c/arch/arm32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/fibril_context.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/arch/arm32/include/libarch/fibril_context.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -49,5 +49,5 @@
 	uint32_t r7;
 	uint32_t r8;
-	/* r9*/
+	/* r9 */
 	uint32_t tls;
 	uint32_t r10;
@@ -57,3 +57,2 @@
 
 #endif
-
Index: uspace/lib/c/generic/async/client.c
===================================================================
--- uspace/lib/c/generic/async/client.c	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/generic/async/client.c	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -189,5 +189,4 @@
 	free(msg);
 }
-
 
 /** Mutex protecting inactive_exch_list and avail_phone_cv.
Index: uspace/lib/c/include/adt/hash_table.h
===================================================================
--- uspace/lib/c/include/adt/hash_table.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/include/adt/hash_table.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -102,5 +102,4 @@
     void *);
 
-
 #endif
 
Index: uspace/lib/c/include/cc.h
===================================================================
--- uspace/lib/c/include/cc.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/include/cc.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -44,5 +44,4 @@
 #endif
 
-
 #endif
 
Index: uspace/lib/c/include/fibril_synch.h
===================================================================
--- uspace/lib/c/include/fibril_synch.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/include/fibril_synch.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -67,6 +67,6 @@
 typedef struct {
 	fibril_owner_info_t oi;  /**< Keep this the first thing. */
-	unsigned writers;
-	unsigned readers;
+	unsigned int writers;
+	unsigned int readers;
 	list_t waiters;
 } fibril_rwlock_t;
@@ -145,5 +145,5 @@
 /** A counting semaphore for fibrils. */
 typedef struct {
-	long count;
+	long int count;
 	list_t waiters;
 } fibril_semaphore_t;
Index: uspace/lib/c/include/ipc/common.h
===================================================================
--- uspace/lib/c/include/ipc/common.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/include/ipc/common.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -50,5 +50,5 @@
 	task_id_t in_task_id;
 	sysarg_t in_phone_hash;
-	unsigned flags;
+	unsigned int flags;
 	struct async_call *label;
 	cap_call_handle_t cap_handle;
Index: uspace/lib/c/include/stdbool.h
===================================================================
--- uspace/lib/c/include/stdbool.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/include/stdbool.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -41,5 +41,5 @@
 #define true   1
 
-#define __bool_true_false_are_defined 1
+#define __bool_true_false_are_defined  1
 
 #endif
Index: uspace/lib/c/include/vfs/vfs.h
===================================================================
--- uspace/lib/c/include/vfs/vfs.h	(revision a8b0c5d5c63e55b59011b6c35b752d43e88778f0)
+++ uspace/lib/c/include/vfs/vfs.h	(revision fb0ec570bdde8224b2b38d270815b990dbef9225)
@@ -45,5 +45,5 @@
 #include <offset.h>
 
-#define VFS_MAX_OPEN_FILES	128
+#define VFS_MAX_OPEN_FILES  128
 
 enum vfs_change_state_type {