Index: kernel/generic/include/adt/bitmap.h
===================================================================
--- kernel/generic/include/adt/bitmap.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/adt/bitmap.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -42,16 +42,17 @@
 typedef struct {
 	uint8_t *map;
-	count_t bits;
+	size_t bits;
 } bitmap_t;
 
-extern void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, count_t bits);
-extern void bitmap_set_range(bitmap_t *bitmap, index_t start, count_t bits);
-extern void bitmap_clear_range(bitmap_t *bitmap, index_t start, count_t bits);
-extern void bitmap_copy(bitmap_t *dst, bitmap_t *src, count_t bits);
+extern void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, size_t bits);
+extern void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t bits);
+extern void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t bits);
+extern void bitmap_copy(bitmap_t *dst, bitmap_t *src, size_t bits);
 
-static inline int bitmap_get(bitmap_t *bitmap,index_t bit)
+static inline int bitmap_get(bitmap_t *bitmap, size_t bit)
 {
 	if(bit >= bitmap->bits)
 		return 0;
+	
 	return !! ((bitmap->map)[bit/8] & (1 << (bit & 7)));
 }
Index: kernel/generic/include/adt/btree.h
===================================================================
--- kernel/generic/include/adt/btree.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/adt/btree.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -47,5 +47,5 @@
 typedef struct btree_node {
 	/** Number of keys. */
-	count_t keys;
+	size_t keys;
 
 	/**
Index: kernel/generic/include/adt/fifo.h
===================================================================
--- kernel/generic/include/adt/fifo.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/adt/fifo.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -60,7 +60,7 @@
 	struct {					\
 		t fifo[(itms)];				\
-		count_t items;				\
-		index_t head;				\
-		index_t tail;				\
+		size_t items;				\
+		size_t head;				\
+		size_t tail;				\
 	} name = {					\
 		.items = (itms),			\
@@ -81,7 +81,7 @@
 	struct {					\
 		t *fifo;				\
-		count_t items;				\
-		index_t head;				\
-		index_t tail;				\
+		size_t items;				\
+		size_t head;				\
+		size_t tail;				\
 	} name = {					\
 		.fifo = NULL,				\
Index: kernel/generic/include/adt/hash_table.h
===================================================================
--- kernel/generic/include/adt/hash_table.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/adt/hash_table.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -48,5 +48,5 @@
 	 * @return Index into hash table.
 	 */
-	index_t (* hash)(unative_t key[]);
+	size_t (* hash)(unative_t key[]);
 	
 	/** Hash table item comparison function.
@@ -57,5 +57,5 @@
 	 * @return true if the keys match, false otherwise.
 	 */
-	bool (*compare)(unative_t key[], count_t keys, link_t *item);
+	bool (*compare)(unative_t key[], size_t keys, link_t *item);
 
 	/** Hash table item removal callback.
@@ -69,6 +69,6 @@
 typedef struct {
 	link_t *entry;
-	count_t entries;
-	count_t max_keys;
+	size_t entries;
+	size_t max_keys;
 	hash_table_operations_t *op;
 } hash_table_t;
@@ -77,9 +77,9 @@
 	list_get_instance((item), type, member)
 
-extern void hash_table_create(hash_table_t *h, count_t m, count_t max_keys,
+extern void hash_table_create(hash_table_t *h, size_t m, size_t max_keys,
     hash_table_operations_t *op);
 extern void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item);
 extern link_t *hash_table_find(hash_table_t *h, unative_t key[]);
-extern void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys);
+extern void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys);
 
 #endif
Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/arch.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -57,5 +57,5 @@
  */
 typedef struct {
-	count_t preemption_disabled;	/**< Preemption disabled counter. */
+	size_t preemption_disabled;	/**< Preemption disabled counter. */
 	thread_t *thread;		/**< Current thread. */
 	task_t *task;			/**< Current task. */
Index: kernel/generic/include/config.h
===================================================================
--- kernel/generic/include/config.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/config.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -51,5 +51,5 @@
 
 typedef struct {
-	count_t cnt;
+	size_t cnt;
 	init_task_t tasks[CONFIG_INIT_TASKS];
 } init_t;
@@ -66,6 +66,6 @@
 
 typedef struct {
-	count_t cpu_count;            /**< Number of processors detected. */
-	volatile count_t cpu_active;  /**< Number of processors that are up and running. */
+	size_t cpu_count;            /**< Number of processors detected. */
+	volatile size_t cpu_active;  /**< Number of processors that are up and running. */
 	
 	uintptr_t base;
Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/console/chardev.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -58,9 +58,9 @@
 	SPINLOCK_DECLARE(lock);
 	wchar_t buffer[INDEV_BUFLEN];
-	count_t counter;
+	size_t counter;
 	
 	/** Implementation of indev operations. */
 	indev_operations_t *op;
-	index_t index;
+	size_t index;
 	void *data;
 } indev_t;
Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/console/console.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -50,5 +50,5 @@
 
 extern wchar_t getc(indev_t *indev);
-extern count_t gets(indev_t *indev, char *buf, size_t buflen);
+extern size_t gets(indev_t *indev, char *buf, size_t buflen);
 extern unative_t sys_klog(int fd, const void *buf, size_t size);
 
Index: kernel/generic/include/console/kconsole.h
===================================================================
--- kernel/generic/include/console/kconsole.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/console/kconsole.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -78,5 +78,5 @@
 	int (* func)(cmd_arg_t *);
 	/** Number of arguments. */
-	count_t argc;
+	size_t argc;
 	/** Argument vector. */
 	cmd_arg_t *argv;
Index: kernel/generic/include/cpu.h
===================================================================
--- kernel/generic/include/cpu.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/cpu.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -52,5 +52,5 @@
 
 	tlb_shootdown_msg_t tlb_messages[TLB_MESSAGE_QUEUE_LEN];
-	count_t tlb_messages_count;
+	size_t tlb_messages_count;
 	
 	context_t saved_context;
@@ -58,10 +58,10 @@
 	atomic_t nrdy;
 	runq_t rq[RQ_COUNT];
-	volatile count_t needs_relink;
+	volatile size_t needs_relink;
 
 	SPINLOCK_DECLARE(timeoutlock);
 	link_t timeout_active_head;
 
-	count_t missed_clock_ticks;	/**< When system clock loses a tick, it is recorded here
+	size_t missed_clock_ticks;	/**< When system clock loses a tick, it is recorded here
 					     so that clock() can react. This variable is
 					     CPU-local and can be only accessed when interrupts
Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/ddi/irq.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -105,5 +105,5 @@
 	irq_code_t *code;
 	/** Counter. */
-	count_t counter;
+	size_t counter;
 	/**
 	 * Link between IRQs that are notifying the same answerbox. The list is
@@ -163,5 +163,5 @@
 extern hash_table_t irq_uspace_hash_table;
 
-extern void irq_init(count_t, count_t);
+extern void irq_init(size_t, size_t);
 extern void irq_initialize(irq_t *);
 extern void irq_register(irq_t *);
Index: kernel/generic/include/ipc/event.h
===================================================================
--- kernel/generic/include/ipc/event.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/ipc/event.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -50,5 +50,5 @@
 	unative_t method;
 	/** Counter. */
-	count_t counter;
+	size_t counter;
 } event_t;
 
Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/mm/as.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -95,5 +95,5 @@
 	 * Protected by asidlock.
 	 */
-	count_t cpu_refcount;
+	size_t cpu_refcount;
 	/**
 	 * Address space identifier.
@@ -133,5 +133,5 @@
 	mutex_t lock;		
 	/** This structure can be deallocated if refcount drops to 0. */
-	count_t refcount;
+	size_t refcount;
 	/**
 	 * B+tree containing complete map of anonymous pages of the shared area.
@@ -157,5 +157,5 @@
 	struct {	/**< phys_backend members */
 		uintptr_t base;
-		count_t frames;
+		size_t frames;
 	};
 } mem_backend_data_t;
