From e75c5aa83c5c2a7d500e61c7710cebb98bee9178 Mon Sep 17 00:00:00 2001
From: Haroon Qureshi <haroonq@google.com>
Date: Mon, 20 Oct 2025 02:54:22 -0700
Subject: [PATCH] Fix various include paths.

PiperOrigin-RevId: 821564663
Change-Id: Ic84489b7f3e1ba97810f60049dcf2f4a4d31edcf
---
 .../filament/filament/buffer_util.cc          |  2 +-
 .../filament/filament/buffer_util.h           |  2 +-
 .../filament/filament/filament_context.cc     |  2 +-
 .../filament/filament/gui_view.cc             |  2 +-
 .../filament/filament/imgui_editor.cc         |  2 +-
 src/experimental/studio/app.cc                |  6 +++---
 src/experimental/studio/main.cc               |  2 +-
 src/experimental/toolbox/helpers.cc           |  4 ++--
 src/experimental/toolbox/imgui_widgets.cc     |  2 +-
 src/experimental/toolbox/imgui_widgets.h      |  4 ++--
 src/experimental/toolbox/interaction.cc       |  2 +-
 src/experimental/toolbox/window.cc            | 20 +++++++++----------
 src/experimental/toolbox/window.h             |  2 +-
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/experimental/filament/filament/buffer_util.cc b/src/experimental/filament/filament/buffer_util.cc
index 4fc4e92f..82363b2f 100644
--- a/src/experimental/filament/filament/buffer_util.cc
+++ b/src/experimental/filament/filament/buffer_util.cc
@@ -16,7 +16,7 @@
 
 #include <cstddef>
 
