Index: kernel/arch/mips32/include/arch.h
===================================================================
--- kernel/arch/mips32/include/arch.h	(revision a31efeb643914cadd04b764124af1a7ab5087f6c)
+++ kernel/arch/mips32/include/arch.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -43,5 +43,5 @@
 #include <typedefs.h>
 
-extern count_t cpu_count;
+extern size_t cpu_count;
 
 typedef struct {
Index: kernel/arch/mips32/include/debugger.h
===================================================================
--- kernel/arch/mips32/include/debugger.h	(revision a31efeb643914cadd04b764124af1a7ab5087f6c)
+++ kernel/arch/mips32/include/debugger.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -54,5 +54,5 @@
 	unative_t nextinstruction;  /**< Original instruction following break */
 	int flags;        /**< Flags regarding breakpoint */
-	count_t counter;
+	size_t counter;
 	void (*bkfunc)(void *b, istate_t *istate);
 } bpinfo_t;
Index: kernel/arch/mips32/include/mm/page.h
===================================================================
--- kernel/arch/mips32/include/mm/page.h	(revision a31efeb643914cadd04b764124af1a7ab5087f6c)
+++ kernel/arch/mips32/include/mm/page.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -113,5 +113,5 @@
 /* Get PTE flags accessors for each level. */
 #define GET_PTL1_FLAGS_ARCH(ptl0, i) \
-	get_pt_flags((pte_t *) (ptl0), (index_t) (i))
+	get_pt_flags((pte_t *) (ptl0), (size_t) (i))
 #define GET_PTL2_FLAGS_ARCH(ptl1, i) \
 	PAGE_PRESENT
@@ -119,13 +119,13 @@
 	PAGE_PRESENT
 #define GET_FRAME_FLAGS_ARCH(ptl3, i) \
-	get_pt_flags((pte_t *) (ptl3), (index_t) (i))
+	get_pt_flags((pte_t *) (ptl3), (size_t) (i))
 
 /* Set PTE flags accessors for each level. */
 #define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
-	set_pt_flags((pte_t *) (ptl0), (index_t) (i), (x))
+	set_pt_flags((pte_t *) (ptl0), (size_t) (i), (x))
 #define SET_PTL2_FLAGS_ARCH(ptl1, i, x)
 #define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
-	set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
+	set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
 /* Last-level info macros. */
@@ -141,5 +141,5 @@
 #include <arch/exception.h>
 
-static inline int get_pt_flags(pte_t *pt, index_t i)
+static inline int get_pt_flags(pte_t *pt, size_t i)
 {
 	pte_t *p = &pt[i];
@@ -154,5 +154,5 @@
 }
 
-static inline void set_pt_flags(pte_t *pt, index_t i, int flags)
+static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_t *p = &pt[i];
Index: kernel/arch/mips32/include/types.h
===================================================================
--- kernel/arch/mips32/include/types.h	(revision a31efeb643914cadd04b764124af1a7ab5087f6c)
+++ kernel/arch/mips32/include/types.h	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -47,6 +47,4 @@
 
 typedef uint32_t size_t;
-typedef uint32_t count_t;
-typedef uint32_t index_t;
 
 typedef uint32_t uintptr_t;
@@ -63,6 +61,4 @@
 #define PRIp "x"	/**< Format for uintptr_t. */
 #define PRIs "u"	/**< Format for size_t. */
-#define PRIc "u"	/**< Format for count_t. */
-#define PRIi "u"	/**< Format for index_t. */
 
 #define PRId8 "d"	/**< Format for int8_t. */
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision a31efeb643914cadd04b764124af1a7ab5087f6c)
+++ kernel/arch/mips32/src/mips32.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -77,5 +77,5 @@
 uintptr_t supervisor_sp __attribute__ ((section (".text")));
 
-count_t cpu_count = 0;
+size_t cpu_count = 0;
 
 /** Performs mips32-specific initialization before main_bsp() is called. */
@@ -85,5 +85,5 @@
 	init.cnt = bootinfo->cnt;
 	
-	count_t i;
+	size_t i;
 	for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
 		init.tasks[i].addr = bootinfo->tasks[i].addr;
Index: kernel/arch/mips32/src/mm/frame.c
===================================================================
--- kernel/arch/mips32/src/mm/frame.c	(revision a31efeb643914cadd04b764124af1a7ab5087f6c)
+++ kernel/arch/mips32/src/mm/frame.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -63,5 +63,5 @@
 } phys_region_t;
 
-static count_t phys_regions_count = 0;
+static size_t phys_regions_count = 0;
 static phys_region_t phys_regions[MAX_REGIONS];
 
@@ -120,5 +120,5 @@
 	/* Init tasks */
 	bool safe = true;
-	count_t i;
+	size_t i;
 	for (i = 0; i < init.cnt; i++)
 		if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
@@ -175,5 +175,5 @@
 	cp0_entry_hi_write(0);
 
-	count_t i;
+	size_t i;
 	for (i = 0; i < TLB_ENTRY_COUNT; i++) {
 		cp0_index_write(i);
@@ -252,5 +252,5 @@
 	printf("---------- ----------\n");
 	
-	count_t i;
+	size_t i;
 	for (i = 0; i < phys_regions_count; i++) {
 		printf("%#010x %10u\n",
Index: kernel/arch/mips32/src/mm/tlb.c
===================================================================
--- kernel/arch/mips32/src/mm/tlb.c	(revision a31efeb643914cadd04b764124af1a7ab5087f6c)
+++ kernel/arch/mips32/src/mm/tlb.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -561,5 +561,5 @@
  * @param cnt		Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, size_t cnt)
 {
 	unsigned int i;