diff --git a/android/filament-android/src/main/cpp/Engine.cpp b/android/filament-android/src/main/cpp/Engine.cpp
index e208fb9415..2ebbc10ed3 100644
--- a/android/filament-android/src/main/cpp/Engine.cpp
+++ b/android/filament-android/src/main/cpp/Engine.cpp
@@ -18,6 +18,9 @@
 
 #include <filament/Engine.h>
 
+#include <utils/Entity.h>
+#include <utils/EntityManager.h>
+
 using namespace filament;
 using namespace utils;
 
diff --git a/android/filament-android/src/main/cpp/IndexBuffer.cpp b/android/filament-android/src/main/cpp/IndexBuffer.cpp
index f39906da17..86515e7485 100644
--- a/android/filament-android/src/main/cpp/IndexBuffer.cpp
+++ b/android/filament-android/src/main/cpp/IndexBuffer.cpp
@@ -22,6 +22,8 @@
 
 #include <filament/IndexBuffer.h>
 
+#include <backend/BufferDescriptor.h>
+
 #include "common/CallbackUtils.h"
 #include "common/NioUtils.h"
 
diff --git a/android/filament-android/src/main/cpp/LightManager.cpp b/android/filament-android/src/main/cpp/LightManager.cpp
index 4c8617f60b..f5328a4c0a 100644
--- a/android/filament-android/src/main/cpp/LightManager.cpp
+++ b/android/filament-android/src/main/cpp/LightManager.cpp
@@ -18,6 +18,8 @@
 
 #include <filament/LightManager.h>
 
+#include <utils/Entity.h>
+
 using namespace filament;
 using namespace utils;
 
diff --git a/android/filament-android/src/main/cpp/RenderableManager.cpp b/android/filament-android/src/main/cpp/RenderableManager.cpp
index caaa8c4aea..3512e69e53 100644
--- a/android/filament-android/src/main/cpp/RenderableManager.cpp
+++ b/android/filament-android/src/main/cpp/RenderableManager.cpp
@@ -18,6 +18,10 @@
 #include <jni.h>
 
 #include <filament/RenderableManager.h>
+#include <filament/MaterialInstance.h>
+
+#include <utils/Entity.h>
+
 #include "common/NioUtils.h"
 
 using namespace filament;
diff --git a/android/filament-android/src/main/cpp/Scene.cpp b/android/filament-android/src/main/cpp/Scene.cpp
index 8024120c28..70250c56b1 100644
--- a/android/filament-android/src/main/cpp/Scene.cpp
+++ b/android/filament-android/src/main/cpp/Scene.cpp
@@ -18,6 +18,8 @@
 
 #include <filament/Scene.h>
 
+#include <utils/Entity.h>
+
 using namespace filament;
 using namespace utils;
 
diff --git a/android/filament-android/src/main/cpp/View.cpp b/android/filament-android/src/main/cpp/View.cpp
index 65e86a6b55..2343181102 100644
--- a/android/filament-android/src/main/cpp/View.cpp
+++ b/android/filament-android/src/main/cpp/View.cpp
@@ -17,6 +17,7 @@
 #include <jni.h>
 
 #include <filament/View.h>
+#include <filament/Viewport.h>
 
 using namespace filament;
 
diff --git a/filament/include/filament/Camera.h b/filament/include/filament/Camera.h
index 5eb0a9396c..ae97ff3a46 100644
--- a/filament/include/filament/Camera.h
+++ b/filament/include/filament/Camera.h
@@ -19,14 +19,16 @@
 #ifndef TNT_FILAMENT_CAMERA_H
 #define TNT_FILAMENT_CAMERA_H
 
-#include <filament/Frustum.h>
 #include <filament/FilamentAPI.h>
 
-#include <utils/Entity.h>
 #include <utils/compiler.h>
 
 #include <math/mat4.h>
 
