From 383da5f6610a179fc192e5b2ba4f8184ffbec6af Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Thu, 12 Aug 2021 15:30:46 -0700
Subject: [PATCH] cleanup include guards of our private headers

---
 filament/backend/include/private/backend/AcquiredImage.h    | 6 +++---
 filament/backend/include/private/backend/BackendUtils.h     | 5 +++++
 filament/backend/include/private/backend/CircularBuffer.h   | 6 +++---
 .../backend/include/private/backend/CommandBufferQueue.h    | 6 +++---
 filament/backend/include/private/backend/CommandStream.h    | 6 +++---
 filament/backend/include/private/backend/Driver.h           | 6 +++---
 filament/backend/include/private/backend/DriverApi.h        | 6 +++---
 filament/backend/include/private/backend/DriverApiForward.h | 6 +++---
 filament/backend/include/private/backend/HandleAllocator.h  | 6 +++---
 filament/backend/include/private/backend/MetalPlatform.h    | 6 +++---
 filament/backend/include/private/backend/OpenGLPlatform.h   | 6 +++---
 filament/backend/include/private/backend/Program.h          | 6 +++---
 filament/backend/include/private/backend/SamplerGroup.h     | 6 +++---
 filament/src/components/CameraManager.h                     | 6 +++---
 filament/src/components/LightManager.h                      | 6 +++---
 filament/src/components/RenderableManager.h                 | 6 +++---
 filament/src/components/TransformManager.h                  | 6 +++---
 filament/src/details/DebugRegistry.h                        | 6 +++---
 filament/src/details/Froxelizer.h                           | 6 +++---
 filament/src/details/IndirectLight.h                        | 6 +++---
 filament/src/details/Skybox.h                               | 6 +++---
 filament/src/fg2/FrameGraphPass.h                           | 6 +++---
 filament/src/fg2/FrameGraphRenderPass.h                     | 6 +++---
 filament/src/fg2/FrameGraphTexture.h                        | 6 +++---
 filament/src/fg2/details/DependencyGraph.h                  | 6 +++---
 filament/src/fg2/details/PassNode.h                         | 6 +++---
 filament/src/fg2/details/Resource.h                         | 6 +++---
 filament/src/fg2/details/ResourceNode.h                     | 6 +++---
 filament/src/fg2/details/Utilities.h                        | 6 +++---
 29 files changed, 89 insertions(+), 84 deletions(-)

diff --git a/filament/backend/include/private/backend/AcquiredImage.h b/filament/backend/include/private/backend/AcquiredImage.h
index 3f585974c9..041fa49343 100644
--- a/filament/backend/include/private/backend/AcquiredImage.h
+++ b/filament/backend/include/private/backend/AcquiredImage.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_BACKEND_ACQUIRED_IMAGE_H
-#define TNT_FILAMENT_BACKEND_ACQUIRED_IMAGE_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_ACQUIREDIMAGE_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_ACQUIREDIMAGE_H
 
 #include <backend/DriverEnums.h>
 
@@ -35,4 +35,4 @@ struct AcquiredImage {
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_BACKEND_ACQUIRED_IMAGE_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_ACQUIREDIMAGE_H
diff --git a/filament/backend/include/private/backend/BackendUtils.h b/filament/backend/include/private/backend/BackendUtils.h
index edcf2ab3ca..a55a217454 100644
--- a/filament/backend/include/private/backend/BackendUtils.h
+++ b/filament/backend/include/private/backend/BackendUtils.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_BACKENDUTILS_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_BACKENDUTILS_H
+
 #include <backend/DriverEnums.h>
 
 #include <backend/PixelBufferDescriptor.h>
@@ -68,3 +71,5 @@ bool reshape(const PixelBufferDescriptor& data, PixelBufferDescriptor& reshaped)
 
 } // namespace backend
 } // namespace filament
