diff --git a/gnucash/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c
index 1d54241e5a3..f38ad518d5c 100644
--- a/gnucash/gnome-utils/gnc-tree-view-account.c
+++ b/gnucash/gnome-utils/gnc-tree-view-account.c
@@ -93,6 +93,12 @@ static gboolean
 gnc_tree_view_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_tip,
                           GtkTooltip *tooltip, gpointer user_data);
 
+struct _GncTreeViewAccount
+{
+    GncTreeView   gnc_tree_view;
+    int           stamp;
+};
+
 typedef struct GncTreeViewAccountPrivate
 {
     AccountViewInfo avi;
diff --git a/gnucash/gnome-utils/gnc-tree-view-account.h b/gnucash/gnome-utils/gnc-tree-view-account.h
index 38ae73daee7..9a2fa35d096 100644
--- a/gnucash/gnome-utils/gnc-tree-view-account.h
+++ b/gnucash/gnome-utils/gnc-tree-view-account.h
@@ -59,12 +59,6 @@ struct AccountViewInfo_s
 };
 
 
-struct _GncTreeViewAccount
-{
-    GncTreeView   gnc_tree_view;
-    int           stamp;
-};
-
 typedef	struct
 {
     GtkWidget           *dialog;
diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c
index 4a496471544..880394ec7d8 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c
@@ -50,6 +50,12 @@ static QofLogModule log_module = GNC_MOD_GUI;
 static void gnc_tree_view_commodity_finalize (GObject *object);
 static void gnc_tree_view_commodity_destroy (GtkWidget *widget);
 
+struct _GncTreeViewCommodity
+{
+    GncTreeView gnc_tree_view;
+    int stamp;
+};
+
 typedef struct GncTreeViewCommodityPrivate
 {
     gpointer dummy;
diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.h b/gnucash/gnome-utils/gnc-tree-view-commodity.h
index c758c8bc8f9..26643abbddb 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.h
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.h
@@ -46,13 +46,6 @@ G_BEGIN_DECLS
 #define GNC_TYPE_TREE_VIEW_COMMODITY            (gnc_tree_view_commodity_get_type ())
 G_DECLARE_FINAL_TYPE (GncTreeViewCommodity, gnc_tree_view_commodity, GNC, TREE_VIEW_COMMODITY, GncTreeView)
 
-/* typedefs & structures */
-struct _GncTreeViewCommodity
-{
-    GncTreeView gnc_tree_view;
-    int stamp;
-};
-
 /** @name Commodity Tree View Constructors
  @{ */
 
diff --git a/gnucash/gnome-utils/gnc-tree-view-owner.c b/gnucash/gnome-utils/gnc-tree-view-owner.c
index f8a805ff511..866c3108126 100644
--- a/gnucash/gnome-utils/gnc-tree-view-owner.c
+++ b/gnucash/gnome-utils/gnc-tree-view-owner.c
@@ -70,6 +70,12 @@ static void gtvo_setup_column_renderer_edited_cb(GncTreeViewOwner *owner_view,
         GncTreeViewOwnerColumnTextEdited col_edited_cb);
 #endif /* Not Used */
 
+struct _GncTreeViewOwner
+{
+    GncTreeView gnc_tree_view;
+    int stamp;
+};
+
 typedef struct GncTreeViewOwnerPrivate
 {
     OwnerViewInfo ovi;
diff --git a/gnucash/gnome-utils/gnc-tree-view-owner.h b/gnucash/gnome-utils/gnc-tree-view-owner.h
index 312365b94e3..9f78d0ca944 100644
--- a/gnucash/gnome-utils/gnc-tree-view-owner.h
+++ b/gnucash/gnome-utils/gnc-tree-view-owner.h
@@ -59,12 +59,6 @@ struct OwnerViewInfo_s
 };
 
 
-struct _GncTreeViewOwner
-{
-    GncTreeView gnc_tree_view;
-    int stamp;
-};
-
 typedef struct
 {
     GtkWidget    *dialog;
diff --git a/gnucash/gnome-utils/gnc-tree-view-price.c b/gnucash/gnome-utils/gnc-tree-view-price.c
index 886c777767b..70e2448be69 100644
--- a/gnucash/gnome-utils/gnc-tree-view-price.c
+++ b/gnucash/gnome-utils/gnc-tree-view-price.c
@@ -50,6 +50,12 @@ static QofLogModule log_module = GNC_MOD_GUI;
 static void gnc_tree_view_price_finalize (GObject *object);
 static void gnc_tree_view_price_destroy (GtkWidget *widget);
 
+struct _GncTreeViewPrice
+{
+    GncTreeView gnc_tree_view;
+    int stamp;
+};
+
 typedef struct GncTreeViewPricePrivate
 {
     gpointer dummy;
diff --git a/gnucash/gnome-utils/gnc-tree-view-price.h b/gnucash/gnome-utils/gnc-tree-view-price.h
index 47f3c381389..f9d9b7c04ce 100644
--- a/gnucash/gnome-utils/gnc-tree-view-price.h
+++ b/gnucash/gnome-utils/gnc-tree-view-price.h
@@ -46,13 +46,6 @@ G_BEGIN_DECLS
 #define GNC_TYPE_TREE_VIEW_PRICE            (gnc_tree_view_price_get_type ())
 G_DECLARE_FINAL_TYPE (GncTreeViewPrice, gnc_tree_view_price, GNC, TREE_VIEW_PRICE, GncTreeView)
 
-/* typedefs & structures */
-struct _GncTreeViewPrice
-{
-    GncTreeView gnc_tree_view;
-    int stamp;
-};
-
 /** @name Price Tree View Constructors
  @{ */
 
diff --git a/gnucash/gnome-utils/gnc-tree-view-sx-list.c b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
index 673af2353e3..0779873ccc6 100644
--- a/gnucash/gnome-utils/gnc-tree-view-sx-list.c
+++ b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
@@ -50,6 +50,11 @@ static QofLogModule log_module = LOG_MOD;
 static void gnc_tree_view_sx_list_dispose(GObject *object);
 static void gnc_tree_view_sx_list_finalize(GObject *object);
 
+struct _GncTreeViewSxList
+{
+    GncTreeView gnc_tree_view;
+};
+
 typedef struct GncTreeViewSxListPrivate
 {
     GtkTreeModel *tree_model;
diff --git a/gnucash/gnome-utils/gnc-tree-view-sx-list.h b/gnucash/gnome-utils/gnc-tree-view-sx-list.h
index 6319e64db7c..970b4c7098a 100644
--- a/gnucash/gnome-utils/gnc-tree-view-sx-list.h
+++ b/gnucash/gnome-utils/gnc-tree-view-sx-list.h
@@ -40,11 +40,6 @@ G_BEGIN_DECLS
 #define GNC_TYPE_TREE_VIEW_SX_LIST            (gnc_tree_view_sx_list_get_type ())
 G_DECLARE_FINAL_TYPE (GncTreeViewSxList, gnc_tree_view_sx_list, GNC, TREE_VIEW_SX_LIST, GncTreeView)
 
-struct _GncTreeViewSxList
-{
-    GncTreeView gnc_tree_view;
-};
-
 GtkTreeView* gnc_tree_view_sx_list_new(GncSxInstanceModel *sx_instances);
 
 SchedXaction* gnc_tree_view_sx_list_get_sx_from_path(GncTreeViewSxList *view, GtkTreePath *path);