@@ -176,5 +176,5 @@
 	int attributes;
 	/** Size of this area in multiples of PAGE_SIZE. */
-	count_t pages;
+	size_t pages;
 	/** Base address of this area. */
 	uintptr_t base;
@@ -226,6 +226,6 @@
 extern bool as_area_check_access(as_area_t *area, pf_access_t access);
 extern size_t as_area_get_size(uintptr_t base);
-extern int used_space_insert(as_area_t *a, uintptr_t page, count_t count);
-extern int used_space_remove(as_area_t *a, uintptr_t page, count_t count);
+extern int used_space_insert(as_area_t *a, uintptr_t page, size_t count);
+extern int used_space_remove(as_area_t *a, uintptr_t page, size_t count);
 
 
Index: kernel/generic/include/mm/frame.h
===================================================================
--- kernel/generic/include/mm/frame.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/mm/frame.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -81,5 +81,5 @@
 
 typedef struct {
-	count_t refcount;     /**< Tracking of shared frames */
+	size_t refcount;     /**< Tracking of shared frames */
 	uint8_t buddy_order;  /**< Buddy system block order */
 	link_t buddy_link;    /**< Link to the next free block inside
@@ -91,8 +91,8 @@
 	pfn_t base;                    /**< Frame_no of the first frame
                                         in the frames array */
-	count_t count;                 /**< Size of zone */
-	count_t free_count;            /**< Number of free frame_t
+	size_t count;                 /**< Size of zone */
+	size_t free_count;            /**< Number of free frame_t
                                         structures */
-	count_t busy_count;            /**< Number of busy frame_t
+	size_t busy_count;            /**< Number of busy frame_t
                                         structures */
 	zone_flags_t flags;            /**< Type of the zone */
@@ -109,5 +109,5 @@
 typedef struct {
 	SPINLOCK_DECLARE(lock);
-	count_t count;
+	size_t count;
 	zone_t info[ZONES_MAX];
 } zones_t;
@@ -125,12 +125,12 @@
 }
 