+
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_BACKENDUTILS_H
diff --git a/filament/backend/include/private/backend/CircularBuffer.h b/filament/backend/include/private/backend/CircularBuffer.h
index 5f994009d9..dd8facd6df 100644
--- a/filament/backend/include/private/backend/CircularBuffer.h
+++ b/filament/backend/include/private/backend/CircularBuffer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_CIRCULARBUFFER_H
-#define TNT_FILAMENT_DRIVER_CIRCULARBUFFER_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -88,4 +88,4 @@ private:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_CIRCULARBUFFER_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H
diff --git a/filament/backend/include/private/backend/CommandBufferQueue.h b/filament/backend/include/private/backend/CommandBufferQueue.h
index f8932266ed..026a8677da 100644
--- a/filament/backend/include/private/backend/CommandBufferQueue.h
+++ b/filament/backend/include/private/backend/CommandBufferQueue.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H
-#define TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_COMMANDBUFFERQUEUE_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_COMMANDBUFFERQUEUE_H
 
 #include "private/backend/CircularBuffer.h"
 
@@ -82,4 +82,4 @@ public:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_COMMANDBUFFERQUEUE_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_COMMANDBUFFERQUEUE_H
diff --git a/filament/backend/include/private/backend/CommandStream.h b/filament/backend/include/private/backend/CommandStream.h
index c02dc2e28e..44c50e6512 100644
--- a/filament/backend/include/private/backend/CommandStream.h
+++ b/filament/backend/include/private/backend/CommandStream.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_COMMANDSTREAM_H
-#define TNT_FILAMENT_DRIVER_COMMANDSTREAM_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_COMMANDSTREAM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_COMMANDSTREAM_H
 
 #include "private/backend/CircularBuffer.h"
 
