Index: arch/ia32/src/ia32.c
===================================================================
--- arch/ia32/src/ia32.c	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ arch/ia32/src/ia32.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -68,5 +68,5 @@
 }
 
-void arch_post_mm_init()
+void arch_post_mm_init(void)
 {
 	if (config.cpu_active == 1) {
@@ -75,5 +75,5 @@
 }
 
-void arch_late_init()
+void arch_late_init(void)
 {
 	if (config.cpu_active == 1) {
Index: arch/ia32/src/smp/mps.c
===================================================================
--- arch/ia32/src/smp/mps.c	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ arch/ia32/src/smp/mps.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -290,5 +290,5 @@
 #ifdef MPSCT_VERBOSE
 	char buf[7];
-	memcopy((__address) bus->bus_type, (__address) buf,6);
+	memcopy((__address) bus->bus_type, (__address) buf, 6);
 	buf[6] = 0;
 	printf("bus%d: %s\n", bus->bus_id, buf);
Index: include/func.h
===================================================================
--- include/func.h	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ include/func.h	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -36,5 +36,5 @@
 extern void halt(void);
 
-extern int strcmp(char *src, char *dst);
+extern int strcmp(const char *src, const char *dst);
 
 #endif
Index: include/memstr.h
===================================================================
--- include/memstr.h	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ include/memstr.h	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -30,10 +30,11 @@
 #define __MEMSTR_H__
 
+#include <typedefs.h>
 #include <arch/types.h>
 
-extern void memcopy(__address src, __address dst, int cnt);
+extern void memcopy(__address src, __address dst, size_t cnt);
 
-extern void memsetw(__address dst, int cnt, __u16 x);
-extern void memsetb(__address dst, int cnt, __u8 x);
+extern void memsetw(__address dst, size_t cnt, __u16 x);
+extern void memsetb(__address dst, size_t cnt, __u8 x);
 
 extern int memcmp(__address src, __address dst, int cnt);
@@ -42,6 +43,6 @@
  * Architecture independent variants.
  */
-extern void _memcopy(__address src, __address dst, int cnt);
-extern void _memsetb(__address dst, int cnt, __u8 x);
+extern void _memcopy(__address src, __address dst, size_t cnt);
+extern void _memsetb(__address dst, size_t cnt, __u8 x);
 
 #endif
Index: include/mm/heap.h
===================================================================
--- include/mm/heap.h	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ include/mm/heap.h	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -41,7 +41,7 @@
 };
 
-extern void heap_init(__address heap, int size);
+extern void heap_init(__address heap, __u32 size);
 
-extern void *malloc(int size);
+extern void *malloc(size_t size);
 extern void free(void *ptr);
 
Index: include/mm/vm.h
===================================================================
--- include/mm/vm.h	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ include/mm/vm.h	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -78,5 +78,5 @@
 extern void vm_destroy(vm_t *m);
 
-extern vm_area_t *vm_area_create(vm_t *m, vm_type_t type, int size, __address addr);
+extern vm_area_t *vm_area_create(vm_t *m, vm_type_t type, size_t size, __address addr);
 extern void vm_area_destroy(vm_area_t *a);
 
Index: src/lib/func.c
===================================================================
--- src/lib/func.c	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ src/lib/func.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -62,5 +62,5 @@
  *
  */
-int strcmp(char *src, char *dst)
+int strcmp(const char *src, const char *dst)
 {
 	int i;
Index: src/lib/memstr.c
===================================================================
--- src/lib/memstr.c	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ src/lib/memstr.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -42,5 +42,5 @@
  *
  */
-void _memcopy(__address src, __address dst, int cnt)
+void _memcopy(__address src, __address dst, size_t cnt)
 {
 	int i;
@@ -61,5 +61,5 @@
  *
  */
-void _memsetb(__address dst, int cnt, __u8 x)
+void _memsetb(__address dst, size_t cnt, __u8 x)
 {
 	int i;
Index: src/mm/heap.c
===================================================================
--- src/mm/heap.c	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ src/mm/heap.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -43,8 +43,8 @@
 static spinlock_t heaplock;
 
-void heap_init(__address heap, int size)
+void heap_init(__address heap, __u32 size)
 {
 	spinlock_initialize(&heaplock);
-	memsetb(heap,size,0);
+	memsetb(heap, size, 0);
 	chunk0 = (chunk_t *) heap;
 	chunk0->used = 0;
@@ -57,5 +57,5 @@
  * Uses first-fit algorithm.
  */
-void *malloc(int size)
+void *malloc(size_t size)
 {
 	pri_t pri;
Index: src/mm/vm.c
===================================================================
--- src/mm/vm.c	(revision 7eb0162337b73bdf30f3f3810f1b17b90a5c3f49)
+++ src/mm/vm.c	(revision 6ba143dce31ac1490fdc2b36456012f4baadf10c)
@@ -57,5 +57,5 @@
 }
 
-vm_area_t *vm_area_create(vm_t *m, vm_type_t type, int size, __address addr)
+vm_area_t *vm_area_create(vm_t *m, vm_type_t type, size_t size, __address addr)
 {
 	pri_t pri;