-static inline count_t SIZE2FRAMES(size_t size)
+static inline size_t SIZE2FRAMES(size_t size)
 {
 	if (!size)
 		return 0;
-	return (count_t) ((size - 1) >> FRAME_WIDTH) + 1;
+	return (size_t) ((size - 1) >> FRAME_WIDTH) + 1;
 }
 
-static inline size_t FRAMES2SIZE(count_t frames)
+static inline size_t FRAMES2SIZE(size_t frames)
 {
 	return (size_t) (frames << FRAME_WIDTH);
@@ -157,15 +157,15 @@
 
 extern void frame_init(void);
-extern void *frame_alloc_generic(uint8_t, frame_flags_t, count_t *);
+extern void *frame_alloc_generic(uint8_t, frame_flags_t, size_t *);
 extern void frame_free(uintptr_t);
 extern void frame_reference_add(pfn_t);
 
-extern count_t find_zone(pfn_t frame, count_t count, count_t hint);
-extern count_t zone_create(pfn_t, count_t, pfn_t, zone_flags_t);
-extern void *frame_get_parent(pfn_t, count_t);
-extern void frame_set_parent(pfn_t, void *, count_t);
-extern void frame_mark_unavailable(pfn_t, count_t);
-extern uintptr_t zone_conf_size(count_t);
-extern bool zone_merge(count_t, count_t);
+extern size_t find_zone(pfn_t frame, size_t count, size_t hint);
+extern size_t zone_create(pfn_t, size_t, pfn_t, zone_flags_t);
+extern void *frame_get_parent(pfn_t, size_t);
+extern void frame_set_parent(pfn_t, void *, size_t);
+extern void frame_mark_unavailable(pfn_t, size_t);
+extern uintptr_t zone_conf_size(size_t);
+extern bool zone_merge(size_t, size_t);
 extern void zone_merge_all(void);
 extern uint64_t zone_total_size(void);
@@ -175,5 +175,5 @@
  */
 extern void zone_print_list(void);
-extern void zone_print_one(count_t);
+extern void zone_print_one(size_t);
 
 #endif
Index: kernel/generic/include/mm/slab.h
===================================================================
--- kernel/generic/include/mm/slab.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/mm/slab.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -73,6 +73,6 @@
 typedef struct {
 	link_t link;
-	count_t busy;  /**< Count of full slots in magazine */
-	count_t size;  /**< Number of slots in magazine */
+	size_t busy;  /**< Count of full slots in magazine */
+	size_t size;  /**< Number of slots in magazine */
 	void *objs[];  /**< Slots in magazine */
 } slab_magazine_t;
@@ -129,5 +129,5 @@
 extern void * slab_alloc(slab_cache_t *, int);
 extern void slab_free(slab_cache_t *, void *);
-extern count_t slab_reclaim(int);
+extern size_t slab_reclaim(int);
 
 /* slab subsytem initialization */
Index: kernel/generic/include/mm/tlb.h
===================================================================
--- kernel/generic/include/mm/tlb.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/mm/tlb.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -62,5 +62,5 @@
 	asid_t asid;			/**< Address space identifier. */
 	uintptr_t page;			/**< Page address. */
-	count_t count;			/**< Number of pages to invalidate. */
+	size_t count;			/**< Number of pages to invalidate. */
 } tlb_shootdown_msg_t;
 
