Fix includes to compile on CI

canonical · Nov 12, 2024 · 9365a8e · 9365a8e
1 parent 38b971a
commit 9365a8e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/examples/miral-custom-decorations/CMakeLists.txt b/examples/miral-custom-decorations/CMakeLists.txt
@@ -10,6 +10,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/include/miral
   ${PROJECT_SOURCE_DIR}/src/include/server
   ${PROJECT_SOURCE_DIR}/include/platform
+  ${PROJECT_SOURCE_DIR}/include/wayland
 )
 
 mir_add_wrapped_executable(miral-custom-decorations

diff --git a/examples/miral-custom-decorations/input.cpp b/examples/miral-custom-decorations/input.cpp
@@ -22,8 +22,8 @@
 #include "threadsafe_access.h"
 #include "window.h"
 
-#include "mircommon/mir_toolkit/events/event.h"
-#include "mircommon/mir_toolkit/cursors.h"
+#include "mir_toolkit/event.h"
+#include "mir_toolkit/cursors.h"
 
 
 #include <functional>

diff --git a/examples/miral-custom-decorations/user_decoration_example.cpp b/examples/miral-custom-decorations/user_decoration_example.cpp
@@ -28,7 +28,7 @@
 #include "mir/graphics/buffer_properties.h"
 #include "mir/compositor/buffer_stream.h"
 #include "mir/input/cursor_images.h"
-#include "mirwayland/mir/wayland/weak.h"
+#include "mir/wayland/weak.h"
 
 namespace mc = mir::compositor;
 namespace mg = mir::graphics;

diff --git a/examples/miral-custom-decorations/user_decoration_manager_example.cpp b/examples/miral-custom-decorations/user_decoration_manager_example.cpp
@@ -23,7 +23,7 @@
 #include <mir/graphics/display_configuration.h>
 #include <mir/graphics/null_display_configuration_observer.h>
 /* #include <bffoost/throw_exception.hpp> */
-#include "mirserver-internal/mir/observer_registrar.h"
+#include "mir/observer_registrar.h"
 
 
 #include <vector>

diff --git a/examples/miral-custom-decorations/window.h b/examples/miral-custom-decorations/window.h
@@ -17,12 +17,11 @@
 #ifndef MIRAL_CUSTOM_DECORATIONS_WINDOW_H
 #define MIRAL_CUSTOM_DECORATIONS_WINDOW_H
 
-#include "mircore/mir/geometry/forward.h"
-#include "mircore/mir/geometry/dimensions.h"
-#include "mircore/mir/geometry/size.h"
-#include "mircore/mir/geometry/point.h"
-#include "mircore/mir/geometry/displacement.h"
-#include "mircore/mir_toolkit/common.h"
+#include "mir/geometry/forward.h"
+#include "mir/geometry/size.h"
+#include "mir/geometry/point.h"
+#include "mir/geometry/displacement.h"
+#include "mir_toolkit/common.h"
 #include "threadsafe_access.h"
 
 #include <memory>