Merge branch 'containers' into containersBuildDevel

containers/posix/fs0/include/lib/malloc.h

@@ -3,12 +3,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#ifndef NULL
-#define NULL	0
-#endif
-#ifndef size_t
-#define size_t int
-#endif
 
 void *kmalloc(size_t size);
 void kfree(void *blk);

containers/posix/fs0/include/vfs.h

@@ -6,7 +6,7 @@
 #include <l4/lib/list.h>
 #include <memfs/memfs.h>
 #include <l4/macros.h>
-#include <printf.h>
+#include <stdio.h>
 #include <task.h>
 #include <path.h>