@@ -69,5 +69,5 @@
 #ifdef CONFIG_SMP
 extern void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
-    uintptr_t page, count_t count);
+    uintptr_t page, size_t count);
 extern void tlb_shootdown_finalize(void);
 extern void tlb_shootdown_ipi_recv(void);
@@ -85,5 +85,5 @@
 extern void tlb_invalidate_all(void);
 extern void tlb_invalidate_asid(asid_t asid);
-extern void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt);
+extern void tlb_invalidate_pages(asid_t asid, uintptr_t page, size_t cnt);
 #endif
 
Index: kernel/generic/include/proc/scheduler.h
===================================================================
--- kernel/generic/include/proc/scheduler.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/proc/scheduler.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -48,5 +48,5 @@
 	SPINLOCK_DECLARE(lock);
 	link_t rq_head;		/**< List of ready threads. */
-	count_t n;		/**< Number of threads in rq_ready. */
+	size_t n;		/**< Number of threads in rq_ready. */
 } runq_t;
 
Index: kernel/generic/include/sort.h
===================================================================
--- kernel/generic/include/sort.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/sort.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -41,6 +41,6 @@
  * sorting routines
  */
-extern void bubblesort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b));
-extern void qsort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b));
+extern void bubblesort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b));
+extern void qsort(void * data, size_t n, size_t e_size, int (* cmp) (void * a, void * b));
 
 /*
Index: kernel/generic/include/string.h
===================================================================
--- kernel/generic/include/string.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/string.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -72,12 +72,12 @@
 extern size_t wstr_size(const wchar_t *str);
 
-extern size_t str_lsize(const char *str, count_t max_len);
-extern size_t wstr_lsize(const wchar_t *str, count_t max_len);
+extern size_t str_lsize(const char *str, size_t max_len);
+extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
 
-extern count_t str_length(const char *str);
-extern count_t wstr_length(const wchar_t *wstr);
+extern size_t str_length(const char *str);
+extern size_t wstr_length(const wchar_t *wstr);
 
-extern count_t str_nlength(const char *str, size_t size);
-extern count_t wstr_nlength(const wchar_t *str, size_t size);
+extern size_t str_nlength(const char *str, size_t size);
+extern size_t wstr_nlength(const wchar_t *str, size_t size);
 
 extern bool ascii_check(wchar_t ch);
@@ -85,5 +85,5 @@
 
 extern int str_cmp(const char *s1, const char *s2);
-extern int str_lcmp(const char *s1, const char *s2, count_t max_len);
+extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
 
 extern void str_cpy(char *dest, size_t size, const char *src);
@@ -93,6 +93,6 @@
 extern const char *str_chr(const char *str, wchar_t ch);
 
-extern bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos);
-extern bool wstr_remove(wchar_t *str, count_t pos);
+extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
+extern bool wstr_remove(wchar_t *str, size_t pos);
 
 #endif
Index: kernel/generic/include/symtab.h
===================================================================
--- kernel/generic/include/symtab.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/symtab.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -49,5 +49,5 @@
 extern int symtab_addr_lookup(const char *name, uintptr_t *addr);
 extern void symtab_print_search(const char *name);
-extern int symtab_compl(char *input, count_t size);
+extern int symtab_compl(char *input, size_t size);
 
 #ifdef CONFIG_SYMTAB
Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/synch/futex.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -50,5 +50,5 @@
 	link_t ht_link;
 	/** Number of tasks that reference this futex. */
-	count_t refcount;
+	size_t refcount;
 } futex_t;
 
Index: kernel/generic/include/synch/rwlock.h
===================================================================
--- kernel/generic/include/synch/rwlock.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/synch/rwlock.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -54,5 +54,5 @@
 	mutex_t exclusive;
 	/** Number of readers in critical section. */
-	count_t readers_in;
+	size_t readers_in;
 } rwlock_t;
 
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 8658f89291d5a3b786eda37c379a32acd5ded14f)
+++ kernel/generic/include/synch/spinlock.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -108,5 +108,5 @@
 
 #define DEADLOCK_THRESHOLD		100000000
-#define DEADLOCK_PROBE_INIT(pname)	count_t pname = 0
+#define DEADLOCK_PROBE_INIT(pname)	size_t pname = 0
 #define DEADLOCK_PROBE(pname, value)					\
 	if ((pname)++ > (value)) {					\