Index: include/mm/frame.h
===================================================================
--- include/mm/frame.h	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
+++ include/mm/frame.h	(revision 2b50d7c97571beca347155c17a3ce02b7ccae21b)
@@ -31,16 +31,17 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 #define FRAME_KA	1	/* skip frames conflicting with user address space */
 #define FRAME_PANIC	2	/* panic on failure */
 
-extern __u32 frames;
-extern __u32 frames_free;
+extern count_t frames;
+extern count_t frames_free;
 
-extern __u32 kernel_frames;
-extern __u32 kernel_frames_free;
+extern count_t kernel_frames;
+extern count_t kernel_frames_free;
 
 extern __u8 *frame_bitmap;
-extern __u32 frame_bitmap_octets;
+extern count_t frame_bitmap_octets;
 
 extern __u8 *frame_kernel_bitmap;
Index: include/mm/heap.h
===================================================================
--- include/mm/heap.h	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
+++ include/mm/heap.h	(revision 2b50d7c97571beca347155c17a3ce02b7ccae21b)
@@ -41,5 +41,5 @@
 };
 
-extern void heap_init(__address heap, __u32 size);
+extern void heap_init(__address heap, size_t size);
 
 extern void *malloc(size_t size);