Index: kernel/arch/arm32/include/mm/page.h
===================================================================
--- kernel/arch/arm32/include/mm/page.h	(revision c2417bcc6cc9caba6dca867e322c9cc5723b35f4)
+++ kernel/arch/arm32/include/mm/page.h	(revision f3afd24a0d1153d9f334ec48804a551d363339fd)
@@ -95,5 +95,5 @@
 /* Get PTE flags accessors for each level. */
 #define GET_PTL1_FLAGS_ARCH(ptl0, i) \
-	get_pt_level0_flags((pte_level0_t *) (ptl0), (index_t) (i))
+	get_pt_level0_flags((pte_level0_t *) (ptl0), (size_t) (i))
 #define GET_PTL2_FLAGS_ARCH(ptl1, i) \
 	PAGE_PRESENT
@@ -101,13 +101,13 @@
 	PAGE_PRESENT
 #define GET_FRAME_FLAGS_ARCH(ptl3, i) \
-	get_pt_level1_flags((pte_level1_t *) (ptl3), (index_t) (i))
+	get_pt_level1_flags((pte_level1_t *) (ptl3), (size_t) (i))
 
 /* Set PTE flags accessors for each level. */
 #define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
-	set_pt_level0_flags((pte_level0_t *) (ptl0), (index_t) (i), (x))
+	set_pt_level0_flags((pte_level0_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_level1_flags((pte_level1_t *) (ptl3), (index_t) (i), (x))
+	set_pt_level1_flags((pte_level1_t *) (ptl3), (size_t) (i), (x))
 
 /* Macros for querying the last-level PTE entries. */
@@ -205,5 +205,5 @@
  *  @param i      Index of the entry to return.
  */
-static inline int get_pt_level0_flags(pte_level0_t *pt, index_t i)
+static inline int get_pt_level0_flags(pte_level0_t *pt, size_t i)
 {
 	pte_level0_t *p = &pt[i];
@@ -220,5 +220,5 @@
  *  @param i      Index of the entry to return.
  */
-static inline int get_pt_level1_flags(pte_level1_t *pt, index_t i)
+static inline int get_pt_level1_flags(pte_level1_t *pt, size_t i)
 {
 	pte_level1_t *p = &pt[i];
@@ -245,5 +245,5 @@
  *  @param flags  new flags
  */
-static inline void set_pt_level0_flags(pte_level0_t *pt, index_t i, int flags)
+static inline void set_pt_level0_flags(pte_level0_t *pt, size_t i, int flags)
 {
 	pte_level0_t *p = &pt[i];
@@ -273,5 +273,5 @@
  *  @param flags  New flags.
  */  
-static inline void set_pt_level1_flags(pte_level1_t *pt, index_t i, int flags)
+static inline void set_pt_level1_flags(pte_level1_t *pt, size_t i, int flags)
 {
 	pte_level1_t *p = &pt[i];
Index: kernel/arch/arm32/include/types.h
===================================================================
--- kernel/arch/arm32/include/types.h	(revision c2417bcc6cc9caba6dca867e322c9cc5723b35f4)
+++ kernel/arch/arm32/include/types.h	(revision f3afd24a0d1153d9f334ec48804a551d363339fd)
@@ -54,6 +54,4 @@
 
 typedef uint32_t size_t;
-typedef uint32_t count_t;
-typedef uint32_t index_t;
 
 typedef uint32_t uintptr_t;
@@ -70,6 +68,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. */
