1 files changed, 24 insertions, 9 deletions
diff --git a/src/adwaita/disfluid-adwaita.h b/src/adwaita/disfluid-adwaita.h
index 2c16899..c4c76fe 100644
--- a/src/adwaita/disfluid-adwaita.h
+++ b/src/adwaita/disfluid-adwaita.h
@@ -4,12 +4,33 @@
 # include <stdlib.h>
 # include <glib-object.h>
 # include <gtk/gtk.h>
+# include <adwaita.h>
 
-struct DisfluidAdwApplication;
+/* *INDENT-OFF* */
+G_BEGIN_DECLS
+/* *INDENT-ON* */
 
-ATTRIBUTE_CONST GType disfluid_adw_application_get_type (void);
+# define DISFLUID_ADW_TYPE_APPLICATION \
+  disfluid_adw_application_get_type ()
 
-struct DisfluidAdwApplication *disfluid_adw_application_new (void);
+# define DISFLUID_ADW_TYPE_WINDOW \
+  disfluid_adw_window_get_type ()
+
+/* *INDENT-OFF* */
+G_DECLARE_FINAL_TYPE (DisfluidAdwApplication,
+                      disfluid_adw_application,
+                      DISFLUID_ADW, APPLICATION,
+                      AdwApplication)
+G_DECLARE_FINAL_TYPE (DisfluidAdwWindow,
+                      disfluid_adw_window,
+                      DISFLUID_ADW, WINDOW,
+                      AdwApplicationWindow)
+G_END_DECLS
+/* *INDENT-ON* */
+
+DisfluidAdwApplication *disfluid_adw_application_new (void);
+
+GtkWidget *disfluid_adw_window_new (GtkApplication * app);
 
 ATTRIBUTE_CONST const char *disfluid_adw_application_id (void);
 
@@ -19,10 +40,4 @@ GMenuItem *disfluid_adw_menu_item_about (void);
 
 GMenu *disfluid_adw_main_menu (void);
 
-struct DisfluidAdwWindow;
-
-ATTRIBUTE_CONST GType disfluid_adw_window_get_type (void);
-
-GtkWidget *disfluid_adw_window_new (GtkApplication * app);
-
 #endif /* not H_DISFLUID_ADWAITA_INCLUDED */