@@ -343,4 +343,4 @@ PodType* CommandStream::allocatePod(size_t count, size_t alignment) noexcept {
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_COMMANDSTREAM_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_COMMANDSTREAM_H
diff --git a/filament/backend/include/private/backend/Driver.h b/filament/backend/include/private/backend/Driver.h
index fdc2d72c57..88012a4fbd 100644
--- a/filament/backend/include/private/backend/Driver.h
+++ b/filament/backend/include/private/backend/Driver.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_DRIVER_H
-#define TNT_FILAMENT_DRIVER_DRIVER_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_DRIVER_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_DRIVER_H
 
 #include <backend/BufferDescriptor.h>
 #include <backend/Handle.h>
@@ -143,4 +143,4 @@ utils::io::ostream& operator<<(utils::io::ostream& out, const filament::backend:
 
 #endif
 
-#endif // TNT_FILAMENT_DRIVER_DRIVER_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_DRIVER_H
diff --git a/filament/backend/include/private/backend/DriverApi.h b/filament/backend/include/private/backend/DriverApi.h
index 7d6ea80609..f27f8361a4 100644
--- a/filament/backend/include/private/backend/DriverApi.h
+++ b/filament/backend/include/private/backend/DriverApi.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_DRIVERAPI_H
-#define TNT_FILAMENT_DRIVER_DRIVERAPI_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H
 
 #include "private/backend/DriverApiForward.h"
 #include "private/backend/CommandStream.h"
 
-#endif // TNT_FILAMENT_DRIVER_DRIVERAPI_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPI_H
diff --git a/filament/backend/include/private/backend/DriverApiForward.h b/filament/backend/include/private/backend/DriverApiForward.h
index 727d2bff07..8154f8cc5e 100644
--- a/filament/backend/include/private/backend/DriverApiForward.h
+++ b/filament/backend/include/private/backend/DriverApiForward.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_DRIVERAPIFORWARD_H
-#define TNT_FILAMENT_DRIVER_DRIVERAPIFORWARD_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPIFORWARD_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPIFORWARD_H
 
 
 namespace filament {
@@ -28,4 +28,4 @@ using DriverApi = CommandStream;
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_DRIVERAPIFORWARD_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_DRIVERAPIFORWARD_H
diff --git a/filament/backend/include/private/backend/HandleAllocator.h b/filament/backend/include/private/backend/HandleAllocator.h
index 9624bda8d1..b20aa7c20e 100644
--- a/filament/backend/include/private/backend/HandleAllocator.h
+++ b/filament/backend/include/private/backend/HandleAllocator.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_BACKEND_HANDLEALLOCATOR_H
-#define TNT_FILAMENT_BACKEND_HANDLEALLOCATOR_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_HANDLEALLOCATOR_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_HANDLEALLOCATOR_H
 
 #include <backend/Handle.h>
 
@@ -314,4 +314,4 @@ private:
 
 } // namespace filament::backend
 
-#endif //TNT_FILAMENT_BACKEND_HANDLEALLOCATOR_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_HANDLEALLOCATOR_H
diff --git a/filament/backend/include/private/backend/MetalPlatform.h b/filament/backend/include/private/backend/MetalPlatform.h
index 1f83b85c14..dceb4f7c9b 100644
--- a/filament/backend/include/private/backend/MetalPlatform.h
+++ b/filament/backend/include/private/backend/MetalPlatform.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_PLATFORM_METAL_H
-#define TNT_FILAMENT_DRIVER_PLATFORM_METAL_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_METALPLATFORM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_METALPLATFORM_H
 
 #include <backend/DriverEnums.h>
 #include <backend/Platform.h>
@@ -63,4 +63,4 @@ private:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_PLATFORM_METAL_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_METALPLATFORM_H
diff --git a/filament/backend/include/private/backend/OpenGLPlatform.h b/filament/backend/include/private/backend/OpenGLPlatform.h
index d3b48b9eb3..2619f18fe0 100644
--- a/filament/backend/include/private/backend/OpenGLPlatform.h
+++ b/filament/backend/include/private/backend/OpenGLPlatform.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_H
-#define TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_OPENGLPLATFORM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_OPENGLPLATFORM_H
 
 #include <backend/Platform.h>
 
@@ -117,4 +117,4 @@ public:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_DRIVER_OPENGL_PLATFORM_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_OPENGLPLATFORM_H
diff --git a/filament/backend/include/private/backend/Program.h b/filament/backend/include/private/backend/Program.h
index 4b6d17e65f..62a5b23b78 100644
--- a/filament/backend/include/private/backend/Program.h
+++ b/filament/backend/include/private/backend/Program.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DRIVER_PROGRAM_H
-#define TNT_FILAMENT_DRIVER_PROGRAM_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H
 
 #include <utils/compiler.h>
 #include <utils/FixedCapacityVector.h>
@@ -115,4 +115,4 @@ private:
 } // namespace backend;
 } // namespace filament;
 
-#endif // TNT_FILAMENT_DRIVER_PROGRAM_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H
diff --git a/filament/backend/include/private/backend/SamplerGroup.h b/filament/backend/include/private/backend/SamplerGroup.h
index 56bc820a62..f48952235f 100644
--- a/filament/backend/include/private/backend/SamplerGroup.h
+++ b/filament/backend/include/private/backend/SamplerGroup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_SAMPLERGROUP_H
-#define TNT_FILAMENT_SAMPLERGROUP_H
+#ifndef TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H
+#define TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H
 
 #include <array>
 #include <stddef.h>
@@ -154,4 +154,4 @@ private:
 } // namespace backend
 } // namespace filament
 
-#endif // TNT_FILAMENT_SAMPLERGROUP_H
+#endif // TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H
diff --git a/filament/src/components/CameraManager.h b/filament/src/components/CameraManager.h
index d189354c28..fb45c0be3b 100644
--- a/filament/src/components/CameraManager.h
+++ b/filament/src/components/CameraManager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_CAMERAMANAGER_H
-#define TNT_FILAMENT_CAMERAMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_CAMERAMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_CAMERAMANAGER_H
 
 #include "upcast.h"
 
