diff --git a/src/backends/meta-backend-private.h b/src/backends/meta-backend-private.h
index 4b0e1b2ae..1ffc04c88 100644
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@@ -27,13 +27,13 @@
 
 #include "meta/meta-backend.h"
 #include "meta/meta-idle-monitor.h"
+#include "meta/meta-orientation-manager.h"
 #include "backends/meta-backend-types.h"
 #include "backends/meta-cursor-renderer.h"
 #include "backends/meta-egl.h"
 #include "backends/meta-input-mapper-private.h"
 #include "backends/meta-input-settings-private.h"
 #include "backends/meta-monitor-manager-private.h"
-#include "backends/meta-orientation-manager.h"
 #include "backends/meta-pointer-constraint.h"
 #include "backends/meta-renderer.h"
 #include "backends/meta-settings-private.h"
@@ -138,8 +138,6 @@ MetaIdleManager * meta_backend_get_idle_manager (MetaBackend *backend);
 META_EXPORT_TEST
 MetaColorManager * meta_backend_get_color_manager (MetaBackend *backend);
 
-META_EXPORT_TEST
-MetaOrientationManager * meta_backend_get_orientation_manager (MetaBackend *backend);
 META_EXPORT_TEST
 MetaCursorTracker * meta_backend_get_cursor_tracker (MetaBackend *backend);
 MetaCursorRenderer * meta_backend_get_cursor_renderer_for_device (MetaBackend        *backend,
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index 4d997e13a..1634b8325 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -1372,7 +1372,9 @@ meta_backend_get_color_manager (MetaBackend *backend)
 }
 
 /**
- * meta_backend_get_orientation_manager: (skip)
+ * meta_backend_get_orientation_manager:
+ *
+ * Returns: (transfer none): A #MetaOrientationManager
  */
 MetaOrientationManager *
 meta_backend_get_orientation_manager (MetaBackend *backend)
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 1fd1128b8..56edfd70b 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -52,13 +52,13 @@
 #include "backends/meta-monitor.h"
 #include "backends/meta-monitor-config-manager.h"
 #include "backends/meta-monitor-config-store.h"
-#include "backends/meta-orientation-manager.h"
 #include "backends/meta-output.h"
 #include "backends/meta-virtual-monitor.h"
 #include "clutter/clutter.h"
 #include "core/util-private.h"
 #include "meta/main.h"
 #include "meta/meta-enum-types.h"
+#include "meta/meta-orientation-manager.h"
 
 #include "meta-dbus-display-config.h"
 
diff --git a/src/backends/meta-monitor-transform.h b/src/backends/meta-monitor-transform.h
index 21454fb64..d55445811 100644
--- a/src/backends/meta-monitor-transform.h
+++ b/src/backends/meta-monitor-transform.h
@@ -21,7 +21,7 @@
 #include <glib-object.h>
 
 #include "backends/meta-backend-types.h"
-#include "backends/meta-orientation-manager.h"
+#include "meta/meta-orientation-manager.h"
 #include "core/util-private.h"
 
 enum _MetaMonitorTransform
diff --git a/src/backends/meta-orientation-manager.c b/src/backends/meta-orientation-manager.c
index 5c6cc9e8f..187d4fce1 100644
--- a/src/backends/meta-orientation-manager.c
+++ b/src/backends/meta-orientation-manager.c
@@ -17,9 +17,19 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * MetaOrientationManager:
+ *
+ * A screen orientation manager
+ *
+ * #MetaOrientationManager is a final class which contains methods to
+ * read the current screen orientation, as well as a signal that is
+ * triggered whenever a screen changes its orientation.
+ */
+
 #include "config.h"
 
-#include "backends/meta-orientation-manager.h"
+#include "meta/meta-orientation-manager.h"
 
 #include <gio/gio.h>
 
