diff --git a/fs/fs_inode.c b/fs/fs_inode.c
index 6bbdea287e9..a03448a0ead 100644
--- a/fs/fs_inode.c
+++ b/fs/fs_inode.c
@@ -39,12 +39,13 @@
 
 #include <nuttx/config.h>
 
-#include <stdlib.h>
 #include <assert.h>
 #include <semaphore.h>
 #include <errno.h>
 
+#include <nuttx/kmalloc.h>
 #include <nuttx/fs.h>
+
 #include "fs_internal.h"
 
 /****************************************************************************
diff --git a/include/nuttx/kmalloc.h b/include/nuttx/kmalloc.h
index aafe150fdda..acdfca1cdfb 100644
--- a/include/nuttx/kmalloc.h
+++ b/include/nuttx/kmalloc.h
@@ -78,8 +78,8 @@ extern "C" {
 
 # define kmm_initialize(h,s)    mm_initialize(h,s)
 # define kmm_addregion(h,s)     mm_addregion(h,s)
-# define kmm_trysemaphore(h,s)  mm_trysemaphore(h,s)
-# define kmm_givesemaphore(h,s) mm_givesemaphore(h,s)
+# define kmm_trysemaphore()     mm_trysemaphore()
+# define kmm_givesemaphore()    mm_givesemaphore()
 
 # define kmalloc(s)             malloc(s)
 # define kzalloc(s)             zalloc(s)
diff --git a/lib/misc/lib_init.c b/lib/misc/lib_init.c
index 112b0a3c711..55bcbf0af28 100644
--- a/lib/misc/lib_init.c
+++ b/lib/misc/lib_init.c
@@ -43,6 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include <nuttx/kmalloc.h>
 #include <nuttx/fs.h>
 #include <nuttx/lib.h>