3 files changed, 7 insertions, 9 deletions
diff --git a/include/Body.hpp b/include/Body.hpp
index 2a82406..65645e9 100644
--- a/include/Body.hpp
+++ b/include/Body.hpp
@@ -1,13 +1,9 @@
 #pragma once
 
 #include "BodyItem.hpp"
-#include "AsyncImageLoader.hpp"
 #include "RoundedRectangle.hpp"
 #include <SFML/Graphics/RectangleShape.hpp>
 #include <SFML/Graphics/Sprite.hpp>
-#include <json/value.h>
-#include <thread>
-#include <future>
 
 namespace sf {
     class RenderWindow;
@@ -16,6 +12,10 @@ namespace sf {
     class Event;
 }
 
+namespace Json {
+    class Value;
+}
+
 namespace QuickMedia {
     using BodyItemRenderCallback = std::function<void(std::shared_ptr<BodyItem> &body_item)>;
     // Return true to merge
diff --git a/include/QuickMedia.hpp b/include/QuickMedia.hpp
index 56e9d3f..19c634e 100644
--- a/include/QuickMedia.hpp
+++ b/include/QuickMedia.hpp
@@ -1,9 +1,7 @@
 #pragma once
 
 #include "Body.hpp"
-#include "SearchBar.hpp"
 #include "Page.hpp"
-#include "Storage.hpp"
 #include "Tab.hpp"
 #include "MessageQueue.hpp"
 #include "AsyncTask.hpp"
@@ -14,8 +12,8 @@
 #include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Shader.hpp>
-#include <json/value.h>
 #include <unordered_set>
+#include <json/value.h>
 #include <future>
 #include <thread>
 #include <stack>
@@ -32,6 +30,7 @@ namespace QuickMedia {
     class VideoPage;
     class Tabs;
     class VideoPlayer;
+    class SearchBar;
 
     enum class ImageViewMode {
         SINGLE,
diff --git a/include/Storage.hpp b/include/Storage.hpp
index 9107bb2..1bf44a9 100644
--- a/include/Storage.hpp
+++ b/include/Storage.hpp
@@ -2,7 +2,6 @@
 
 #include "Path.hpp"
 #include <functional>
-#include <filesystem>
 #include <rapidjson/fwd.h>
 
 namespace Json {
@@ -11,7 +10,7 @@ namespace Json {
 
 namespace QuickMedia {
     // Return false to stop the iterator
-    using FileIteratorCallback = std::function<bool(const std::filesystem::path &filepath)>;
+    using FileIteratorCallback = std::function<bool(const Path &filepath)>;
 
     enum class FileType {
         FILE_NOT_FOUND,