diff --git a/configure.ac b/configure.ac
index db9ac96e..8e89f31c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,8 @@ AC_CHECK_LIB(sysmodule_stub, cellSysmoduleLoadModule,
   LOL_LIBS="${LOL_LIBS} -lio_stub -lusbd_stub -lpadfilter"
   dnl  For the audio library
   LOL_LIBS="${LOL_LIBS} -laudio_stub -lspurs_stub -lmstreamSPURSMP3"
+  dnl  For the filesystem support
+  LOL_LIBS="${LOL_LIBS} -lfs_stub"
   dnl  Disable this warning, it's too verbose with vector.h
   AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-sign-compare"
   AC_PATH_PROG(MAKE_FSELF, make_fself, no)
diff --git a/src/lua/luaconf.h b/src/lua/luaconf.h
index e4335df9..27b5f23d 100644
--- a/src/lua/luaconf.h
+++ b/src/lua/luaconf.h
@@ -150,7 +150,11 @@
 
 #else				/* }{ */
 
+#if __cplusplus // LOL BEGIN
+#define LUA_API		extern "C"
+#else
 #define LUA_API		extern
+#endif // LOL END
 
 #endif				/* } */
 
diff --git a/src/sys/file.cpp b/src/sys/file.cpp
index 06e5bf6e..7598af6a 100644
--- a/src/sys/file.cpp
+++ b/src/sys/file.cpp
@@ -46,6 +46,8 @@ class FileData
         return m_fd > -1;
 #elif HAVE_STDIO_H
         return !!m_fd;
+#else
+        return false;
 #endif
     }
 
@@ -65,6 +67,8 @@ class FileData
             return -1;
 
         return (int)done;
+#else
+        return 0;
 #endif
     }