refactor: improve includes with iwyu

1 files changed, 22 insertions, 18 deletions

diff --git a/src/bootstrap.cpp b/src/bootstrap.cpp
index 12f7369..368f2a8 100644
--- a/src/bootstrap.cpp
+++ b/src/bootstrap.cpp
@@ -1,37 +1,41 @@
 #include "bootstrap.hpp"
 
-// Interfaces
-#include "interfaces/RLE_reader.hpp"
-#include "interfaces/cell_helper.hpp"
-#include "interfaces/component.hpp"
-#include "interfaces/component_renderer.hpp"
-#include "interfaces/cursor.hpp"
-#include "interfaces/engine.hpp"
-#include "interfaces/game.hpp"
-#include "interfaces/generation_tracker.hpp"
-#include "interfaces/input.hpp"
-#include "interfaces/matrix.hpp"
-#include "interfaces/scene.hpp"
-#include "interfaces/status_manager.hpp"
-#include "interfaces/statusline.hpp"
+#include <list>
+#include <memory>
+#include <vector>
+#include <yacppdic/factory.hpp>
 
-// Implementations
-#include "engine/data/bounds.hpp"
-#include "engine/data/vector2.hpp"
 #include "engine/engine.hpp"
 #include "engine/graphics/component_renderer.hpp"
 #include "engine/graphics/matrix.hpp"
+#include "engine/graphics/matrix_impl.hpp"
+#include "engine/graphics/matrix_iterator.hpp"
+#include "engine/graphics/matrix_iterator_impl.hpp"
 #include "engine/graphics/scene.hpp"
 #include "engine/user/cursor.hpp"
 #include "engine/user/input.hpp"
 #include "game/RLE_reader.hpp"
 #include "game/cell_helper.hpp"
+#include "game/cell_helper_impl.hpp"
 #include "game/components/statusline.hpp"
 #include "game/game.hpp"
 #include "game/generation_tracker.hpp"
 #include "game/status_manager.hpp"
+#include "interfaces/RLE_reader.hpp"
+#include "interfaces/cell_helper.hpp"
+#include "interfaces/component.hpp"
+#include "interfaces/component_renderer.hpp"
+#include "interfaces/cursor.hpp"
+#include "interfaces/engine.hpp"
+#include "interfaces/game.hpp"
+#include "interfaces/generation_tracker.hpp"
+#include "interfaces/input.hpp"
+#include "interfaces/matrix.hpp"
+#include "interfaces/scene.hpp"
+#include "interfaces/status_manager.hpp"
+#include "interfaces/statusline.hpp"
 
-#include <memory>
+class Bounds;
 
 auto bootstrap() noexcept -> yacppdic::DIContainer
 {