+namespace utils {
+class Entity;
+} // namespace utils
+
 namespace filament {
 
 /**
@@ -289,7 +291,7 @@ public:
     math::float3 getForwardVector() const noexcept;
 
     //! Returns a Frustum object in world space
-    Frustum getFrustum() const noexcept;
+    class Frustum getFrustum() const noexcept;
 
     //! Returns the entity representing this camera
     utils::Entity getEntity() const noexcept;
diff --git a/filament/include/filament/Engine.h b/filament/include/filament/Engine.h
index a6296a8387..01f878404a 100644
--- a/filament/include/filament/Engine.h
+++ b/filament/include/filament/Engine.h
@@ -17,14 +17,13 @@
 #ifndef TNT_FILAMENT_ENGINE_H
 #define TNT_FILAMENT_ENGINE_H
 
-#include <filament/Camera.h>
-#include <filament/Fence.h>
-#include <filament/SwapChain.h>
-
 #include <backend/Platform.h>
 
 #include <utils/compiler.h>
-#include <utils/EntityManager.h>
+
+namespace utils {
+class Entity;
+} // namespace utils
 
 namespace filament {
 
@@ -40,6 +39,7 @@ class RenderTarget;
 class Scene;
 class Skybox;
 class Stream;
+class SwapChain;
 class Texture;
 class VertexBuffer;
 class View;
@@ -398,9 +398,7 @@ public:
      *
      * @return A camera component
      */
-    inline Camera* createCamera() noexcept {
-        return createCamera(utils::EntityManager::get().create());
-    }
+    Camera* createCamera() noexcept;
 
     /**
      * helper for destroying the Camera component and its Entity in one call
@@ -409,9 +407,7 @@ public:
      *               components managed by filament are destroyed.
      * @deprecated use destroyCameraComponent(Entity) instead
      */
-    inline void destroy(const Camera* camera) {
-        destroy(camera->getEntity());
-    }
+    void destroy(const Camera* camera);
 
    /**
      * Invokes one iteration of the render loop, used only on single-threaded platforms.
diff --git a/filament/include/filament/Frustum.h b/filament/include/filament/Frustum.h
index ae1cc8d31e..2cedf00013 100644
--- a/filament/include/filament/Frustum.h
+++ b/filament/include/filament/Frustum.h
@@ -19,8 +19,6 @@
 #ifndef TNT_FILAMENT_FRUSTUM_H
 #define TNT_FILAMENT_FRUSTUM_H
 
-#include <filament/Box.h>
-
 #include <utils/compiler.h>
 
 #include <math/mat4.h>
@@ -29,6 +27,8 @@
 
 namespace filament {
 
+class Box;
+
 namespace details {
 class Culler;
 } // namespace details;
diff --git a/filament/include/filament/LightManager.h b/filament/include/filament/LightManager.h
index cea34870bd..6c8ebbb963 100644
--- a/filament/include/filament/LightManager.h
+++ b/filament/include/filament/LightManager.h
@@ -21,13 +21,16 @@
 #include <filament/Color.h>
 
 #include <utils/compiler.h>
-#include <utils/Entity.h>
 #include <utils/EntityInstance.h>
 
 #include <math/vec3.h>
 
 #include <math.h>
 
+namespace utils {
+    class Entity;
+} // namespace utils
+
 namespace filament {
 
 class Engine;
diff --git a/filament/include/filament/Material.h b/filament/include/filament/Material.h
index f26643a828..ba82945a04 100644
--- a/filament/include/filament/Material.h
+++ b/filament/include/filament/Material.h
@@ -21,22 +21,27 @@
 #include <filament/FilamentAPI.h>
 #include <filament/MaterialEnums.h>
 #include <filament/MaterialInstance.h>
-#include <filament/Texture.h>
-#include <filament/TextureSampler.h>
 
 #include <backend/DriverEnums.h>
 
 #include <utils/compiler.h>
-#include <utils/CString.h>
 
 #include <math/vec4.h>
 
 #include <stdint.h>
 
+namespace utils {
+    class CString;
+} // namespace utils
+
 namespace filament {
+
+class Texture;
+class TextureSampler;
+
 namespace details {
-class  FEngine;
-class  FMaterial;
+class FEngine;
+class FMaterial;
 } // namespace details
 
 class Engine;
diff --git a/filament/include/filament/MaterialInstance.h b/filament/include/filament/MaterialInstance.h
index db251a886f..125b8fd8d1 100644
--- a/filament/include/filament/MaterialInstance.h
+++ b/filament/include/filament/MaterialInstance.h
@@ -19,7 +19,6 @@
 
 #include <filament/FilamentAPI.h>
 #include <filament/Color.h>
-#include <filament/TextureSampler.h>
 
 #include <backend/DriverEnums.h>
 
@@ -29,6 +28,7 @@ namespace filament {
 
 class Material;
 class Texture;
+class TextureSampler;
 class UniformBuffer;
 class UniformInterfaceBlock;
 
diff --git a/filament/include/filament/RenderableManager.h b/filament/include/filament/RenderableManager.h
index e1bc7f03d9..6e95d8289d 100644
--- a/filament/include/filament/RenderableManager.h
+++ b/filament/include/filament/RenderableManager.h
@@ -18,15 +18,12 @@
 #define TNT_FILAMENT_RENDERABLECOMPONENTMANAGER_H
 
 #include <filament/Box.h>
-#include <filament/VertexBuffer.h>
-#include <filament/IndexBuffer.h>
-#include <filament/Material.h>
-#include <filament/MaterialInstance.h>
-#include <filament/Renderer.h>
 #include <filament/FilamentAPI.h>
+#include <filament/MaterialEnums.h>
+
+#include <backend/DriverEnums.h>
 
 #include <utils/compiler.h>
-#include <utils/Entity.h>
 #include <utils/EntityInstance.h>
 
 #include <math/mat4.h>
@@ -35,8 +32,19 @@
 
 #include <type_traits>
 
+namespace utils {
+    class Entity;
+} // namespace utils
+
 namespace filament {
 
+class Engine;
+class IndexBuffer;
+class Material;
+class MaterialInstance;
+class Renderer;
+class VertexBuffer;
+
 namespace details {
 class FEngine;
 class FRenderPrimitive;
diff --git a/filament/include/filament/Renderer.h b/filament/include/filament/Renderer.h
index f9c9811fcc..e375e9307d 100644
--- a/filament/include/filament/Renderer.h
+++ b/filament/include/filament/Renderer.h
@@ -20,7 +20,6 @@
 #define TNT_FILAMENT_RENDERER_H
 
 #include <filament/FilamentAPI.h>
-#include <filament/Viewport.h>
 
 #include <utils/compiler.h>
 
@@ -34,6 +33,7 @@ class Engine;
 class RenderTarget;
 class SwapChain;
 class View;
+class Viewport;
 
 namespace backend {
 class PixelBufferDescriptor;
diff --git a/filament/include/filament/Scene.h b/filament/include/filament/Scene.h
index 661dc6256f..6a15463dd8 100644
--- a/filament/include/filament/Scene.h
+++ b/filament/include/filament/Scene.h
@@ -22,7 +22,10 @@
 #include <filament/FilamentAPI.h>
 
 #include <utils/compiler.h>
-#include <utils/Entity.h>
+
+namespace utils {
+    class Entity;
+} // namespace utils
 
 namespace filament {
 
diff --git a/filament/include/filament/TransformManager.h b/filament/include/filament/TransformManager.h
index b023b50c48..c5837fc402 100644
--- a/filament/include/filament/TransformManager.h
+++ b/filament/include/filament/TransformManager.h
@@ -20,13 +20,17 @@
 #include <filament/FilamentAPI.h>
 
 #include <utils/compiler.h>
-#include <utils/Entity.h>
 #include <utils/EntityInstance.h>
 
 #include <math/mat4.h>
 
 #include <iterator>
 
+
+namespace utils {
+class Entity;
+} // namespace utils
+
 namespace filament {
 
 namespace details {
diff --git a/filament/include/filament/VertexBuffer.h b/filament/include/filament/VertexBuffer.h
index 353a05f08f..cba561d82d 100644
--- a/filament/include/filament/VertexBuffer.h
+++ b/filament/include/filament/VertexBuffer.h
@@ -23,7 +23,6 @@
 #include <filament/MaterialEnums.h>
 
 #include <backend/BufferDescriptor.h>
-
 #include <backend/DriverEnums.h>
 
 #include <utils/compiler.h>
diff --git a/filament/include/filament/View.h b/filament/include/filament/View.h
index ded6aa9878..fb962b0fbd 100644
--- a/filament/include/filament/View.h
+++ b/filament/include/filament/View.h
@@ -19,9 +19,7 @@
 #ifndef TNT_FILAMENT_VIEW_H
 #define TNT_FILAMENT_VIEW_H
 
-#include <filament/Camera.h>
 #include <filament/Color.h>
-#include <filament/Viewport.h>
 #include <filament/FilamentAPI.h>
 
 #include <backend/DriverEnums.h>
@@ -37,6 +35,7 @@ class Camera;
 class MaterialInstance;
 class RenderTarget;
 class Scene;
+class Viewport;
 
 /**
  * A View encompasses all the state needed for rendering a Scene.
diff --git a/filament/src/Culler.cpp b/filament/src/Culler.cpp
index 86294579f8..7b95751c6e 100644
--- a/filament/src/Culler.cpp
+++ b/filament/src/Culler.cpp
@@ -16,6 +16,8 @@
 
 #include "details/Culler.h"
 
+#include <filament/Box.h>
+
 #include <math/fast.h>
 
 using namespace filament::math;
diff --git a/filament/src/Engine.cpp b/filament/src/Engine.cpp
index e3cae5b350..233584e815 100644
--- a/filament/src/Engine.cpp
+++ b/filament/src/Engine.cpp
@@ -970,5 +970,12 @@ DebugRegistry& Engine::getDebugRegistry() noexcept {
     return upcast(this)->getDebugRegistry();
 }
 
+Camera* Engine::createCamera() noexcept {
+    return createCamera(utils::EntityManager::get().create());
+}
+
+void Engine::destroy(const Camera* camera) {
+    destroy(camera->getEntity());
+}
 
 } // namespace filament
diff --git a/filament/src/Material.cpp b/filament/src/Material.cpp
index 584a818e0d..a30449138c 100644
--- a/filament/src/Material.cpp
+++ b/filament/src/Material.cpp
@@ -34,6 +34,7 @@
 
 #include <MaterialParser.h>
 
+#include <utils/CString.h>
 #include <utils/Panic.h>
 
 #include <sstream>
diff --git a/filament/src/MaterialInstance.cpp b/filament/src/MaterialInstance.cpp
index 2511f11a20..5fde72e3d1 100644
--- a/filament/src/MaterialInstance.cpp
+++ b/filament/src/MaterialInstance.cpp
@@ -16,12 +16,12 @@
 
 #include <filament/MaterialInstance.h>
 
+#include <filament/TextureSampler.h>
+
 #include "details/MaterialInstance.h"
 
 #include "RenderPass.h"
 
-#include <private/filament/UniformInterfaceBlock.h>
-
 #include "details/Engine.h"
 #include "details/Material.h"
 #include "details/Texture.h"
diff --git a/filament/src/PostProcessManager.cpp b/filament/src/PostProcessManager.cpp
index 06dad7a4a1..81ff9991e0 100644
--- a/filament/src/PostProcessManager.cpp
+++ b/filament/src/PostProcessManager.cpp
@@ -19,6 +19,7 @@
 #include "details/Engine.h"
 
 #include "fg/FrameGraph.h"
+#include "fg/FrameGraphPassResources.h"
 
 #include "RenderPass.h"
 
diff --git a/filament/src/Renderer.cpp b/filament/src/Renderer.cpp
index e205833ac1..8726fdee01 100644
--- a/filament/src/Renderer.cpp
+++ b/filament/src/Renderer.cpp
@@ -31,6 +31,7 @@
 
 #include "fg/FrameGraph.h"
 #include "fg/FrameGraphHandle.h"
+#include "fg/FrameGraphPassResources.h"
 #include "fg/ResourceAllocator.h"
 
 
diff --git a/filament/src/Skybox.cpp b/filament/src/Skybox.cpp
index 8f05f87f0e..6d8112eb32 100644
--- a/filament/src/Skybox.cpp
+++ b/filament/src/Skybox.cpp
@@ -26,6 +26,8 @@
 
 #include "FilamentAPI-impl.h"
 
+#include <filament/TextureSampler.h>
+
 #include <backend/DriverEnums.h>
 
 #include <utils/Panic.h>
diff --git a/filament/src/View.cpp b/filament/src/View.cpp
index 33ba2d8820..cd42d4d77a 100644
--- a/filament/src/View.cpp
+++ b/filament/src/View.cpp
@@ -28,6 +28,7 @@
 #include "details/Skybox.h"
 
 #include <filament/Exposure.h>
+#include <filament/TextureSampler.h>
 
 #include <private/filament/SibGenerator.h>
 #include <private/filament/UibGenerator.h>
diff --git a/filament/src/components/RenderableManager.h b/filament/src/components/RenderableManager.h
index 70b8eeb06b..63969841d9 100644
--- a/filament/src/components/RenderableManager.h
+++ b/filament/src/components/RenderableManager.h
@@ -43,6 +43,8 @@ namespace details {
 
 class FMaterialInstance;
 class FRenderPrimitive;
+class FIndexBuffer;
+class FVertexBuffer;
 
 class FRenderableManager : public RenderableManager {
 public:
diff --git a/filament/src/details/Engine.h b/filament/src/details/Engine.h
index 9e5da6ca37..38163cd7f5 100644
--- a/filament/src/details/Engine.h
+++ b/filament/src/details/Engine.h
@@ -29,6 +29,7 @@
 #include "details/Camera.h"
 #include "details/DebugRegistry.h"
 #include "details/Fence.h"
+#include "details/IndexBuffer.h"
 #include "details/RenderTarget.h"
 #include "details/ResourceList.h"
 #include "details/Skybox.h"
diff --git a/filament/src/fg/FrameGraph.h b/filament/src/fg/FrameGraph.h
index e7ba1e103b..0889014b87 100644
--- a/filament/src/fg/FrameGraph.h
+++ b/filament/src/fg/FrameGraph.h
@@ -21,7 +21,6 @@
 #include "Blackboard.h"
 #include "FrameGraphPass.h"
 #include "FrameGraphHandle.h"
-#include "FrameGraphPassResources.h"
 
 #include <fg/fg/ResourceEntry.h>
 
diff --git a/filament/src/fg/fg/PassNode.h b/filament/src/fg/fg/PassNode.h
index 65e30903b3..70b68be6ca 100644
--- a/filament/src/fg/fg/PassNode.h
+++ b/filament/src/fg/fg/PassNode.h
@@ -19,9 +19,6 @@
 
 #include "fg/FrameGraph.h"
 
-#include "ResourceNode.h"
-#include "VirtualResource.h"
-
 #include <vector>
 
 #include <stdint.h>
@@ -29,6 +26,9 @@
 namespace filament {
 namespace fg {
 
+struct ResourceNode;
+struct VirtualResource;
+
 struct PassNode { // 200
     template <typename T>
     using Vector = FrameGraph::Vector<T>;
diff --git a/filament/src/fg/fg/RenderTarget.cpp b/filament/src/fg/fg/RenderTarget.cpp
index d3c2a1800d..f51a5008e1 100644
--- a/filament/src/fg/fg/RenderTarget.cpp
+++ b/filament/src/fg/fg/RenderTarget.cpp
@@ -16,6 +16,12 @@
 
 #include "RenderTarget.h"
 
+#include "fg/FrameGraph.h"
+
+#include "RenderTargetResource.h"
+
+#include "details/Texture.h"
+
 #include <backend/DriverEnums.h>
 
 namespace filament {
diff --git a/filament/src/fg/fg/RenderTarget.h b/filament/src/fg/fg/RenderTarget.h
index 8eae6a14ec..f91889dc2a 100644
--- a/filament/src/fg/fg/RenderTarget.h
+++ b/filament/src/fg/fg/RenderTarget.h
@@ -19,18 +19,18 @@
 
 #include <backend/DriverEnums.h>
 
-#include "details/Texture.h"
-
-#include "fg/FrameGraph.h"
 #include "fg/FrameGraphHandle.h"
 
-#include "RenderTargetResource.h"
-
 #include <stdint.h>
 
 namespace filament {
+
+class FrameGraph;
+
 namespace fg {
 
+struct RenderTargetResource;
+
 struct RenderTarget { // 32
     RenderTarget(const char* name,
             FrameGraphRenderTarget::Descriptor const& desc, uint16_t index) noexcept
diff --git a/filament/src/fg/fg/RenderTargetResource.h b/filament/src/fg/fg/RenderTargetResource.h
index 104f35b23d..97b2caffa3 100644
--- a/filament/src/fg/fg/RenderTargetResource.h
+++ b/filament/src/fg/fg/RenderTargetResource.h
@@ -21,8 +21,9 @@
 #include <backend/TargetBufferInfo.h>
 
 #include "fg/FrameGraph.h"
-
+#include "fg/FrameGraphPassResources.h"
 #include "fg/ResourceAllocator.h"
+
 #include "ResourceNode.h"
 #include "VirtualResource.h"
 
diff --git a/filament/test/filament_rendering_test.cpp b/filament/test/filament_rendering_test.cpp
index c03cb0eaf3..645e628ef4 100644
--- a/filament/test/filament_rendering_test.cpp
+++ b/filament/test/filament_rendering_test.cpp
@@ -19,6 +19,8 @@
 #include <filament/Engine.h>
 #include <filament/Renderer.h>
 #include <filament/View.h>
+#include <filament/Viewport.h>
+
 #include <backend/PixelBufferDescriptor.h>
 
 using namespace filament;
diff --git a/libs/filagui/include/filagui/ImGuiHelper.h b/libs/filagui/include/filagui/ImGuiHelper.h
index 8a7ea336fb..aee4040e4c 100644
--- a/libs/filagui/include/filagui/ImGuiHelper.h
+++ b/libs/filagui/include/filagui/ImGuiHelper.h
@@ -28,6 +28,7 @@
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/Entity.h>
 #include <utils/Path.h>
 
 struct ImDrawData;
diff --git a/libs/filagui/src/ImGuiHelper.cpp b/libs/filagui/src/ImGuiHelper.cpp
index 60f5e75676..70eec6075b 100644
--- a/libs/filagui/src/ImGuiHelper.cpp
+++ b/libs/filagui/src/ImGuiHelper.cpp
@@ -22,14 +22,16 @@
 #include <imgui.h>
 
 #include <filamat/MaterialBuilder.h>
-#include <filament/VertexBuffer.h>
+#include <filament/Fence.h>
 #include <filament/IndexBuffer.h>
 #include <filament/Material.h>
 #include <filament/MaterialInstance.h>
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/Texture.h>
+#include <filament/TextureSampler.h>
 #include <filament/TransformManager.h>
+#include <filament/VertexBuffer.h>
 #include <utils/EntityManager.h>
 
 using namespace filament::math;
diff --git a/libs/filameshio/src/MeshReader.cpp b/libs/filameshio/src/MeshReader.cpp
index 673e309312..8521c24ea2 100644
--- a/libs/filameshio/src/MeshReader.cpp
+++ b/libs/filameshio/src/MeshReader.cpp
@@ -20,9 +20,11 @@
 #include <filament/Box.h>
 #include <filament/Engine.h>
 #include <filament/Fence.h>
+#include <filament/IndexBuffer.h>
 #include <filament/Material.h>
 #include <filament/MaterialInstance.h>
 #include <filament/RenderableManager.h>
+#include <filament/VertexBuffer.h>
 
 #include <meshoptimizer.h>
 
diff --git a/libs/gltfio/include/gltfio/AssetLoader.h b/libs/gltfio/include/gltfio/AssetLoader.h
index a51ef05f17..f09226fd94 100644
--- a/libs/gltfio/include/gltfio/AssetLoader.h
+++ b/libs/gltfio/include/gltfio/AssetLoader.h
@@ -24,6 +24,7 @@
 #include <gltfio/MaterialProvider.h>
 
 namespace utils {
+    class EntityManager;
     class NameComponentManager;
 }
 
diff --git a/libs/gltfio/include/gltfio/SimpleViewer.h b/libs/gltfio/include/gltfio/SimpleViewer.h
index 009274c5e5..42102a7c5a 100644
--- a/libs/gltfio/include/gltfio/SimpleViewer.h
+++ b/libs/gltfio/include/gltfio/SimpleViewer.h
@@ -214,6 +214,8 @@ filament::math::mat4f fitIntoUnitCube(const filament::Aabb& bounds);
 #include <filament/LightManager.h>
 #include <filament/Material.h>
 
+#include <utils/EntityManager.h>
+
 #include <math/mat4.h>
 #include <math/vec3.h>
 
diff --git a/libs/gltfio/src/UbershaderLoader.cpp b/libs/gltfio/src/UbershaderLoader.cpp
index 3de1d955bf..8ac495050f 100644
--- a/libs/gltfio/src/UbershaderLoader.cpp
+++ b/libs/gltfio/src/UbershaderLoader.cpp
@@ -17,6 +17,8 @@
 #include <gltfio/MaterialProvider.h>
 
 #include <filament/MaterialInstance.h>
+#include <filament/Texture.h>
+#include <filament/TextureSampler.h>
 
 #include <math/mat4.h>
 
diff --git a/samples/app/Cube.h b/samples/app/Cube.h
index 01dee127c4..778c645fd0 100644
--- a/samples/app/Cube.h
+++ b/samples/app/Cube.h
@@ -20,6 +20,7 @@
 #include <vector>
 
 #include <filament/Engine.h>
+#include <filament/Box.h>
 #include <filament/Camera.h>
 #include <filament/Material.h>
 #include <filament/MaterialInstance.h>
diff --git a/samples/app/Sphere.cpp b/samples/app/Sphere.cpp
index b878556180..6d7978aea5 100644
--- a/samples/app/Sphere.cpp
+++ b/samples/app/Sphere.cpp
@@ -19,6 +19,7 @@
 
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
+#include <filament/Material.h>
 #include <filament/RenderableManager.h>
 #include <filament/TransformManager.h>
 #include <filament/VertexBuffer.h>
diff --git a/samples/frame_generator.cpp b/samples/frame_generator.cpp
index e843dc85c4..d454b41755 100644
--- a/samples/frame_generator.cpp
+++ b/samples/frame_generator.cpp
@@ -36,6 +36,7 @@
 #include <filament/LightManager.h>
 #include <filament/Material.h>
 #include <filament/MaterialInstance.h>
+#include <filament/Renderer.h>
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/Skybox.h>
diff --git a/samples/gltf_baker.cpp b/samples/gltf_baker.cpp
index 608da542c1..f25881b71d 100644
--- a/samples/gltf_baker.cpp
+++ b/samples/gltf_baker.cpp
@@ -22,9 +22,12 @@
 
 #include <filagui/ImGuiMath.h>
 
+#include <filament/Camera.h>
 #include <filament/Engine.h>
+#include <filament/IndexBuffer.h>
 #include <filament/Scene.h>
 #include <filament/View.h>
+#include <filament/VertexBuffer.h>
 
 #include <gltfio/AssetLoader.h>
 #include <gltfio/AssetPipeline.h>
diff --git a/samples/heightfield.cpp b/samples/heightfield.cpp
index f9aac6a371..4a441948c1 100644
--- a/samples/heightfield.cpp
+++ b/samples/heightfield.cpp
@@ -22,10 +22,12 @@
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/Texture.h>
+#include <filament/TextureSampler.h>
 #include <filament/TransformManager.h>
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
 #include <utils/JobSystem.h>
 #include <utils/Path.h>
 
diff --git a/samples/lightbulb.cpp b/samples/lightbulb.cpp
index 3bcdd421bf..027dfa28bb 100644
--- a/samples/lightbulb.cpp
+++ b/samples/lightbulb.cpp
@@ -25,11 +25,13 @@
 #include <utils/Path.h>
 
 #include <filament/Engine.h>
+#include <filament/IndexBuffer.h>
 #include <filament/Material.h>
 #include <filament/Scene.h>
 #include <filament/LightManager.h>
 #include <filament/RenderableManager.h>
 #include <filament/TransformManager.h>
+#include <filament/VertexBuffer.h>
 
 #include <math/norm.h>
 #include <utils/Log.h>
diff --git a/samples/lucy_bloom.cpp b/samples/lucy_bloom.cpp
index d40ee03ed7..935e18f464 100644
--- a/samples/lucy_bloom.cpp
+++ b/samples/lucy_bloom.cpp
@@ -18,6 +18,7 @@
 #include "app/FilamentApp.h"
 #include "app/IBL.h"
 
+#include <filament/Camera.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/IndirectLight.h>
@@ -31,6 +32,8 @@
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include <gltfio/AssetLoader.h>
 #include <gltfio/FilamentAsset.h>
 #include <gltfio/ResourceLoader.h>
diff --git a/samples/lucy_utils.cpp b/samples/lucy_utils.cpp
index 622127a29a..c1b0281ebf 100644
--- a/samples/lucy_utils.cpp
+++ b/samples/lucy_utils.cpp
@@ -21,14 +21,19 @@
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/IndirectLight.h>
+#include <filament/Material.h>
 #include <filament/MaterialInstance.h>
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/TransformManager.h>
+#include <filament/TextureSampler.h>
 #include <filament/VertexBuffer.h>
 
 #include <geometry/SurfaceOrientation.h>
 
+#include <utils/Entity.h>
+#include <utils/EntityManager.h>
+
 #include <stb_image.h>
 
 using namespace filament;
diff --git a/samples/material_sandbox.cpp b/samples/material_sandbox.cpp
index 3155e52451..54a0bc4d55 100644
--- a/samples/material_sandbox.cpp
+++ b/samples/material_sandbox.cpp
@@ -29,6 +29,7 @@
 #include <filament/Engine.h>
 #include <filament/DebugRegistry.h>
 #include <filament/IndirectLight.h>
+#include <filament/IndexBuffer.h>
 #include <filament/LightManager.h>
 #include <filament/Material.h>
 #include <filament/MaterialInstance.h>
@@ -36,6 +37,7 @@
 #include <filament/Scene.h>
 #include <filament/TransformManager.h>
 #include <filament/View.h>
+#include <filament/VertexBuffer.h>
 
 #include <math/mat3.h>
 #include <math/mat4.h>
diff --git a/samples/point_sprites.cpp b/samples/point_sprites.cpp
index 28ebd557aa..a86ebfec6b 100644
--- a/samples/point_sprites.cpp
+++ b/samples/point_sprites.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <filament/Camera.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/Material.h>
@@ -21,9 +22,12 @@
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/TransformManager.h>
+#include <filament/TextureSampler.h>
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include <image/ImageSampler.h>
 #include <image/LinearImage.h>
 
diff --git a/samples/sample_cloth.cpp b/samples/sample_cloth.cpp
index e915717204..a7c6196601 100644
--- a/samples/sample_cloth.cpp
+++ b/samples/sample_cloth.cpp
@@ -28,9 +28,10 @@
 #include <filament/Material.h>
 #include <filament/MaterialInstance.h>
 #include <filament/RenderableManager.h>
-#include <filament/TransformManager.h>
 #include <filament/Scene.h>
 #include <filament/Texture.h>
+#include <filament/TextureSampler.h>
+#include <filament/TransformManager.h>
 
 #include <math/mat3.h>
 #include <math/mat4.h>
diff --git a/samples/sample_normal_map.cpp b/samples/sample_normal_map.cpp
index 91a665acd9..76c664290f 100644
--- a/samples/sample_normal_map.cpp
+++ b/samples/sample_normal_map.cpp
@@ -28,6 +28,7 @@
 #include <filament/Material.h>
 #include <filament/MaterialInstance.h>
 #include <filament/RenderableManager.h>
+#include <filament/TextureSampler.h>
 #include <filament/TransformManager.h>
 #include <filament/Scene.h>
 #include <filament/Texture.h>
diff --git a/samples/suzanne.cpp b/samples/suzanne.cpp
index f1e41af611..9ba52058ba 100644
--- a/samples/suzanne.cpp
+++ b/samples/suzanne.cpp
@@ -17,11 +17,15 @@
 #include <filament/Engine.h>
 #include <filament/IndirectLight.h>
 #include <filament/LightManager.h>
+#include <filament/Material.h>
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
+#include <filament/TextureSampler.h>
 #include <filament/TransformManager.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include <filameshio/MeshReader.h>
 
 #include <image/KtxBundle.h>
diff --git a/samples/vk_animation.cpp b/samples/vk_animation.cpp
index 5a617ad3ab..e045605127 100644
--- a/samples/vk_animation.cpp
+++ b/samples/vk_animation.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <filament/Camera.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/Material.h>
@@ -24,6 +25,8 @@
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include "../samples/app/Config.h"
 #include "../samples/app/FilamentApp.h"
 
diff --git a/samples/vk_depthtesting.cpp b/samples/vk_depthtesting.cpp
index 16c84e2840..ea9146cc0c 100644
--- a/samples/vk_depthtesting.cpp
+++ b/samples/vk_depthtesting.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <filament/Camera.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/Material.h>
@@ -24,6 +25,8 @@
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include "../samples/app/Config.h"
 #include "../samples/app/FilamentApp.h"
 
diff --git a/samples/vk_hellopbr.cpp b/samples/vk_hellopbr.cpp
index 25bdee9e80..9ca75e39c4 100644
--- a/samples/vk_hellopbr.cpp
+++ b/samples/vk_hellopbr.cpp
@@ -16,11 +16,14 @@
 
 #include <filament/Engine.h>
 #include <filament/LightManager.h>
+#include <filament/Material.h>
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/TransformManager.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include <filameshio/MeshReader.h>
 
 #include "app/Config.h"
diff --git a/samples/vk_hellotriangle.cpp b/samples/vk_hellotriangle.cpp
index a839f34ef2..cdb252cadc 100644
--- a/samples/vk_hellotriangle.cpp
+++ b/samples/vk_hellotriangle.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <filament/Camera.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/Material.h>
@@ -24,6 +25,8 @@
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include "../samples/app/Config.h"
 #include "../samples/app/FilamentApp.h"
 
diff --git a/samples/vk_shadowtest.cpp b/samples/vk_shadowtest.cpp
index 7811a92293..011f428187 100644
--- a/samples/vk_shadowtest.cpp
+++ b/samples/vk_shadowtest.cpp
@@ -15,11 +15,15 @@
  */
 
 #include <filament/Engine.h>
+#include <filament/IndexBuffer.h>
 #include <filament/LightManager.h>
+#include <filament/Material.h>
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/Skybox.h>
+#include <filament/TextureSampler.h>
 #include <filament/TransformManager.h>
+#include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
 #include <math/norm.h>
diff --git a/samples/vk_texturedquad.cpp b/samples/vk_texturedquad.cpp
index 92e74b3db8..3b3ef6112d 100644
--- a/samples/vk_texturedquad.cpp
+++ b/samples/vk_texturedquad.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <filament/Camera.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/Material.h>
@@ -21,9 +22,12 @@
 #include <filament/RenderableManager.h>
 #include <filament/Scene.h>
 #include <filament/Texture.h>
+#include <filament/TextureSampler.h>
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
 
+#include <utils/EntityManager.h>
+
 #include <utils/Path.h>
 
 #include "../samples/app/Config.h"
diff --git a/samples/vk_vbotest.cpp b/samples/vk_vbotest.cpp
index c6fb5d00bd..23db5d27fc 100644
--- a/samples/vk_vbotest.cpp
+++ b/samples/vk_vbotest.cpp
@@ -23,6 +23,8 @@
 
 #include "../samples/app/FilamentApp.h"
 
+#include <utils/EntityManager.h>
+
 #include "generated/resources/resources.h"
 
 using namespace filament;
diff --git a/samples/vk_viewtest.cpp b/samples/vk_viewtest.cpp
index 0ba3895c27..68a21aca5a 100644
--- a/samples/vk_viewtest.cpp
+++ b/samples/vk_viewtest.cpp
@@ -22,6 +22,8 @@
 
 #include "../samples/app/FilamentApp.h"
 
+#include <utils/EntityManager.h>
+
 using namespace filament;
 
 struct App {
diff --git a/web/filament-js/jsbindings.cpp b/web/filament-js/jsbindings.cpp
index 7771b408a6..33ae30d305 100644
--- a/web/filament-js/jsbindings.cpp
+++ b/web/filament-js/jsbindings.cpp
@@ -36,6 +36,7 @@
 
 #include <filament/Camera.h>
 #include <filament/Engine.h>
+#include <filament/Frustum.h>
 #include <filament/IndexBuffer.h>
 #include <filament/IndirectLight.h>
 #include <filament/LightManager.h>
@@ -51,6 +52,7 @@
 #include <filament/TransformManager.h>
 #include <filament/VertexBuffer.h>
 #include <filament/View.h>
+#include <filament/Viewport.h>
 
 #include <geometry/SurfaceOrientation.h>
 
diff --git a/web/filament-js/jsenums.cpp b/web/filament-js/jsenums.cpp
index 59101d60dd..567eb26185 100644
--- a/web/filament-js/jsenums.cpp
+++ b/web/filament-js/jsenums.cpp
@@ -16,6 +16,7 @@
 
 #include <filament/Camera.h>
 #include <filament/Color.h>
+#include <filament/Frustum.h>
 #include <filament/IndexBuffer.h>
 #include <filament/LightManager.h>
 #include <filament/RenderableManager.h>