1 files changed, 11 insertions, 19 deletions
diff --git a/adw/include/adwaitamm/applicationwindow.hpp b/adw/include/adwaitamm/applicationwindow.hpp
index 310795e..454fad5 100644
--- a/adw/include/adwaitamm/applicationwindow.hpp
+++ b/adw/include/adwaitamm/applicationwindow.hpp
@@ -11,31 +11,21 @@
 #include <gtkmm/application.h>
 #include <gtkmm/applicationwindow.h>
 
-using AdwApplicationWindow = struct _AdwApplicationWindow;
-using AdwApplicationWindowClass = struct _AdwApplicationWindowClass;
+#include <glib-object.h>
+
+#define _ADWAITA_INSIDE
+#include <adw-application-window.h>
+#undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
   struct ApplicationWindow : Gtk::ApplicationWindow,
                              helpers::gobj_mixin<ApplicationWindow, AdwApplicationWindow>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = GtkApplicationWindowClass;
-      using BaseClassType = AdwApplicationWindowClass;
-      using BaseObjectType = AdwApplicationWindow;
-      using CppClassParent = struct Gtk::ApplicationWindow_Class;
-      using CppObjectType = ApplicationWindow;
-
-      auto init() -> Glib::Class const &;
-      auto static class_init_function(void * gclass, void * data) -> void;
-      auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
-    };
-
-    using BaseObjectType = Class::BaseObjectType;
-    using BaseClassType = Class::BaseClassType;
-    using CppObjectType = Class::CppObjectType;
-    using CppClassType = Class;
+    using BaseObjectType = AdwApplicationWindow;
+    using BaseClassType = AdwApplicationWindowClass;
+    using CppObjectType = ApplicationWindow;
+    using CppClassType = struct ApplicationWindow_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -51,6 +41,8 @@ namespace Adwaita
     auto static get_base_type() -> GType;
 
   protected:
+    friend ApplicationWindow_Class;
+
     explicit ApplicationWindow(Glib::ConstructParams const & params);
     explicit ApplicationWindow(BaseObjectType * gobj);
   };