From 85bff591305475105c4cd0f9c078df4af1bb63cf Mon Sep 17 00:00:00 2001
From: Shameek Ganguly <shameek@intrinsic.ai>
Date: Thu, 14 Nov 2024 15:05:26 -0800
Subject: [PATCH 1/2] Enable parse_header for bazel build

Signed-off-by: Shameek Ganguly <shameek@intrinsic.ai>
---
 .bazelrc              | 3 +++
 BUILD.bazel           | 6 +++++-
 src/Converter.hh      | 1 +
 src/SDFImplPrivate.hh | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.bazelrc b/.bazelrc
index f2d06137d..bdb2bfc88 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -10,3 +10,6 @@ build --strip=never
 build --strict_system_includes
 build --fission=dbg
 build --features=per_object_debug_info
+
+# Enable header processing, required for layering checks with parse_header.
+build --process_headers_in_dependencies
diff --git a/BUILD.bazel b/BUILD.bazel
index 280adfd4a..2104410c9 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -4,7 +4,10 @@ load("@rules_license//rules:license.bzl", "license")
 
 package(
     default_applicable_licenses = [":license"],
-    features = ["layering_check"],
+    features = [
+        "layering_check",
+        "parse_headers",
+    ],
 )
 
 license(
@@ -94,6 +97,7 @@ cc_library(
             "include/sdf/*.hh",
         ],
         exclude = [
+            "include/sdf/sdf.hh",
         ],
     ),
     data = [
diff --git a/src/Converter.hh b/src/Converter.hh
index 27865a934..6c0c53144 100644
--- a/src/Converter.hh
+++ b/src/Converter.hh
@@ -23,6 +23,7 @@
 #include <tuple>
 
 #include <sdf/config.hh>
+#include <sdf/ParserConfig.hh>
 #include <sdf/Types.hh>
 #include "sdf/system_util.hh"
 
diff --git a/src/SDFImplPrivate.hh b/src/SDFImplPrivate.hh
index eefc57fcd..3b3ebb5ee 100644
--- a/src/SDFImplPrivate.hh
+++ b/src/SDFImplPrivate.hh
@@ -19,6 +19,7 @@
 
 #include <string>
 
+#include "sdf/Element.hh"
 #include "sdf/Types.hh"
 
 /// \ingroup sdf_parser

From 2e92948a0a1df0600b8481f838be13b29a3177e0 Mon Sep 17 00:00:00 2001
From: Shameek Ganguly <shameek@intrinsic.ai>
Date: Fri, 15 Nov 2024 16:22:39 -0800
Subject: [PATCH 2/2] Fix duplicate includes after merging sdf15

Signed-off-by: Shameek Ganguly <shameek@intrinsic.ai>
---
 src/Converter.hh      | 1 -
 src/SDFImplPrivate.hh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Converter.hh b/src/Converter.hh
index c341cf6de..0c0551aff 100644
--- a/src/Converter.hh
+++ b/src/Converter.hh
@@ -23,7 +23,6 @@
 #include <tuple>
 
 #include <sdf/config.hh>
-#include <sdf/ParserConfig.hh>
 #include <sdf/Types.hh>
 #include "sdf/system_util.hh"
 #include <sdf/ParserConfig.hh>
diff --git a/src/SDFImplPrivate.hh b/src/SDFImplPrivate.hh
index f5ec40987..382718147 100644
--- a/src/SDFImplPrivate.hh
+++ b/src/SDFImplPrivate.hh
@@ -19,7 +19,6 @@
 
 #include <string>
 
-#include "sdf/Element.hh"
 #include "sdf/Types.hh"
 #include "sdf/Element.hh"