diff --git a/boards/sim/sim/sim/configs/fluoride/defconfig b/boards/sim/sim/sim/configs/fluoride/defconfig
new file mode 100644
index 0000000000000..614425dcf3ba6
--- /dev/null
+++ b/boards/sim/sim/sim/configs/fluoride/defconfig
@@ -0,0 +1,80 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_FLUORIDE_EXAMPLES_A2DP_SOURCE is not set
+# CONFIG_FLUORIDE_EXAMPLES_RFCOMM is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_ARCH="sim"
+CONFIG_ARCH_BOARD="sim"
+CONFIG_ARCH_BOARD_SIM=y
+CONFIG_ARCH_CHIP="sim"
+CONFIG_ARCH_SIM=y
+CONFIG_AUDIO=y
+CONFIG_BOARDCTL_APP_SYMTAB=y
+CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARD_LOOPSPERMSEC=0
+CONFIG_BOOT_RUNFROMEXTSRAM=y
+CONFIG_BUILTIN=y
+CONFIG_CXX_RTTI=y
+CONFIG_DEBUG_ASSERTIONS=y
+CONFIG_DEBUG_ERROR=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEBUG_WARN=y
+CONFIG_DEV_LOOP=y
+CONFIG_DEV_ZERO=y
+CONFIG_DRIVERS_BLUETOOTH=y
+CONFIG_DRIVERS_WIRELESS=y
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_FLUORIDE_EXAMPLES=y
+CONFIG_FLUORIDE_HCI_H4=y
+CONFIG_FLUORIDE_HCI_UART_NAME="/dev/ttyBT0"
+CONFIG_FS_BINFS=y
+CONFIG_FS_HOSTFS=y
+CONFIG_FS_LARGEFILE=y
+CONFIG_FS_PROCFS=y
+CONFIG_FS_ROMFS=y
+CONFIG_HAVE_CXX=y
+CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_LIBCXX=y
+CONFIG_LIBCXXABI=y
+CONFIG_LIBC_ENVPATH=y
+CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_MAX_EXITFUNS=1
+CONFIG_LIB_FLUORIDE=y
+CONFIG_MM_FILL_ALLOCATIONS=y
+CONFIG_NET=y
+CONFIG_NET_LOCAL=y
+CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_TCP=y
+CONFIG_NET_UDP=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_ARCHROMFS=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_READLINE=y
+CONFIG_NSH_ROMFSDEVNO=1
+CONFIG_NSH_ROMFSETC=y
+CONFIG_PATH_INITIAL="/bin"
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
+CONFIG_PTHREAD_MUTEX_TYPES=y
+CONFIG_READLINE_TABCOMPLETION=y
+CONFIG_SCHED_HAVE_PARENT=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_LPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SIG_EVTHREAD=y
+CONFIG_SIG_EVTHREAD_HPWORK=y
+CONFIG_SIM_HCISOCKET=y
+CONFIG_SIM_HOSTFS=y
+CONFIG_SIM_M32=y
+CONFIG_START_MONTH=6
+CONFIG_START_YEAR=2008
+CONFIG_SYSLOG_CONSOLE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_TLS_TASK_NELEM=4
+CONFIG_UART_BTH4=y
diff --git a/boards/sim/sim/sim/src/etc/init.d/rcS b/boards/sim/sim/sim/src/etc/init.d/rcS
index 2cc08c80b4bac..be4fe5b1cde4e 100644
--- a/boards/sim/sim/sim/src/etc/init.d/rcS
+++ b/boards/sim/sim/sim/src/etc/init.d/rcS
@@ -17,3 +17,9 @@
  * under the License.
  *
  ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#ifdef CONFIG_SIM_HOSTFS
+mount -t hostfs -o fs=. /data
+#endif
diff --git a/include/sys/epoll.h b/include/sys/epoll.h
index 2652b8d8af012..9e3e1326bd065 100644
--- a/include/sys/epoll.h
+++ b/include/sys/epoll.h
@@ -40,8 +40,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <poll.h>
 #include <fcntl.h>
+#include "poll.h"
 
 /****************************************************************************
  * Pre-processor Definitions