diff --git a/gnucash/gnome-utils/gnc-cell-renderer-text-flag.h b/gnucash/gnome-utils/gnc-cell-renderer-text-flag.h
index 1002704823..be27fe887d 100644
--- a/gnucash/gnome-utils/gnc-cell-renderer-text-flag.h
+++ b/gnucash/gnome-utils/gnc-cell-renderer-text-flag.h
@@ -30,14 +30,8 @@
 
 
 #define GNC_TYPE_CELL_RENDERER_TEXT_FLAG		(gnc_cell_renderer_text_flag_get_type ())
-#define GNC_CELL_RENDERER_TEXT_FLAG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_CELL_RENDERER_TEXT_FLAG, GncCellRendererTextFlag))
-#define GNC_CELL_RENDERER_TEXT_FLAG_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_CELL_RENDERER_TEXT_FLAG, GncCellRendererTextFlagClass))
-#define GNC_IS_CELL_RENDERER_TEXT_FLAG(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_CELL_RENDERER_TEXT_FLAG))
-#define GNC_IS_CELL_RENDERER_TEXT_FLAG_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_CELL_RENDERER_TEXT_FLAG))
-#define GNC_CELL_RENDERER_TEXT_FLAG_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_CELL_RENDERER_TEXT_FLAG, GncCellRendererTextFlagClass))
+G_DECLARE_FINAL_TYPE (GncCellRendererTextFlag, gnc_cell_renderer_text_flag, GNC, CELL_RENDERER_TEXT_FLAG, GtkCellRendererText)
 
-typedef struct _GncCellRendererTextFlag              GncCellRendererTextFlag;
-typedef struct _GncCellRendererTextFlagClass         GncCellRendererTextFlagClass;
 typedef struct _GtkCellRendererTextPrivate
 {
     guint size;
@@ -54,12 +48,6 @@ struct _GncCellRendererTextFlag
   GncCellRendererTextFlagPrivate *priv;
 };
 
-struct _GncCellRendererTextFlagClass
-{
-  GtkCellRendererTextClass parent_class;
-};
-
-GType gnc_cell_renderer_text_flag_get_type(void) G_GNUC_CONST;
 GtkCellRenderer *gnc_cell_renderer_text_flag_new(void);
 
 #endif /* __GNC_CELL_RENDERER_TEXT_FLAG_H__ */