-#include "third_party/filament/filament/backend/include/backend/BufferDescriptor.h"
+#include <backend/BufferDescriptor.h>
 
 namespace mujoco {
 
diff --git a/src/experimental/filament/filament/buffer_util.h b/src/experimental/filament/filament/buffer_util.h
index 2e70a106..4a2a1104 100644
--- a/src/experimental/filament/filament/buffer_util.h
+++ b/src/experimental/filament/filament/buffer_util.h
@@ -19,7 +19,7 @@
 #include <cstdint>
 #include <functional>
 #include <type_traits>
-#include "third_party/filament/filament/backend/include/backend/BufferDescriptor.h"
+#include <backend/BufferDescriptor.h>
 #include <filament/Box.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
diff --git a/src/experimental/filament/filament/filament_context.cc b/src/experimental/filament/filament/filament_context.cc
index 11883759..b5f27805 100644
--- a/src/experimental/filament/filament/filament_context.cc
+++ b/src/experimental/filament/filament/filament_context.cc
@@ -20,7 +20,7 @@
 #include <memory>
 #include <utility>
 
-#include "third_party/filament/filament/backend/include/backend/DriverEnums.h"
+#include <backend/DriverEnums.h>
 #include <filament/Engine.h>
 #include <filament/IndexBuffer.h>
 #include <filament/IndirectLight.h>
diff --git a/src/experimental/filament/filament/gui_view.cc b/src/experimental/filament/filament/gui_view.cc
index 49923ecd..ad9ae3ca 100644
--- a/src/experimental/filament/filament/gui_view.cc
+++ b/src/experimental/filament/filament/gui_view.cc
@@ -19,7 +19,7 @@
 #include <cstring>
 #include <vector>
 
-#include <dear_imgui/imgui.h>
+#include <imgui.h>
 #include <filament/Engine.h>
 #include <filament/RenderableManager.h>
 #include <filament/TextureSampler.h>
diff --git a/src/experimental/filament/filament/imgui_editor.cc b/src/experimental/filament/filament/imgui_editor.cc
index 71b623bf..2e83436b 100644
--- a/src/experimental/filament/filament/imgui_editor.cc
+++ b/src/experimental/filament/filament/imgui_editor.cc
@@ -21,7 +21,7 @@
 #include <string>
 #include <string_view>
 
-#include <dear_imgui/imgui.h>
+#include <imgui.h>
 #include <filament/ColorGrading.h>
 #include <filament/IndirectLight.h>
 #include <filament/LightManager.h>
diff --git a/src/experimental/studio/app.cc b/src/experimental/studio/app.cc
index 7df2f8eb..bcaf0152 100644
--- a/src/experimental/studio/app.cc
+++ b/src/experimental/studio/app.cc
@@ -29,8 +29,8 @@
 #include <utility>
 #include <vector>
 
-#include <dear_imgui/imgui.h>
-#include <implot/implot.h>
+#include <imgui.h>
+#include <implot.h>
 #include <mujoco/mujoco.h>
 #include "experimental/toolbox/helpers.h"
 #include "experimental/toolbox/imgui_widgets.h"
@@ -42,7 +42,7 @@
 #if defined(USE_FILAMENT_OPENGL) || defined(USE_FILAMENT_VULKAN)
 #include "experimental/filament/render_context_filament.h"
 #elif defined(USE_CLASSIC_OPENGL)
-#include <dear_imgui/backends/imgui_impl_opengl3.h>
+#include <backends/imgui_impl_opengl3.h>
 #else
 #error No rendering mode defined.
 #endif
diff --git a/src/experimental/studio/main.cc b/src/experimental/studio/main.cc
index 118cf7c5..94becc75 100644
--- a/src/experimental/studio/main.cc
+++ b/src/experimental/studio/main.cc
@@ -22,7 +22,7 @@
 #include <string_view>
 #include <vector>
 
-#include "third_party/absl/flags/flag.h"
+#include <absl/flags/flag.h>
 #include "experimental/studio/app.h"
 
 ABSL_FLAG(int, window_width, 1400, "Window width");
diff --git a/src/experimental/toolbox/helpers.cc b/src/experimental/toolbox/helpers.cc
index aef5cea2..ab73fe62 100644
--- a/src/experimental/toolbox/helpers.cc
+++ b/src/experimental/toolbox/helpers.cc
@@ -24,8 +24,8 @@
 #include <string>
 #include <vector>
 
-#include "third_party/libwebp/src/webp/encode.h"
-#include "third_party/libwebp/src/webp/types.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 #include <mujoco/mjrender.h>
 #include <mujoco/mjxmacro.h>
 #include <mujoco/mujoco.h>
diff --git a/src/experimental/toolbox/imgui_widgets.cc b/src/experimental/toolbox/imgui_widgets.cc
index db2bd656..7f34fa89 100644
--- a/src/experimental/toolbox/imgui_widgets.cc
+++ b/src/experimental/toolbox/imgui_widgets.cc
@@ -18,7 +18,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <dear_imgui/imgui.h>
+#include <imgui.h>
 #include <mujoco/mujoco.h>
 
 namespace mujoco::toolbox {
diff --git a/src/experimental/toolbox/imgui_widgets.h b/src/experimental/toolbox/imgui_widgets.h
index 040df0c7..3aa7881c 100644
--- a/src/experimental/toolbox/imgui_widgets.h
+++ b/src/experimental/toolbox/imgui_widgets.h
@@ -21,8 +21,8 @@
 #include <type_traits>
 #include <unordered_map>
 
-#include <dear_imgui/imgui.h>
-#include <dear_imgui/imgui_internal.h>  // For ButtonEx and PressedOnClick
+#include <imgui.h>
+#include <imgui_internal.h>  // For ButtonEx and PressedOnClick
 #include <mujoco/mujoco.h>
 
 namespace mujoco::toolbox {
diff --git a/src/experimental/toolbox/interaction.cc b/src/experimental/toolbox/interaction.cc
index 8d9b28a0..2bff2ea3 100644
--- a/src/experimental/toolbox/interaction.cc
+++ b/src/experimental/toolbox/interaction.cc
@@ -15,7 +15,7 @@
 #include "experimental/toolbox/interaction.h"
 #include <algorithm>
 
-#include <dear_imgui/imgui.h>
+#include <imgui.h>
 #include "experimental/toolbox/imgui_widgets.h"
 #include "experimental/toolbox/physics.h"
 #include "experimental/toolbox/renderer.h"
diff --git a/src/experimental/toolbox/window.cc b/src/experimental/toolbox/window.cc
index 1413b239..bd6d2fcf 100644
--- a/src/experimental/toolbox/window.cc
+++ b/src/experimental/toolbox/window.cc
@@ -17,16 +17,16 @@
 #include <string>
 #include <string_view>
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_error.h>
-#include <SDL2/SDL_events.h>
-#include <SDL2/SDL_hints.h>
-#include <SDL2/SDL_syswm.h>
-#include <SDL2/SDL_version.h>
-#include <SDL2/SDL_video.h>
-#include <dear_imgui/backends/imgui_impl_sdl2.h>
-#include <dear_imgui/imgui.h>
-#include <implot/implot.h>
+#include <SDL.h>
+#include <SDL_error.h>
+#include <SDL_events.h>
+#include <SDL_hints.h>
+#include <SDL_syswm.h>
+#include <SDL_version.h>
+#include <SDL_video.h>
+#include <backends/imgui_impl_sdl2.h>
+#include <imgui.h>
+#include <implot.h>
 #include "experimental/toolbox/helpers.h"
 #include <mujoco/mujoco.h>
 
diff --git a/src/experimental/toolbox/window.h b/src/experimental/toolbox/window.h
index 2fbc8eae..ec221209 100644
--- a/src/experimental/toolbox/window.h
+++ b/src/experimental/toolbox/window.h
@@ -19,7 +19,7 @@
 #include <string_view>
 
 #include "experimental/toolbox/helpers.h"
-#include <SDL2/SDL_video.h>
+#include <SDL_video.h>
 
 namespace mujoco::toolbox {