diff --git a/app/widgets/gimpcontainerbox.h b/app/widgets/gimpcontainerbox.h
index 392b20e138..42ff0e825b 100644
--- a/app/widgets/gimpcontainerbox.h
+++ b/app/widgets/gimpcontainerbox.h
@@ -51,3 +51,6 @@ GType     gimp_container_box_get_type         (void) G_GNUC_CONST;
 void      gimp_container_box_set_size_request (GimpContainerBox *box,
                                                gint              width,
                                                gint              height);
+
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GimpContainerBox, g_object_unref)
diff --git a/app/widgets/gimpcontainerlistview.h b/app/widgets/gimpcontainerlistview.h
index 1bd7c6fb88..02116f4295 100644
--- a/app/widgets/gimpcontainerlistview.h
+++ b/app/widgets/gimpcontainerlistview.h
@@ -23,21 +23,13 @@
 #include "gimpcontainerbox.h"
 
 
-#define GIMP_TYPE_CONTAINER_LIST_VIEW            (gimp_container_list_view_get_type ())
-#define GIMP_CONTAINER_LIST_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_LIST_VIEW, GimpContainerListView))
-#define GIMP_CONTAINER_LIST_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_LIST_VIEW, GimpContainerListViewClass))
-#define GIMP_IS_CONTAINER_LIST_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_LIST_VIEW))
-#define GIMP_IS_CONTAINER_LIST_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_LIST_VIEW))
-#define GIMP_CONTAINER_LIST_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_LIST_VIEW, GimpContainerListViewClass))
+#define GIMP_TYPE_CONTAINER_LIST_VIEW (gimp_container_list_view_get_type ())
+G_DECLARE_DERIVABLE_TYPE (GimpContainerListView,
+                          gimp_container_list_view,
+                          GIMP, CONTAINER_LIST_VIEW,
+                          GimpContainerBox)
 
 
-typedef struct _GimpContainerListViewClass GimpContainerListViewClass;
-
-struct _GimpContainerListView
-{
-  GimpContainerBox   parent_instance;
-};
-
 struct _GimpContainerListViewClass
 {
   GimpContainerBoxClass  parent_class;