@@ -87,4 +87,4 @@ private:
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_CAMERAMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_CAMERAMANAGER_H
diff --git a/filament/src/components/LightManager.h b/filament/src/components/LightManager.h
index 2081e5f008..c938a2397a 100644
--- a/filament/src/components/LightManager.h
+++ b/filament/src/components/LightManager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_LIGHTMANAGER_H
-#define TNT_FILAMENT_DETAILS_LIGHTMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_LIGHTMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_LIGHTMANAGER_H
 
 #include "upcast.h"
 
@@ -307,4 +307,4 @@ FILAMENT_UPCAST(LightManager)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_LIGHTMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_LIGHTMANAGER_H
diff --git a/filament/src/components/RenderableManager.h b/filament/src/components/RenderableManager.h
index 6104a621be..6274bb1db0 100644
--- a/filament/src/components/RenderableManager.h
+++ b/filament/src/components/RenderableManager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_RENDERABLECOMPONENTMANAGER_H
-#define TNT_FILAMENT_DETAILS_RENDERABLECOMPONENTMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_RENDERABLEMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_RENDERABLEMANAGER_H
 
 #include "upcast.h"
 
@@ -359,4 +359,4 @@ size_t FRenderableManager::getPrimitiveCount(Instance instance, uint8_t level) c
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_RENDERABLECOMPONENTMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_RENDERABLEMANAGER_H
diff --git a/filament/src/components/TransformManager.h b/filament/src/components/TransformManager.h
index 37524be205..4426331dcc 100644
--- a/filament/src/components/TransformManager.h
+++ b/filament/src/components/TransformManager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_TRANSFORMMANAGER_H
-#define TNT_FILAMENT_DETAILS_TRANSFORMMANAGER_H
+#ifndef TNT_FILAMENT_COMPONENTS_TRANSFORMMANAGER_H
+#define TNT_FILAMENT_COMPONENTS_TRANSFORMMANAGER_H
 
 #include "upcast.h"
 
@@ -201,4 +201,4 @@ FILAMENT_UPCAST(TransformManager)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_TRANSFORMMANAGER_H
+#endif // TNT_FILAMENT_COMPONENTS_TRANSFORMMANAGER_H
diff --git a/filament/src/details/DebugRegistry.h b/filament/src/details/DebugRegistry.h
index 15d5486bc6..c6c92a7df3 100644
--- a/filament/src/details/DebugRegistry.h
+++ b/filament/src/details/DebugRegistry.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_DEBUG_H
-#define TNT_FILAMENT_DETAILS_DEBUG_H
+#ifndef TNT_FILAMENT_DETAILS_DEBUGREGISTRY_H
+#define TNT_FILAMENT_DETAILS_DEBUGREGISTRY_H
 
 #include "upcast.h"
 
@@ -68,4 +68,4 @@ FILAMENT_UPCAST(DebugRegistry)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_DEBUG_H
+#endif // TNT_FILAMENT_DETAILS_DEBUGREGISTRY_H
diff --git a/filament/src/details/Froxelizer.h b/filament/src/details/Froxelizer.h
index c78cb49da8..881b73b0e6 100644
--- a/filament/src/details/Froxelizer.h
+++ b/filament/src/details/Froxelizer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_FROXEL_H
-#define TNT_FILAMENT_DETAILS_FROXEL_H
+#ifndef TNT_FILAMENT_DETAILS_FROXELIZER_H
+#define TNT_FILAMENT_DETAILS_FROXELIZER_H
 
 #include "details/Allocators.h"
 #include "details/Scene.h"
@@ -261,4 +261,4 @@ private:
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_FROXEL_H
+#endif // TNT_FILAMENT_DETAILS_FROXELIZER_H
diff --git a/filament/src/details/IndirectLight.h b/filament/src/details/IndirectLight.h
index 6fdd2e84f8..db7a34b0d7 100644
--- a/filament/src/details/IndirectLight.h
+++ b/filament/src/details/IndirectLight.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_DETAILS_INDIRECT_LIGHT_H
-#define TNT_FILAMENT_DETAILS_INDIRECT_LIGHT_H
+#ifndef TNT_FILAMENT_DETAILS_INDIRECTLIGHT_H
+#define TNT_FILAMENT_DETAILS_INDIRECTLIGHT_H
 
 #include "upcast.h"
 