diff --git a/src/meson.build b/src/meson.build
index c5dffd587..f6088fb33 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -262,7 +262,6 @@ mutter_sources = [
   'backends/meta-monitor-transform.c',
   'backends/meta-monitor-transform.h',
   'backends/meta-orientation-manager.c',
-  'backends/meta-orientation-manager.h',
   'backends/meta-output.c',
   'backends/meta-output.h',
   'backends/meta-pointer-constraint.c',
diff --git a/src/meta/meson.build b/src/meta/meson.build
index 0fe79326d..652946869 100644
--- a/src/meta/meson.build
+++ b/src/meta/meson.build
@@ -27,6 +27,7 @@ mutter_public_headers = [
   'meta-monitor-manager.h',
   'meta-multi-texture.h',
   'meta-multi-texture-format.h',
+  'meta-orientation-manager.h',
   'meta-plugin.h',
   'meta-remote-access-controller.h',
   'meta-selection.h',
diff --git a/src/meta/meta-backend.h b/src/meta/meta-backend.h
index b6836a99f..4b85e87fa 100644
--- a/src/meta/meta-backend.h
+++ b/src/meta/meta-backend.h
@@ -28,6 +28,7 @@
 #include "meta/meta-dnd.h"
 #include "meta/meta-idle-monitor.h"
 #include "meta/meta-monitor-manager.h"
+#include "meta/meta-orientation-manager.h"
 #include "meta/meta-remote-access-controller.h"
 
 typedef enum _MetaBackendCapabilities
@@ -69,6 +70,9 @@ MetaIdleMonitor * meta_backend_get_core_idle_monitor (MetaBackend *backend);
 META_EXPORT
 MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
 
+META_EXPORT
+MetaOrientationManager * meta_backend_get_orientation_manager (MetaBackend *backend);
+
 META_EXPORT
 MetaRemoteAccessController * meta_backend_get_remote_access_controller (MetaBackend *backend);
 
diff --git a/src/backends/meta-orientation-manager.h b/src/meta/meta-orientation-manager.h
similarity index 81%
rename from src/backends/meta-orientation-manager.h
rename to src/meta/meta-orientation-manager.h
index cac88f6fe..c857ec543 100644
--- a/src/backends/meta-orientation-manager.h
+++ b/src/meta/meta-orientation-manager.h
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
 /*
- * Copyright (C) 2017 Red Hat
+ * Copyright (C) 2024 Red Hat
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,7 +21,7 @@
 
 #include <glib-object.h>
 
-#include "core/util-private.h"
+#include "meta/common.h"
 
 typedef enum
 {
@@ -35,12 +35,15 @@ typedef enum
 
 #define META_TYPE_ORIENTATION_MANAGER (meta_orientation_manager_get_type ())
 
-META_EXPORT_TEST
-G_DECLARE_FINAL_TYPE (MetaOrientationManager, meta_orientation_manager,
-                      META, ORIENTATION_MANAGER, GObject)
+META_EXPORT
+G_DECLARE_FINAL_TYPE (MetaOrientationManager,
+                      meta_orientation_manager,
+                      META,
+                      ORIENTATION_MANAGER,
+                      GObject)
 
-META_EXPORT_TEST
+META_EXPORT
 MetaOrientation meta_orientation_manager_get_orientation (MetaOrientationManager *self);
 
-META_EXPORT_TEST
+META_EXPORT
 gboolean meta_orientation_manager_has_accelerometer (MetaOrientationManager *self);
diff --git a/src/tests/meta-sensors-proxy-mock.h b/src/tests/meta-sensors-proxy-mock.h
index a7fb1624c..0f68dccd0 100644
--- a/src/tests/meta-sensors-proxy-mock.h
+++ b/src/tests/meta-sensors-proxy-mock.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "backends/meta-orientation-manager.h"
+#include "meta/meta-orientation-manager.h"
 
 typedef GDBusProxy MetaSensorsProxyMock;
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaSensorsProxyMock, g_object_unref)
diff --git a/src/tests/monitor-unit-tests.c b/src/tests/monitor-unit-tests.c
index c41003c3c..1ad36860e 100644
--- a/src/tests/monitor-unit-tests.c
+++ b/src/tests/monitor-unit-tests.c
@@ -25,10 +25,10 @@
 #include "backends/meta-monitor.h"
 #include "backends/meta-monitor-config-migration.h"
 #include "backends/meta-monitor-config-store.h"
-#include "backends/meta-orientation-manager.h"
 #include "backends/meta-output.h"
 #include "core/window-private.h"
 #include "meta-backend-test.h"
+#include "meta/meta-orientation-manager.h"
 #include "meta-test/meta-context-test.h"
 #include "tests/meta-monitor-manager-test.h"
 #include "tests/meta-monitor-test-utils.h"
diff --git a/src/tests/orientation-manager-unit-tests.h b/src/tests/orientation-manager-unit-tests.h
index af82514ff..7cbc91076 100644
--- a/src/tests/orientation-manager-unit-tests.h
+++ b/src/tests/orientation-manager-unit-tests.h
@@ -20,6 +20,6 @@
 
 #pragma once
 
-#include "backends/meta-orientation-manager.h"
+#include "meta/meta-orientation-manager.h"
 
 void init_orientation_manager_tests (void);