Basic fixes for a clean simulator build with last big fs changes

fs/aio/Make.defs

@@ -37,8 +37,8 @@ ifeq ($(CONFIG_FS_AIO),y)
 
 # Add the asynchronous I/O C files to the build
 
-CSRCS += aio_cancel.c aio_fsync.c aio_initialize.c aio_read.c aio_signal.c
-CSRCS += aio_write.c
+CSRCS += aio_cancel.c aioc_contain.c aio_fsync.c aio_initialize.c aio_read.c
+CSRCS += aio_signal.c aio_write.c
 
 # Add the asynchronous I/O directory to the build
 

fs/aio/aio.h

@@ -43,6 +43,7 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
+#include <string.h>
 #include <aio.h>
 #include <queue.h>
 
@@ -153,7 +154,7 @@ void aio_unlock(void);
  *
  ****************************************************************************/
 
-FAR struct aio_container_s *aioc_lock(void);
+FAR struct aio_container_s *aioc_alloc(void);
 
 /****************************************************************************
  * Name: aioc_free

fs/aio/aio_initialize.c

@@ -180,7 +180,7 @@ void aio_unlock(void)
  *
  ****************************************************************************/
 
-FAR struct aio_container_s *aioc_lock(void)
+FAR struct aio_container_s *aioc_alloc(void)
 {
   FAR struct aio_container_s *aioc;
 

fs/aio/aioc_contain.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/aio/aio_contain.c
+ * libc/aio/aioc_contain.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,7 +41,7 @@
 
 #include <sched.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "aio/aio.h"
 
@@ -157,7 +157,7 @@ FAR struct aiocb *aioc_decant(FAR struct aio_container_s *aioc)
 
   /* De-cant the AIO control block and return the container to the free list */
 
-  aiocbp = aioc->acioc_aiocbp;
+  aiocbp = aioc->aioc_aiocbp;
   aioc_free(aioc);
   return aiocbp;
 }