@@ -70,4 +70,4 @@ FILAMENT_UPCAST(IndirectLight)
 
 } // namespace filament
 
-#endif // TNT_FILAMENT_DETAILS_INDIRECT_LIGHT_H
+#endif // TNT_FILAMENT_DETAILS_INDIRECTLIGHT_H
diff --git a/filament/src/details/Skybox.h b/filament/src/details/Skybox.h
index 5304505ec8..8f593e4d8d 100644
--- a/filament/src/details/Skybox.h
+++ b/filament/src/details/Skybox.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef TNT_FILAMENT_DETAILS_SKYBOX_H
+#define TNT_FILAMENT_DETAILS_SKYBOX_H
+
 #include "upcast.h"
 
 #include <filament/Skybox.h>
@@ -23,9 +26,6 @@
 #include <utils/compiler.h>
 #include <utils/Entity.h>
 
-#ifndef TNT_FILAMENT_DETAILS_SKYBOX_H
-#define TNT_FILAMENT_DETAILS_SKYBOX_H
-
 namespace filament {
 
 class FEngine;
diff --git a/filament/src/fg2/FrameGraphPass.h b/filament/src/fg2/FrameGraphPass.h
index 15f76717ff..49c3fcc0d4 100644
--- a/filament/src/fg2/FrameGraphPass.h
+++ b/filament/src/fg2/FrameGraphPass.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_PASS_H
-#define TNT_FILAMENT_FG2_PASS_H
+#ifndef TNT_FILAMENT_FG2_FRAMEGRAPHPASS_H
+#define TNT_FILAMENT_FG2_FRAMEGRAPHPASS_H
 
 #include "private/backend/DriverApiForward.h"
 
@@ -79,4 +79,4 @@ public:
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_PASS_H
+#endif //TNT_FILAMENT_FG2_FRAMEGRAPHPASS_H
diff --git a/filament/src/fg2/FrameGraphRenderPass.h b/filament/src/fg2/FrameGraphRenderPass.h
index b4aa55252d..6407d4362f 100644
--- a/filament/src/fg2/FrameGraphRenderPass.h
+++ b/filament/src/fg2/FrameGraphRenderPass.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_RENDERTARGET_H
-#define TNT_FILAMENT_FG2_RENDERTARGET_H
+#ifndef TNT_FILAMENT_FG2_FRAMEGRAPHRENDERPASS_H
+#define TNT_FILAMENT_FG2_FRAMEGRAPHRENDERPASS_H
 
 #include "fg2/FrameGraphTexture.h"
 
@@ -67,4 +67,4 @@ struct FrameGraphRenderPass {
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_RENDERTARGET_H
+#endif // TNT_FILAMENT_FG2_FRAMEGRAPHRENDERPASS_H
diff --git a/filament/src/fg2/FrameGraphTexture.h b/filament/src/fg2/FrameGraphTexture.h
index a1064bbaad..7d06e31eca 100644
--- a/filament/src/fg2/FrameGraphTexture.h
+++ b/filament/src/fg2/FrameGraphTexture.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_TEXTURE_H
-#define TNT_FILAMENT_FG2_TEXTURE_H
+#ifndef TNT_FILAMENT_FG2_FRAMEGRAPHTEXTURE_H
+#define TNT_FILAMENT_FG2_FRAMEGRAPHTEXTURE_H
 
 #include "fg2/FrameGraphId.h"
 
@@ -99,4 +99,4 @@ struct FrameGraphTexture {
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_TEXTURE_H
+#endif // TNT_FILAMENT_FG2_FRAMEGRAPHTEXTURE_H
diff --git a/filament/src/fg2/details/DependencyGraph.h b/filament/src/fg2/details/DependencyGraph.h
index f3acbe668b..10cd084703 100644
--- a/filament/src/fg2/details/DependencyGraph.h
+++ b/filament/src/fg2/details/DependencyGraph.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_GRAPH_H
-#define TNT_FILAMENT_FG2_GRAPH_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_DEPENDENCYGRAPH_H
+#define TNT_FILAMENT_FG2_DETAILS_DEPENDENCYGRAPH_H
 
 #include <utils/ostream.h>
 #include <utils/CString.h>
@@ -195,4 +195,4 @@ inline DependencyGraph::Edge::Edge(DependencyGraph& graph,
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_GRAPH_H
+#endif // TNT_FILAMENT_FG2_DETAILS_DEPENDENCYGRAPH_H
diff --git a/filament/src/fg2/details/PassNode.h b/filament/src/fg2/details/PassNode.h
index 142b2dcbbb..aacde414d6 100644
--- a/filament/src/fg2/details/PassNode.h
+++ b/filament/src/fg2/details/PassNode.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_PASSNODE_H
-#define TNT_FILAMENT_FG2_PASSNODE_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_PASSNODE_H
+#define TNT_FILAMENT_FG2_DETAILS_PASSNODE_H
 
 #include "fg2/details/DependencyGraph.h"
 #include "fg2/details/Utilities.h"
@@ -124,4 +124,4 @@ private:
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_PASSNODE_H
+#endif // TNT_FILAMENT_FG2_DETAILS_PASSNODE_H
diff --git a/filament/src/fg2/details/Resource.h b/filament/src/fg2/details/Resource.h
index 21a2bd4bfc..afc0c2b5d6 100644
--- a/filament/src/fg2/details/Resource.h
+++ b/filament/src/fg2/details/Resource.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_RESOURCE_H
-#define TNT_FILAMENT_FG2_RESOURCE_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_RESOURCE_H
+#define TNT_FILAMENT_FG2_DETAILS_RESOURCE_H
 
 #include "fg2/FrameGraphId.h"
 #include "fg2/FrameGraphTexture.h"
@@ -344,4 +344,4 @@ extern template class ImportedResource<FrameGraphTexture>;
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_RESOURCE_H
+#endif // TNT_FILAMENT_FG2_DETAILS_RESOURCE_H
diff --git a/filament/src/fg2/details/ResourceNode.h b/filament/src/fg2/details/ResourceNode.h
index fa1af1c4eb..3e11a8881e 100644
--- a/filament/src/fg2/details/ResourceNode.h
+++ b/filament/src/fg2/details/ResourceNode.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_RESOURCENODE_H
-#define TNT_FILAMENT_FG2_RESOURCENODE_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_RESOURCENODE_H
+#define TNT_FILAMENT_FG2_DETAILS_RESOURCENODE_H
 
 #include "fg2/details/DependencyGraph.h"
 #include "fg2/details/Utilities.h"
@@ -102,4 +102,4 @@ private:
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_RESOURCENODE_H
+#endif // TNT_FILAMENT_FG2_DETAILS_RESOURCENODE_H
diff --git a/filament/src/fg2/details/Utilities.h b/filament/src/fg2/details/Utilities.h
index a06659dc5d..2f40dfca44 100644
--- a/filament/src/fg2/details/Utilities.h
+++ b/filament/src/fg2/details/Utilities.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAMENT_FG2_UTILITIES_H
-#define TNT_FILAMENT_FG2_UTILITIES_H
+#ifndef TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
+#define TNT_FILAMENT_FG2_DETAILS_UTILITIES_H
 
 #include "details/Allocators.h"
 
@@ -39,4 +39,4 @@ template<typename T> using Vector = std::vector<T, Allocator<T>>; // 32 bytes
 
 } // namespace filament
 
-#endif //TNT_FILAMENT_FG2_UTILITIES_H
+#endif // TNT_FILAMENT_FG2_DETAILS_UTILITIES_H