From 6be22d46947abfc0f6c1112459e29ba81b53eb61 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Mon, 8 May 2023 17:22:30 -0700
Subject: [PATCH 1/2] Include gz/msgs.hh instead of ignition

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 include/gz/sim/gui/TmpIface.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/gz/sim/gui/TmpIface.hh b/include/gz/sim/gui/TmpIface.hh
index 8709d3036d..ed54a7597b 100644
--- a/include/gz/sim/gui/TmpIface.hh
+++ b/include/gz/sim/gui/TmpIface.hh
@@ -21,7 +21,7 @@
   #include <gz/gui/qt.h>
 #endif
 
-#include <ignition/msgs.hh>
+#include <gz/msgs.hh>
 #include <gz/transport.hh>
 
 #include "gz/sim/Export.hh"

From a37883a2416fc9412bdd9558b1d82a41345e38ce Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Mon, 8 May 2023 17:23:52 -0700
Subject: [PATCH 2/2] Install components.hh to gz/sim

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 include/gz/sim/components/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/gz/sim/components/CMakeLists.txt b/include/gz/sim/components/CMakeLists.txt
index 83f18ce69d..100786be0e 100644
--- a/include/gz/sim/components/CMakeLists.txt
+++ b/include/gz/sim/components/CMakeLists.txt
@@ -13,5 +13,5 @@ configure_file(
 
 install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/components.hh
-  DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${IGN_DESIGNATION}
+  DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/gz/sim
 )