diff --git a/src/backends/x11/cm/meta-backend-x11-cm.c b/src/backends/x11/cm/meta-backend-x11-cm.c
index 5b5da8766..32e503773 100644
--- a/src/backends/x11/cm/meta-backend-x11-cm.c
+++ b/src/backends/x11/cm/meta-backend-x11-cm.c
@@ -63,7 +63,9 @@ struct _MetaBackendX11Cm
   MetaInputSettings *input_settings;
 };
 
-G_DEFINE_TYPE (MetaBackendX11Cm, meta_backend_x11_cm, META_TYPE_BACKEND_X11)
+G_DEFINE_FINAL_TYPE (MetaBackendX11Cm,
+                     meta_backend_x11_cm,
+                     META_TYPE_BACKEND_X11)
 
 static void
 apply_keymap (MetaBackendX11 *x11);
diff --git a/src/backends/x11/cm/meta-backend-x11-cm.h b/src/backends/x11/cm/meta-backend-x11-cm.h
index 0dcc962ac..02ed196d6 100644
--- a/src/backends/x11/cm/meta-backend-x11-cm.h
+++ b/src/backends/x11/cm/meta-backend-x11-cm.h
@@ -22,5 +22,7 @@
 #include "backends/x11/meta-backend-x11.h"
 
 #define META_TYPE_BACKEND_X11_CM (meta_backend_x11_cm_get_type ())
-G_DECLARE_FINAL_TYPE (MetaBackendX11Cm, meta_backend_x11_cm,
-                      META, BACKEND_X11_CM, MetaBackendX11)
+G_DECLARE_FINAL_TYPE (MetaBackendX11Cm,
+                      meta_backend_x11_cm,
+                      META, BACKEND_X11_CM,
+                      MetaBackendX11)
diff --git a/src/backends/x11/nested/meta-backend-x11-nested.c b/src/backends/x11/nested/meta-backend-x11-nested.c
index 0733fb3df..da2a2771e 100644
--- a/src/backends/x11/nested/meta-backend-x11-nested.c
+++ b/src/backends/x11/nested/meta-backend-x11-nested.c
@@ -29,16 +29,18 @@
 #include "wayland/meta-wayland.h"
 #endif
 
-typedef struct _MetaBackendX11NestedPrivate
+struct _MetaBackendX11Nested
 {
+  MetaBackendX11 parent;
+
   MetaGpu *gpu;
   MetaCursorRenderer *cursor_renderer;
   MetaInputSettings *input_settings;
-} MetaBackendX11NestedPrivate;
+};
 
-G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendX11Nested,
-                            meta_backend_x11_nested,
-                            META_TYPE_BACKEND_X11)
+G_DEFINE_FINAL_TYPE (MetaBackendX11Nested,
+                     meta_backend_x11_nested,
+                     META_TYPE_BACKEND_X11)
 
 static MetaRenderer *
 meta_backend_x11_nested_create_renderer (MetaBackend *backend,
@@ -63,37 +65,33 @@ meta_backend_x11_nested_get_cursor_renderer (MetaBackend        *backend,
                                              ClutterInputDevice *device)
 {
   MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (backend);
-  MetaBackendX11NestedPrivate *priv =
-    meta_backend_x11_nested_get_instance_private (backend_x11_nested);
 
-  if (!priv->cursor_renderer)
+  if (!backend_x11_nested->cursor_renderer)
     {
-      priv->cursor_renderer =
+      backend_x11_nested->cursor_renderer =
         g_object_new (META_TYPE_CURSOR_RENDERER_X11_NESTED,
                       "backend", backend,
                       "device", device,
                       NULL);
     }
 
-  return priv->cursor_renderer;
+  return backend_x11_nested->cursor_renderer;
 }
 
 static MetaInputSettings *
 meta_backend_x11_nested_get_input_settings (MetaBackend *backend)
 {
   MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (backend);
-  MetaBackendX11NestedPrivate *priv =
-    meta_backend_x11_nested_get_instance_private (backend_x11_nested);
 
-  if (!priv->input_settings)
+  if (!backend_x11_nested->input_settings)
     {
-      priv->input_settings =
+      backend_x11_nested->input_settings =
         g_object_new (META_TYPE_INPUT_SETTINGS_DUMMY,
                       "backend", backend,
                       NULL);
     }
 
-  return priv->input_settings;
+  return backend_x11_nested->input_settings;
 }
 
 static void
@@ -232,13 +230,11 @@ meta_backend_x11_nested_translate_device_event (MetaBackendX11 *x11,
 static void
 init_gpus (MetaBackendX11Nested *backend_x11_nested)
 {
-  MetaBackendX11NestedPrivate *priv =
-    meta_backend_x11_nested_get_instance_private (backend_x11_nested);
-
-  priv->gpu = g_object_new (META_TYPE_GPU_DUMMY,
-                            "backend", backend_x11_nested,
-                            NULL);
-  meta_backend_add_gpu (META_BACKEND (backend_x11_nested), priv->gpu);
+  backend_x11_nested->gpu = g_object_new (META_TYPE_GPU_DUMMY,
+                                          "backend", backend_x11_nested,
+                                          NULL);
+  meta_backend_add_gpu (META_BACKEND (backend_x11_nested),
+                        backend_x11_nested->gpu);
 }
 
 static MetaBackendCapabilities
@@ -267,11 +263,9 @@ static void
 meta_backend_x11_nested_dispose (GObject *object)
 {
   MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (object);
-  MetaBackendX11NestedPrivate *priv =
-    meta_backend_x11_nested_get_instance_private (backend_x11_nested);
 
-  g_clear_object (&priv->input_settings);
-  g_clear_object (&priv->cursor_renderer);
+  g_clear_object (&backend_x11_nested->input_settings);
+  g_clear_object (&backend_x11_nested->cursor_renderer);
 
   G_OBJECT_CLASS (meta_backend_x11_nested_parent_class)->dispose (object);
 }
diff --git a/src/backends/x11/nested/meta-backend-x11-nested.h b/src/backends/x11/nested/meta-backend-x11-nested.h
index 683a7b079..f923e35fe 100644
--- a/src/backends/x11/nested/meta-backend-x11-nested.h
+++ b/src/backends/x11/nested/meta-backend-x11-nested.h
@@ -23,13 +23,7 @@
 #include "core/util-private.h"
 
 #define META_TYPE_BACKEND_X11_NESTED (meta_backend_x11_nested_get_type ())
-META_EXPORT_TEST
-G_DECLARE_DERIVABLE_TYPE (MetaBackendX11Nested, meta_backend_x11_nested,
-                          META, BACKEND_X11_NESTED, MetaBackendX11)
-
-struct _MetaBackendX11NestedClass
-{
-  MetaBackendX11Class parent_class;
-
-  void (* init_gpus) (MetaBackendX11Nested *backend_x11_nested);
-};
+G_DECLARE_FINAL_TYPE (MetaBackendX11Nested,
+                      meta_backend_x11_nested,
+                      META, BACKEND_X11_NESTED,
+                      MetaBackendX11)