Fix imports after merge

4 files changed, 6 insertions, 4 deletions

diff --git a/src/tangara/lua/bridge.cpp b/src/tangara/lua/bridge.cpp
index 07c299a7..f1b17636 100644
--- a/src/tangara/lua/bridge.cpp
+++ b/src/tangara/lua/bridge.cpp
@@ -18,6 +18,7 @@
 #include "lua.hpp"
 #include "lua/lua_controls.hpp"
 #include "lua/lua_database.hpp"
+#include "lua/lua_filesystem.hpp"
 #include "lua/lua_queue.hpp"
 #include "lua/lua_screen.hpp"
 #include "lua/lua_theme.hpp"
@@ -86,6 +87,7 @@ auto Bridge::installBaseModules(lua_State* L) -> void {
   RegisterControlsModule(L);
   RegisterDatabaseModule(L);
   RegisterQueueModule(L);
+  RegisterFileSystemModule(L);
   RegisterVersionModule(L);
   RegisterThemeModule(L);
   RegisterScreenModule(L);
diff --git a/src/tangara/lua/file_iterator.cpp b/src/tangara/lua/file_iterator.cpp
index 194859a6..3afc57aa 100644
--- a/src/tangara/lua/file_iterator.cpp
+++ b/src/tangara/lua/file_iterator.cpp
@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: GPL-3.0-only
  */
-#include "file_iterator.hpp"
+#include "lua/file_iterator.hpp"
 #include "esp_log.h"
 
 #include <string>
 
 #include "ff.h"
-#include "spi.hpp"
+#include "drivers/spi.hpp"
 
 namespace database {
 
diff --git a/src/tangara/lua/lua_filesystem.cpp b/src/tangara/lua/lua_filesystem.cpp
index f0dbaf9a..ea08ca48 100644
--- a/src/tangara/lua/lua_filesystem.cpp
+++ b/src/tangara/lua/lua_filesystem.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "lua_filesystem.hpp"
+#include "lua/lua_filesystem.hpp"
 #include <string>
 #include <cstring>
 #include "lauxlib.h"
diff --git a/src/tangara/lua/lua_filesystem.hpp b/src/tangara/lua/lua_filesystem.hpp
index 2a829405..cb7170bd 100644
--- a/src/tangara/lua/lua_filesystem.hpp
+++ b/src/tangara/lua/lua_filesystem.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "lua.hpp"
-#include "file_iterator.hpp"
+#include "lua/file_iterator.hpp"
 
 namespace lua {