diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt
index 789a526e6a..45fdfcac62 100644
--- a/filament/CMakeLists.txt
+++ b/filament/CMakeLists.txt
@@ -95,54 +95,54 @@ set(SRCS
         src/fg2/Blackboard.cpp
         src/fg2/DependencyGraph.cpp
         src/fg2/FrameGraph.cpp
-        src/fg2/FrameGraphResources.cpp
         src/fg2/FrameGraphPass.cpp
+        src/fg2/FrameGraphResources.cpp
+        src/fg2/FrameGraphTexture.cpp
         src/fg2/PassNode.cpp
         src/fg2/ResourceNode.cpp
-        src/fg2/FrameGraphTexture.cpp
 )
 
 set(PRIVATE_HDRS
+        src/Allocators.h
         src/ColorSpace.h
+        src/Culler.h
+        src/DFG.h
         src/FilamentAPI-impl.h
         src/FrameHistory.h
         src/FrameInfo.h
+        src/FrameSkipper.h
+        src/Froxelizer.h
         src/Intersections.h
         src/MaterialParser.h
         src/PerViewUniforms.h
         src/PostProcessManager.h
         src/RenderPass.h
+        src/RenderPrimitive.h
         src/ResourceAllocator.h
+        src/ResourceList.h
+        src/ShadowMap.h
+        src/ShadowMapManager.h
         src/TypedUniformBuffer.h
         src/UniformBuffer.h
         src/components/CameraManager.h
         src/components/LightManager.h
         src/components/RenderableManager.h
         src/components/TransformManager.h
-        src/details/Allocators.h
         src/details/BufferObject.h
         src/details/Camera.h
         src/details/ColorGrading.h
-        src/details/Culler.h
-        src/details/DFG.h
         src/details/DebugRegistry.h
         src/details/Engine.h
         src/details/Fence.h
-        src/details/FrameSkipper.h
-        src/details/Froxelizer.h
         src/details/IndexBuffer.h
         src/details/IndirectLight.h
         src/details/Material.h
         src/details/MaterialInstance.h
-        src/details/RenderPrimitive.h
         src/details/RenderTarget.h
         src/details/Renderer.h
-        src/details/ResourceList.h
         src/details/Scene.h
-        src/details/ShadowMap.h
-        src/details/ShadowMapManager.h
-        src/details/Skybox.h
         src/details/SkinningBuffer.h
+        src/details/Skybox.h
         src/details/Stream.h
         src/details/SwapChain.h
         src/details/Texture.h
@@ -151,11 +151,11 @@ set(PRIVATE_HDRS
         src/fg2/Blackboard.h
         src/fg2/FrameGraph.h
         src/fg2/FrameGraphId.h
-        src/fg2/FrameGraphResources.h
         src/fg2/FrameGraphPass.h
         src/fg2/FrameGraphRenderPass.h
-        src/fg2/Resource.cpp
+        src/fg2/FrameGraphResources.h
         src/fg2/FrameGraphTexture.h
+        src/fg2/Resource.cpp
         src/fg2/details/DependencyGraph.h
         src/fg2/details/PassNode.h
         src/fg2/details/Resource.h
diff --git a/filament/benchmark/benchmark_filament.cpp b/filament/benchmark/benchmark_filament.cpp
index d788ac79d9..3a2e6031a1 100644
--- a/filament/benchmark/benchmark_filament.cpp
+++ b/filament/benchmark/benchmark_filament.cpp
@@ -21,7 +21,7 @@
 
 #include <filament/Box.h>
 #include <filament/Frustum.h>
-#include "details/Culler.h"
+#include "Culler.h"
 
 #include <utils/Allocator.h>
 
diff --git a/filament/src/details/Allocators.h b/filament/src/Allocators.h
similarity index 100%
rename from filament/src/details/Allocators.h
rename to filament/src/Allocators.h
diff --git a/filament/src/Culler.cpp b/filament/src/Culler.cpp
index 55a00170ba..4a3570b2e8 100644
--- a/filament/src/Culler.cpp
+++ b/filament/src/Culler.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "details/Culler.h"
+#include "Culler.h"
 
 #include <filament/Box.h>
 
diff --git a/filament/src/details/Culler.h b/filament/src/Culler.h
similarity index 100%
rename from filament/src/details/Culler.h
rename to filament/src/Culler.h
diff --git a/filament/src/DFG.cpp b/filament/src/DFG.cpp
index eb61748cc6..138097f901 100644
--- a/filament/src/DFG.cpp
+++ b/filament/src/DFG.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "details/DFG.h"
+#include "DFG.h"
 
 #include "details/Engine.h"
 #include "details/Texture.h"
diff --git a/filament/src/details/DFG.h b/filament/src/DFG.h
similarity index 99%
rename from filament/src/details/DFG.h
rename to filament/src/DFG.h
index 96e4528e81..d901db4244 100644
--- a/filament/src/details/DFG.h
+++ b/filament/src/DFG.h
@@ -17,16 +17,15 @@
 #ifndef TNT_FILAMENT_DETAILS_DFG_H
 #define TNT_FILAMENT_DETAILS_DFG_H
 
-#include "details/Texture.h"
-
 #include <backend/Handle.h>
 
+#include "details/Texture.h"
+
 #include <utils/compiler.h>
 
 namespace filament {
 
 class FEngine;
-class FTexture;
 
 #if !defined(FILAMENT_DFG_LUT_SIZE)
 #define FILAMENT_DFG_LUT_SIZE 128
diff --git a/filament/src/Engine.cpp b/filament/src/Engine.cpp
index 020f007d95..daec25b7f5 100644
--- a/filament/src/Engine.cpp
+++ b/filament/src/Engine.cpp
@@ -19,29 +19,31 @@
 #include "MaterialParser.h"
 #include "ResourceAllocator.h"
 
-#include "backend/DriverEnums.h"
+#include "DFG.h"
+#include "RenderPrimitive.h"
+
 #include "details/BufferObject.h"
-#include "details/DFG.h"
-#include "details/VertexBuffer.h"
-#include "details/Fence.h"
 #include "details/Camera.h"
+#include "details/Fence.h"
 #include "details/IndexBuffer.h"
 #include "details/IndirectLight.h"
 #include "details/Material.h"
 #include "details/Renderer.h"
-#include "details/RenderPrimitive.h"
 #include "details/Scene.h"
-#include "details/Skybox.h"
 #include "details/SkinningBuffer.h"
+#include "details/Skybox.h"
 #include "details/Stream.h"
 #include "details/SwapChain.h"
 #include "details/Texture.h"
+#include "details/VertexBuffer.h"
 #include "details/View.h"
 
 #include <private/filament/SibGenerator.h>
 
 #include <filament/MaterialEnums.h>
 
+#include <backend/DriverEnums.h>
+
 #include <utils/compiler.h>
 #include <utils/Log.h>
 #include <utils/Panic.h>
diff --git a/filament/src/FrameSkipper.cpp b/filament/src/FrameSkipper.cpp
index 67468726ef..4b1be91fc2 100644
--- a/filament/src/FrameSkipper.cpp
+++ b/filament/src/FrameSkipper.cpp
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include "FrameSkipper.h"
+
+#include "details/Engine.h"
+
 #include <utils/Log.h>
 #include <utils/debug.h>
 
-#include "details/FrameSkipper.h"
-#include "details/Engine.h"
-
 namespace filament {
 
 using namespace utils;
diff --git a/filament/src/details/FrameSkipper.h b/filament/src/FrameSkipper.h
similarity index 98%
rename from filament/src/details/FrameSkipper.h
rename to filament/src/FrameSkipper.h
index 0f8b1dbd92..b4d861dc0b 100644
--- a/filament/src/details/FrameSkipper.h
+++ b/filament/src/FrameSkipper.h
@@ -17,7 +17,7 @@
 #ifndef TNT_FILAMENT_DETAILS_FRAMESKIPPER_H
 #define TNT_FILAMENT_DETAILS_FRAMESKIPPER_H
 
-#include "backend/Handle.h"
+#include <backend/Handle.h>
 
 #include <array>
 
diff --git a/filament/src/Froxelizer.cpp b/filament/src/Froxelizer.cpp
index 928fdb34fc..44f30d993d 100644
--- a/filament/src/Froxelizer.cpp
+++ b/filament/src/Froxelizer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "details/Froxelizer.h"
+#include "Froxelizer.h"
 
 #include "Intersections.h"
 
diff --git a/filament/src/details/Froxelizer.h b/filament/src/Froxelizer.h
similarity index 99%
rename from filament/src/details/Froxelizer.h
rename to filament/src/Froxelizer.h
index 881b73b0e6..fdba2ce41a 100644
--- a/filament/src/details/Froxelizer.h
+++ b/filament/src/Froxelizer.h
@@ -17,7 +17,8 @@
 #ifndef TNT_FILAMENT_DETAILS_FROXELIZER_H
 #define TNT_FILAMENT_DETAILS_FROXELIZER_H
 
-#include "details/Allocators.h"
+#include "Allocators.h"
+
 #include "details/Scene.h"
 #include "details/Engine.h"
 
diff --git a/filament/src/Frustum.cpp b/filament/src/Frustum.cpp
index bb953d2166..9e65ed0f5a 100644
--- a/filament/src/Frustum.cpp
+++ b/filament/src/Frustum.cpp
@@ -16,7 +16,7 @@
 
 #include <filament/Frustum.h>
 
-#include "details/Culler.h"
+#include "Culler.h"
 
 #include <utils/compiler.h>
 
diff --git a/filament/src/Material.cpp b/filament/src/Material.cpp
index 6197579c2e..d7f5305d0b 100644
--- a/filament/src/Material.cpp
+++ b/filament/src/Material.cpp
@@ -16,15 +16,13 @@
 
 #include "details/Material.h"
 
-#include "details/Engine.h"
-#include "details/DFG.h"
+#include "DFG.h"
+#include "MaterialParser.h"
 
-#include "private/backend/Program.h"
+#include "details/Engine.h"
 
 #include "FilamentAPI-impl.h"
 
-#include <backend/DriverEnums.h>
-
 #include <private/filament/SibGenerator.h>
 #include <private/filament/UibStructs.h>
 #include <private/filament/Variant.h>
@@ -32,7 +30,9 @@
 #include <private/filament/SamplerInterfaceBlock.h>
 #include <private/filament/UniformInterfaceBlock.h>
 
-#include <MaterialParser.h>
+#include "private/backend/Program.h"
+
+#include <backend/DriverEnums.h>
 
 #include <utils/CString.h>
 #include <utils/Panic.h>
diff --git a/filament/src/PerViewUniforms.cpp b/filament/src/PerViewUniforms.cpp
index 3d18cf1cd6..947e3f96bf 100644
--- a/filament/src/PerViewUniforms.cpp
+++ b/filament/src/PerViewUniforms.cpp
@@ -16,20 +16,21 @@
 
 #include "PerViewUniforms.h"
 
+#include "DFG.h"
+#include "Froxelizer.h"
+#include "ShadowMapManager.h"
+
+#include "details/Camera.h"
+#include "details/Engine.h"
+#include "details/IndirectLight.h"
+#include "details/Texture.h"
+
 #include <filament/Exposure.h>
 #include <filament/Options.h>
 #include <filament/TextureSampler.h>
 
 #include <private/filament/SibGenerator.h>
 
-#include "details/Camera.h"
-#include "details/DFG.h"
-#include "details/Engine.h"
-#include "details/Froxelizer.h"
-#include "details/IndirectLight.h"
-#include "details/ShadowMapManager.h"
-#include "details/Texture.h"
-
 #include <math/mat4.h>
 
 namespace filament {
diff --git a/filament/src/RenderPass.cpp b/filament/src/RenderPass.cpp
index b1d1e2dd77..17df69eccd 100644
--- a/filament/src/RenderPass.cpp
+++ b/filament/src/RenderPass.cpp
@@ -16,14 +16,14 @@
 
 #include "RenderPass.h"
 
+#include "RenderPrimitive.h"
+#include "ShadowMap.h"
+
 #include "details/Material.h"
 #include "details/MaterialInstance.h"
-#include "details/RenderPrimitive.h"
-#include "details/ShadowMap.h"
-#include "details/View.h"
-
 // NOTE: We only need Renderer.h here because the definition of some FRenderer methods are here
 #include "details/Renderer.h"
+#include "details/View.h"
 
 #include <private/filament/UibStructs.h>
 
diff --git a/filament/src/RenderPass.h b/filament/src/RenderPass.h
index 9559110671..8130b9e6c1 100644
--- a/filament/src/RenderPass.h
+++ b/filament/src/RenderPass.h
@@ -17,7 +17,8 @@
 #ifndef TNT_FILAMENT_RENDERPASS_H
 #define TNT_FILAMENT_RENDERPASS_H
 
-#include "details/Allocators.h"
+#include "Allocators.h"
+
 #include "details/Camera.h"
 #include "details/Scene.h"
 
@@ -28,11 +29,11 @@
 #include <backend/DriverEnums.h>
 #include <backend/Handle.h>
 
+#include <utils/Allocator.h>
+#include <utils/Range.h>
 #include <utils/architecture.h>
 #include <utils/compiler.h>
 #include <utils/debug.h>
-#include <utils/Allocator.h>
-#include <utils/Range.h>
 
 #include <functional>
 #include <limits>
diff --git a/filament/src/RenderPrimitive.cpp b/filament/src/RenderPrimitive.cpp
index 59b1e090d5..a6eae017d2 100644
--- a/filament/src/RenderPrimitive.cpp
+++ b/filament/src/RenderPrimitive.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "details/RenderPrimitive.h"
+#include "RenderPrimitive.h"
 
 #include "details/Engine.h"
-#include "details/VertexBuffer.h"
 #include "details/IndexBuffer.h"
 #include "details/Material.h"
+#include "details/VertexBuffer.h"
 
 #include <utils/debug.h>
 
diff --git a/filament/src/details/RenderPrimitive.h b/filament/src/RenderPrimitive.h
similarity index 100%
rename from filament/src/details/RenderPrimitive.h
rename to filament/src/RenderPrimitive.h
diff --git a/filament/src/details/ResourceList.h b/filament/src/ResourceList.h
similarity index 100%
rename from filament/src/details/ResourceList.h
rename to filament/src/ResourceList.h
diff --git a/filament/src/ShadowMap.cpp b/filament/src/ShadowMap.cpp
index f12640e246..e5141c7dfc 100644
--- a/filament/src/ShadowMap.cpp
+++ b/filament/src/ShadowMap.cpp
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-#include "details/ShadowMap.h"
+#include "ShadowMap.h"
+
+#include "RenderPass.h"
 
 #include "components/LightManager.h"
 
@@ -22,8 +24,6 @@
 #include "details/Scene.h"
 #include "details/View.h"
 
-#include "RenderPass.h"
-
 #include <backend/DriverEnums.h>
 
 #include <utils/debug.h>
diff --git a/filament/src/details/ShadowMap.h b/filament/src/ShadowMap.h
similarity index 100%
rename from filament/src/details/ShadowMap.h
rename to filament/src/ShadowMap.h
diff --git a/filament/src/ShadowMapManager.cpp b/filament/src/ShadowMapManager.cpp
index 4271d56b96..dce8cda03f 100644
--- a/filament/src/ShadowMapManager.cpp
+++ b/filament/src/ShadowMapManager.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "details/ShadowMapManager.h"
+#include "ShadowMapManager.h"
+
+#include "RenderPass.h"
+#include "ShadowMap.h"
 
-#include "details/ShadowMap.h"
 #include "details/Texture.h"
 #include "details/View.h"
 
-#include "fg2/FrameGraph.h"
-
-#include "RenderPass.h"
+#include <fg2/FrameGraph.h>
 
 #include <private/filament/SibGenerator.h>
 
diff --git a/filament/src/details/ShadowMapManager.h b/filament/src/ShadowMapManager.h
similarity index 99%
rename from filament/src/details/ShadowMapManager.h
rename to filament/src/ShadowMapManager.h
index 01374609a7..8eb8934476 100644
--- a/filament/src/details/ShadowMapManager.h
+++ b/filament/src/ShadowMapManager.h
@@ -19,8 +19,8 @@
 
 #include <filament/Viewport.h>
 
-#include "TypedUniformBuffer.h"
 #include "ShadowMap.h"
+#include "TypedUniformBuffer.h"
 
 #include "details/Engine.h"
 #include "details/Scene.h"
@@ -30,7 +30,6 @@
 #include <private/backend/DriverApi.h>
 #include <private/backend/DriverApiForward.h>
 #include <private/backend/SamplerGroup.h>
-#include <private/backend/SamplerGroup.h>
 
 #include <backend/DriverEnums.h>
 #include <backend/Handle.h>
diff --git a/filament/src/View.cpp b/filament/src/View.cpp
index 6fb2329623..d483c48acd 100644
--- a/filament/src/View.cpp
+++ b/filament/src/View.cpp
@@ -16,15 +16,15 @@
 
 #include "details/View.h"
 
+#include "Culler.h"
+#include "DFG.h"
+#include "Froxelizer.h"
 #include "ResourceAllocator.h"
 
 #include "details/Engine.h"
-#include "details/Culler.h"
-#include "details/DFG.h"
-#include "details/Froxelizer.h"
 #include "details/IndirectLight.h"
-#include "details/Renderer.h"
 #include "details/RenderTarget.h"
+#include "details/Renderer.h"
 #include "details/Scene.h"
 #include "details/Skybox.h"
 
diff --git a/filament/src/components/RenderableManager.cpp b/filament/src/components/RenderableManager.cpp
index 0c9e92fe59..ddd17662a5 100644
--- a/filament/src/components/RenderableManager.cpp
+++ b/filament/src/components/RenderableManager.cpp
@@ -16,20 +16,20 @@
 
 #include "FilamentAPI-impl.h"
 
+#include "RenderPrimitive.h"
+
 #include "components/RenderableManager.h"
 
 #include "details/Engine.h"
 #include "details/VertexBuffer.h"
 #include "details/IndexBuffer.h"
 #include "details/Material.h"
-#include "details/RenderPrimitive.h"
 
 #include <backend/DriverEnums.h>
 
 #include <utils/Log.h>
 #include <utils/Panic.h>
 #include <utils/debug.h>
-#include <filament/RenderableManager.h>
 
 
 using namespace filament::math;
diff --git a/filament/src/details/Engine.h b/filament/src/details/Engine.h
index fe9a68287e..cdb671408e 100644
--- a/filament/src/details/Engine.h
+++ b/filament/src/details/Engine.h
@@ -18,42 +18,42 @@
 #define TNT_FILAMENT_DETAILS_ENGINE_H
 
 #include "upcast.h"
+
+#include "Allocators.h"
 #include "PostProcessManager.h"
+#include "ResourceList.h"
 
 #include "components/CameraManager.h"
 #include "components/LightManager.h"
 #include "components/TransformManager.h"
 #include "components/RenderableManager.h"
 
-#include "details/Allocators.h"
 #include "details/BufferObject.h"
 #include "details/Camera.h"
+#include "details/ColorGrading.h"
 #include "details/DebugRegistry.h"
 #include "details/Fence.h"
 #include "details/IndexBuffer.h"
 #include "details/RenderTarget.h"
-#include "details/ResourceList.h"
-#include "details/ColorGrading.h"
-#include "details/Skybox.h"
 #include "details/SkinningBuffer.h"
+#include "details/Skybox.h"
 
-#include "private/backend/CommandStream.h"
 #include "private/backend/CommandBufferQueue.h"
+#include "private/backend/CommandStream.h"
 #include "private/backend/DriverApi.h"
 
 #include <private/filament/EngineEnums.h>
 #include <private/filament/UniformInterfaceBlock.h>
 
+#include <filament/ColorGrading.h>
 #include <filament/Engine.h>
-#include <filament/VertexBuffer.h>
 #include <filament/IndirectLight.h>
 #include <filament/Material.h>
 #include <filament/MaterialEnums.h>
-#include <filament/Texture.h>
-#include <filament/ColorGrading.h>
 #include <filament/Skybox.h>
-
 #include <filament/Stream.h>
+#include <filament/Texture.h>
+#include <filament/VertexBuffer.h>
 
 #if FILAMENT_ENABLE_MATDBG
 #include <matdbg/DebugServer.h>
diff --git a/filament/src/details/Renderer.h b/filament/src/details/Renderer.h
index 5395f21f19..f92e2b4885 100644
--- a/filament/src/details/Renderer.h
+++ b/filament/src/details/Renderer.h
@@ -19,20 +19,20 @@
 
 #include "upcast.h"
 
+#include "Allocators.h"
 #include "FrameInfo.h"
+#include "FrameSkipper.h"
 #include "RenderPass.h"
 
-#include "details/Allocators.h"
-#include "details/FrameSkipper.h"
 #include "details/SwapChain.h"
 
 #include "private/backend/DriverApiForward.h"
 
+#include <fg2/FrameGraphId.h>
+
 #include <filament/Renderer.h>
 #include <filament/View.h>
 
-#include <fg2/FrameGraphId.h>
-
 #include <backend/DriverEnums.h>
 #include <backend/Handle.h>
 #include <backend/PresentCallable.h>
diff --git a/filament/src/details/Scene.h b/filament/src/details/Scene.h
index 9dd9deca11..4c2c8dede4 100644
--- a/filament/src/details/Scene.h
+++ b/filament/src/details/Scene.h
@@ -18,14 +18,14 @@
 #define TNT_FILAMENT_DETAILS_SCENE_H
 
 #include "upcast.h"
+
+#include "Allocators.h"
+#include "Culler.h"
+
 #include "components/LightManager.h"
 #include "components/RenderableManager.h"
 #include "components/TransformManager.h"
 
-#include "details/Culler.h"
-
-#include "Allocators.h"
-
 #include <filament/Box.h>
 #include <filament/Scene.h>
 
@@ -36,7 +36,8 @@
 #include <utils/Range.h>
 #include <utils/debug.h>
 
-#include <cstddef>
+#include <stddef.h>
+
 #include <tsl/robin_set.h>
 
 namespace filament {
diff --git a/filament/src/details/View.h b/filament/src/details/View.h
index 947b136588..656ffb992c 100644
--- a/filament/src/details/View.h
+++ b/filament/src/details/View.h
@@ -21,18 +21,18 @@
 
 #include "upcast.h"
 
-#include "FrameInfo.h"
+#include "Allocators.h"
 #include "FrameHistory.h"
+#include "FrameInfo.h"
+#include "Froxelizer.h"
 #include "PerViewUniforms.h"
+#include "ShadowMap.h"
+#include "ShadowMapManager.h"
 #include "TypedUniformBuffer.h"
 
-#include "details/Allocators.h"
 #include "details/Camera.h"
 #include "details/ColorGrading.h"
-#include "details/Froxelizer.h"
 #include "details/RenderTarget.h"
-#include "details/ShadowMap.h"
-#include "details/ShadowMapManager.h"
 #include "details/Scene.h"
 
 #include <private/filament/EngineEnums.h>
@@ -44,8 +44,8 @@
 #include <utils/compiler.h>
 #include <utils/Allocator.h>
 #include <utils/StructureOfArrays.h>
-#include <utils/Slice.h>
 #include <utils/Range.h>
+#include <utils/Slice.h>
 
 #include <math/scalar.h>
 
diff --git a/filament/src/fg2/FrameGraph.h b/filament/src/fg2/FrameGraph.h
index 8e1c6cd31c..308b8d4644 100644
--- a/filament/src/fg2/FrameGraph.h
+++ b/filament/src/fg2/FrameGraph.h
@@ -17,6 +17,8 @@
 #ifndef TNT_FILAMENT_FG2_FRAMEGRAPH_H
 #define TNT_FILAMENT_FG2_FRAMEGRAPH_H
 
+#include "Allocators.h"
+
 #include "fg2/Blackboard.h"
 #include "fg2/FrameGraphId.h"
 #include "fg2/FrameGraphPass.h"
@@ -27,8 +29,6 @@
 #include "fg2/details/Resource.h"
 #include "fg2/details/Utilities.h"
 
-#include "details/Allocators.h"
-
 #include "private/backend/DriverApiForward.h"
 
 #include <backend/DriverEnums.h>
diff --git a/filament/src/fg2/details/Utilities.h b/filament/src/fg2/details/Utilities.h
index 2f40dfca44..0465939ee8 100644
--- a/filament/src/fg2/details/Utilities.h
+++ b/filament/src/fg2/details/Utilities.h
@@ -17,7 +17,7 @@
 #ifndef TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
 #define TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
 
-#include "details/Allocators.h"
+#include "Allocators.h"
 
 #include <vector>
 #include <memory>
diff --git a/filament/test/filament_test.cpp b/filament/test/filament_test.cpp
index 1e01f8386a..f712351be4 100644
--- a/filament/test/filament_test.cpp
+++ b/filament/test/filament_test.cpp
@@ -36,10 +36,10 @@
 #include <private/filament/UibStructs.h>
 #include <private/backend/BackendUtils.h>
 
-#include "details/Allocators.h"
+#include "Allocators.h"
 #include "details/Material.h"
 #include "details/Camera.h"
-#include "details/Froxelizer.h"
+#include "Froxelizer.h"
 #include "details/Engine.h"
 #include "components/RenderableManager.h"
 #include "components/TransformManager.h"