diff --git a/gnucash/gnome/assistant-stock-transaction.cpp b/gnucash/gnome/assistant-stock-transaction.cpp
index 248240cbdc..bae896aba4 100644
--- a/gnucash/gnome/assistant-stock-transaction.cpp
+++ b/gnucash/gnome/assistant-stock-transaction.cpp
@@ -913,7 +913,7 @@ stock_assistant_prepare (GtkAssistant  *assistant, GtkWidget *page,
 
     switch (currentpage)
     {
-    case PAGE_TRANSACTION_TYPE:;
+    case PAGE_TRANSACTION_TYPE:
         // initialize transaction types.
         gnc_numeric balance;
         time64 date;
diff --git a/gnucash/gnome/dialog-invoice.h b/gnucash/gnome/dialog-invoice.h
index 6130bf37ef..660ae858b1 100644
--- a/gnucash/gnome/dialog-invoice.h
+++ b/gnucash/gnome/dialog-invoice.h
@@ -76,7 +76,7 @@ void gnc_invoice_window_sort (InvoiceWindow *iw, invoice_sort_type_t sort_code);
 
 GtkWidget * gnc_invoice_window_create_summary_bar (InvoiceWindow *iw);
 
-void gnc_invoice_window_changed (InvoiceWindow *iw, GtkWidget *window);;
+void gnc_invoice_window_changed (InvoiceWindow *iw, GtkWidget *window);
 
 gchar *gnc_invoice_get_help (InvoiceWindow *iw);
 
diff --git a/gnucash/gnome/search-owner.c b/gnucash/gnome/search-owner.c
index e8bce2a4e4..60baddebbe 100644
--- a/gnucash/gnome/search-owner.c
+++ b/gnucash/gnome/search-owner.c
@@ -57,7 +57,7 @@ typedef struct _GNCSearchOwnerPrivate
     GtkWidget * owner_choice;
 } GNCSearchOwnerPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchOwner, gnc_search_owner, GNC_TYPE_SEARCH_CORE_TYPE);
+G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchOwner, gnc_search_owner, GNC_TYPE_SEARCH_CORE_TYPE)
 
 #define _PRIVATE(o)  \
    ((GNCSearchOwnerPrivate*)gnc_search_owner_get_instance_private((GNCSearchOwner*)o))
diff --git a/gnucash/import-export/bi-import/gnc-plugin-bi-import.c b/gnucash/import-export/bi-import/gnc-plugin-bi-import.c
index 88e1d2192b..6174feff24 100644
--- a/gnucash/import-export/bi-import/gnc-plugin-bi-import.c
+++ b/gnucash/import-export/bi-import/gnc-plugin-bi-import.c
@@ -69,7 +69,7 @@ static const gchar *gnc_plugin_load_ui_items [] =
  *                   Object Implementation                  *
  ************************************************************/
 
-G_DEFINE_TYPE(GncPluginbi_import, gnc_plugin_bi_import, GNC_TYPE_PLUGIN);
+G_DEFINE_TYPE(GncPluginbi_import, gnc_plugin_bi_import, GNC_TYPE_PLUGIN)
 
 GncPlugin *
 gnc_plugin_bi_import_new (void)
diff --git a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
index e78794031f..e0188cecd0 100644
--- a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
+++ b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
@@ -69,7 +69,7 @@ static const gchar *gnc_plugin_load_ui_items [] =
  *                   Object Implementation                  *
  ************************************************************/
 
-G_DEFINE_TYPE(GncPlugincustomer_import, gnc_plugin_customer_import, GNC_TYPE_PLUGIN);
+G_DEFINE_TYPE(GncPlugincustomer_import, gnc_plugin_customer_import, GNC_TYPE_PLUGIN)
 
 GncPlugin *
 gnc_plugin_customer_import_new (void)
diff --git a/gnucash/import-export/import-commodity-matcher.c b/gnucash/import-export/import-commodity-matcher.c
index 303832de59..d34904ef46 100644
--- a/gnucash/import-export/import-commodity-matcher.c
+++ b/gnucash/import-export/import-commodity-matcher.c
@@ -140,5 +140,5 @@ gnc_commodity * gnc_import_select_commodity(const char * cusip,
         gnc_commodity_set_cusip(retval, cusip);
     }
     return retval;
-};
+}
 /**@}*/
diff --git a/gnucash/import-export/import-settings.c b/gnucash/import-export/import-settings.c
index cf5e38f751..db8030515a 100644
--- a/gnucash/import-export/import-settings.c
+++ b/gnucash/import-export/import-settings.c
@@ -123,49 +123,49 @@ gnc_import_Settings_get_fuzzy_amount (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->fuzzy_amount;
-};
+}
 
 gboolean gnc_import_Settings_get_action_skip_enabled (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->action_skip_enabled;
-};
+}
 
 gboolean gnc_import_Settings_get_action_add_enabled (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->action_add_enabled;
-};
+}
 
 gboolean gnc_import_Settings_get_action_update_enabled (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->action_update_enabled;
-};
+}
 
 gboolean gnc_import_Settings_get_action_clear_enabled (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->action_clear_enabled;
-};
+}
 
 gint gnc_import_Settings_get_clear_threshold (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->clear_threshold;
-};
+}
 
 gint gnc_import_Settings_get_add_threshold (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->add_threshold;
-};
+}
 
 gint gnc_import_Settings_get_display_threshold (GNCImportSettings *settings)
 {
     g_assert (settings);
     return settings->display_threshold;
-};
+}
 
 gint gnc_import_Settings_get_date_threshold (GNCImportSettings *settings)
 {
diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
index 451cbf9edb..ab1ba6f36f 100644
--- a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
+++ b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
@@ -61,7 +61,7 @@ typedef struct GncPluginQifImportPrivate
     gpointer dummy;
 } GncPluginQifImportPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginQifImport, gnc_plugin_qif_import, GNC_TYPE_PLUGIN);
+G_DEFINE_TYPE_WITH_PRIVATE(GncPluginQifImport, gnc_plugin_qif_import, GNC_TYPE_PLUGIN)
 
 #define GNC_PLUGIN_QIF_IMPORT_GET_PRIVATE(o)  \
    ((GncPluginQifImportPrivate*)gnc_plugin_qif_import_get_instance_private((GncPluginQifImport*)o))
diff --git a/gnucash/register/ledger-core/split-register-copy-ops.c b/gnucash/register/ledger-core/split-register-copy-ops.c
index 5b4b6a7869..ebee1a1d34 100644
--- a/gnucash/register/ledger-core/split-register-copy-ops.c
+++ b/gnucash/register/ledger-core/split-register-copy-ops.c
@@ -86,57 +86,57 @@ void gnc_float_split_set_split(FloatingSplit *fs, Split *split)
 {
     g_return_if_fail (fs);
     fs->m_split = split;
-};
+}
 
 void gnc_float_split_set_account (FloatingSplit *fs, Account *account) /* direct account pointer rather than account guid */
 {
     g_return_if_fail (fs);
     fs->m_account = account;
-};
+}
 
 void gnc_float_split_set_transaction (FloatingSplit *fs, Transaction *transaction) /* direct transaction pointer rather than transaction guid */
 {
     g_return_if_fail (fs);
     fs->m_transaction = transaction;
-};
+}
 
 void gnc_float_split_set_memo (FloatingSplit *fs, const char *memo)
 {
     g_return_if_fail (fs);
     CACHE_REPLACE (fs->m_memo, memo);
-};
+}
 
 void gnc_float_split_set_action (FloatingSplit *fs, const char *action)
 {
     g_return_if_fail (fs);
     CACHE_REPLACE (fs->m_action, action);
-};
+}
 
 void gnc_float_split_set_reconcile_state (FloatingSplit *fs, char reconcile_state)
 {
     g_return_if_fail (fs);
     fs->m_reconcile_state = reconcile_state;
-};
+}
 
 void gnc_float_split_set_reconcile_date (FloatingSplit *fs, time64 reconcile_date)
 {
     g_return_if_fail (fs);
     fs->m_reconcile_date = reconcile_date;
-};
+}
 
 void gnc_float_split_set_amount (FloatingSplit *fs, const gnc_numeric amount)
 {
     g_return_if_fail (fs);
 
     fs->m_amount = amount;
-};
+}
 
 void gnc_float_split_set_value (FloatingSplit *fs, const gnc_numeric value)
 {
     g_return_if_fail (fs);
 
     fs->m_value = value;
-};
+}
 
 /* This function takes a split and returns a representation
    of it as a floating_split structure. Assumes the transaction is open
@@ -280,55 +280,55 @@ void gnc_float_txn_set_txn (FloatingTxn *ft, Transaction *txn)
 {
     g_return_if_fail (ft);
     ft->m_txn = txn;
-};
+}
 
 void gnc_float_txn_set_currency (FloatingTxn *ft, gnc_commodity *currency)
 {
     g_return_if_fail (ft);
     ft->m_currency = currency;
-};
+}
 
 void gnc_float_txn_set_date_entered (FloatingTxn *ft, time64 date_entered)
 {
     g_return_if_fail (ft);
     ft->m_date_entered = date_entered;
-};
+}
 
 void gnc_float_txn_set_date_posted (FloatingTxn *ft, time64 date_posted)
 {
     g_return_if_fail (ft);
     ft->m_date_posted = date_posted;
-};
+}
 
 void gnc_float_txn_set_num (FloatingTxn *ft, const char *num)
 {
     g_return_if_fail (ft);
     CACHE_REPLACE (ft->m_num, num);
-};
+}
 
 void gnc_float_txn_set_description (FloatingTxn *ft, const char *description)
 {
     g_return_if_fail (ft);
     CACHE_REPLACE (ft->m_description, description);
-};
+}
 
 void gnc_float_txn_set_notes (FloatingTxn *ft, const char *notes)
 {
     g_return_if_fail (ft);
     CACHE_REPLACE (ft->m_notes, notes);
-};
+}
 
 void gnc_float_txn_set_doclink (FloatingTxn *ft, const char *doclink)
 {
     g_return_if_fail (ft);
     CACHE_REPLACE (ft->m_doclink, doclink);
-};
+}
 
 void gnc_float_txn_set_splits (FloatingTxn *ft, SplitList *splits)
 {
     g_return_if_fail (ft);
     ft->m_splits = splits;
-};
+}
 
 void gnc_float_txn_append_float_split (FloatingTxn *ft, FloatingSplit *fs)
 {
diff --git a/libgnucash/engine/SX-book.c b/libgnucash/engine/SX-book.c
index 15eb1943bc..a7d185f16e 100644
--- a/libgnucash/engine/SX-book.c
+++ b/libgnucash/engine/SX-book.c
@@ -232,7 +232,7 @@ gnc_sxes_del_sx(SchedXactions *sxes, SchedXaction *sx)
 /* SX-trans stuff */
 
 /* GObject initialization */
-QOF_GOBJECT_IMPL(gnc_schedxactions, SchedXactions, QOF_TYPE_INSTANCE);
+QOF_GOBJECT_IMPL(gnc_schedxactions, SchedXactions, QOF_TYPE_INSTANCE)
 
 static void
 gnc_schedxactions_init(SchedXactions* sxs)
diff --git a/libgnucash/engine/SchedXaction.c b/libgnucash/engine/SchedXaction.c
index 99177e9ef5..127f452722 100644
--- a/libgnucash/engine/SchedXaction.c
+++ b/libgnucash/engine/SchedXaction.c
@@ -61,7 +61,7 @@ enum
 };
 
 /* GObject initialization */
-G_DEFINE_TYPE(SchedXaction, gnc_schedxaction, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(SchedXaction, gnc_schedxaction, QOF_TYPE_INSTANCE)
 
 static void
 gnc_schedxaction_init(SchedXaction* sx)
diff --git a/libgnucash/engine/gnc-commodity.c b/libgnucash/engine/gnc-commodity.c
index ac686c4b7b..9799d9f79f 100644
--- a/libgnucash/engine/gnc-commodity.c
+++ b/libgnucash/engine/gnc-commodity.c
@@ -654,7 +654,7 @@ reset_unique_name(gnc_commodityPrivate *priv)
 }
 
 /* GObject Initialization */
-G_DEFINE_TYPE_WITH_PRIVATE(gnc_commodity, gnc_commodity, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE_WITH_PRIVATE(gnc_commodity, gnc_commodity, QOF_TYPE_INSTANCE)
 
 static void
 gnc_commodity_init(gnc_commodity* com)
@@ -2306,7 +2306,7 @@ gnc_commodity_table_get_quotable_commodities(const gnc_commodity_table * table)
  ********************************************************************/
 
 /* GObject Initialization */
-QOF_GOBJECT_IMPL(gnc_commodity_namespace, gnc_commodity_namespace, QOF_TYPE_INSTANCE);
+QOF_GOBJECT_IMPL(gnc_commodity_namespace, gnc_commodity_namespace, QOF_TYPE_INSTANCE)
 
 static void
 gnc_commodity_namespace_init(gnc_commodity_namespace* ns)
diff --git a/libgnucash/engine/gnc-pricedb.c b/libgnucash/engine/gnc-pricedb.c
index 13819ce818..3d13ca3c8b 100644
--- a/libgnucash/engine/gnc-pricedb.c
+++ b/libgnucash/engine/gnc-pricedb.c
@@ -96,7 +96,7 @@ hash_entry_free_gfunc(gpointer data, G_GNUC_UNUSED gpointer user_data)
 }
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GNCPrice, gnc_price, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GNCPrice, gnc_price, QOF_TYPE_INSTANCE)
 
 static void
 gnc_price_init(GNCPrice* price)
@@ -835,7 +835,7 @@ gnc_price_list_equal(PriceList *prices1, PriceList *prices2)
  */
 
 /* GObject Initialization */
-QOF_GOBJECT_IMPL(gnc_pricedb, GNCPriceDB, QOF_TYPE_INSTANCE);
+QOF_GOBJECT_IMPL(gnc_pricedb, GNCPriceDB, QOF_TYPE_INSTANCE)
 
 static void
 gnc_pricedb_init(GNCPriceDB* pdb)
diff --git a/libgnucash/engine/gncAddress.c b/libgnucash/engine/gncAddress.c
index 6bd871e283..19c40bee73 100644
--- a/libgnucash/engine/gncAddress.c
+++ b/libgnucash/engine/gncAddress.c
@@ -86,7 +86,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncAddress, gnc_address, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncAddress, gnc_address, QOF_TYPE_INSTANCE)
 
 static void
 gnc_address_init(GncAddress* addr)
diff --git a/libgnucash/engine/gncBillTerm.c b/libgnucash/engine/gncBillTerm.c
index 3338b1433f..e0abb5c047 100644
--- a/libgnucash/engine/gncBillTerm.c
+++ b/libgnucash/engine/gncBillTerm.c
@@ -137,7 +137,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncBillTerm, gnc_billterm, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncBillTerm, gnc_billterm, QOF_TYPE_INSTANCE)
 
 static void
 gnc_billterm_init(GncBillTerm* bt)
diff --git a/libgnucash/engine/gncCustomer.c b/libgnucash/engine/gncCustomer.c
index ddb03aee04..4ac50d888b 100644
--- a/libgnucash/engine/gncCustomer.c
+++ b/libgnucash/engine/gncCustomer.c
@@ -103,7 +103,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncCustomer, gnc_customer, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncCustomer, gnc_customer, QOF_TYPE_INSTANCE)
 
 static void
 gnc_customer_init(GncCustomer* cust)
diff --git a/libgnucash/engine/gncEmployee.c b/libgnucash/engine/gncEmployee.c
index 293b52dcb9..fd9518f88d 100644
--- a/libgnucash/engine/gncEmployee.c
+++ b/libgnucash/engine/gncEmployee.c
@@ -99,7 +99,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncEmployee, gnc_employee, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncEmployee, gnc_employee, QOF_TYPE_INSTANCE)
 
 static void
 gnc_employee_init(GncEmployee* emp)
diff --git a/libgnucash/engine/gncEntry.c b/libgnucash/engine/gncEntry.c
index 449abcabfb..0350bc5735 100644
--- a/libgnucash/engine/gncEntry.c
+++ b/libgnucash/engine/gncEntry.c
@@ -238,7 +238,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncEntry, gnc_entry, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncEntry, gnc_entry, QOF_TYPE_INSTANCE)
 
 static void
 gnc_entry_init(GncEntry* entry)
diff --git a/libgnucash/engine/gncInvoice.c b/libgnucash/engine/gncInvoice.c
index 7f8f923c3e..ab10dc1961 100644
--- a/libgnucash/engine/gncInvoice.c
+++ b/libgnucash/engine/gncInvoice.c
@@ -132,7 +132,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncInvoice, gnc_invoice, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncInvoice, gnc_invoice, QOF_TYPE_INSTANCE)
 
 static void
 gnc_invoice_init (GncInvoice* inv)
diff --git a/libgnucash/engine/gncJob.c b/libgnucash/engine/gncJob.c
index 46fb843d61..3b6689d56b 100644
--- a/libgnucash/engine/gncJob.c
+++ b/libgnucash/engine/gncJob.c
@@ -83,7 +83,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncJob, gnc_job, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncJob, gnc_job, QOF_TYPE_INSTANCE)
 
 static void
 gnc_job_init(GncJob* job)
diff --git a/libgnucash/engine/gncOrder.c b/libgnucash/engine/gncOrder.c
index 24b3901f5c..21748717a9 100644
--- a/libgnucash/engine/gncOrder.c
+++ b/libgnucash/engine/gncOrder.c
@@ -93,7 +93,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncOrder, gnc_order, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncOrder, gnc_order, QOF_TYPE_INSTANCE)
 
 static void
 gnc_order_init(GncOrder* order)
diff --git a/libgnucash/engine/gncTaxTable.c b/libgnucash/engine/gncTaxTable.c
index 2e0cbfa907..fca6cc1fa4 100644
--- a/libgnucash/engine/gncTaxTable.c
+++ b/libgnucash/engine/gncTaxTable.c
@@ -212,7 +212,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncTaxTable, gnc_taxtable, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncTaxTable, gnc_taxtable, QOF_TYPE_INSTANCE)
 
 static void
 gnc_taxtable_init(GncTaxTable* tt)
diff --git a/libgnucash/engine/gncVendor.c b/libgnucash/engine/gncVendor.c
index 67af18c61e..e6518125e4 100644
--- a/libgnucash/engine/gncVendor.c
+++ b/libgnucash/engine/gncVendor.c
@@ -107,7 +107,7 @@ enum
 };
 
 /* GObject Initialization */
-G_DEFINE_TYPE(GncVendor, gnc_vendor, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(GncVendor, gnc_vendor, QOF_TYPE_INSTANCE)
 
 static void
 gnc_vendor_init(GncVendor* vendor)
diff --git a/libgnucash/engine/mocks/gmock-Account.cpp b/libgnucash/engine/mocks/gmock-Account.cpp
index aea26ed818..bfed846dae 100644
--- a/libgnucash/engine/mocks/gmock-Account.cpp
+++ b/libgnucash/engine/mocks/gmock-Account.cpp
@@ -9,7 +9,7 @@ struct _MockAccountClass
 };
 typedef struct _MockAccountClass MockAccountClass;
 
-G_DEFINE_TYPE(MockAccount, gnc_mockaccount, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(MockAccount, gnc_mockaccount, QOF_TYPE_INSTANCE)
 
 static void
 gnc_mockaccount_init (MockAccount *inst)
diff --git a/libgnucash/engine/mocks/gmock-Split.cpp b/libgnucash/engine/mocks/gmock-Split.cpp
index de67a40f53..f01807f2b0 100644
--- a/libgnucash/engine/mocks/gmock-Split.cpp
+++ b/libgnucash/engine/mocks/gmock-Split.cpp
@@ -13,7 +13,7 @@ struct _MockSplitClass
 };
 typedef struct _MockSplitClass MockSplitClass;
 
-G_DEFINE_TYPE(MockSplit, gnc_mocksplit, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(MockSplit, gnc_mocksplit, QOF_TYPE_INSTANCE)
 
 static void
 gnc_mocksplit_init (MockSplit *inst)
diff --git a/libgnucash/engine/mocks/gmock-Transaction.cpp b/libgnucash/engine/mocks/gmock-Transaction.cpp
index 331c849592..9c92d4ffc2 100644
--- a/libgnucash/engine/mocks/gmock-Transaction.cpp
+++ b/libgnucash/engine/mocks/gmock-Transaction.cpp
@@ -11,7 +11,7 @@ struct _MockTransactionClass
 };
 typedef struct _MockTransactionClass MockTransactionClass;
 
-G_DEFINE_TYPE(MockTransaction, gnc_mocktransaction, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(MockTransaction, gnc_mocktransaction, QOF_TYPE_INSTANCE)
 
 static void
 gnc_mocktransaction_init (MockTransaction *inst)
diff --git a/libgnucash/engine/mocks/gmock-qofbook.cpp b/libgnucash/engine/mocks/gmock-qofbook.cpp
index 1ea7d7215c..73c50b04ae 100644
--- a/libgnucash/engine/mocks/gmock-qofbook.cpp
+++ b/libgnucash/engine/mocks/gmock-qofbook.cpp
@@ -6,7 +6,7 @@ struct _QofMockBookClass
 };
 typedef struct _QofMockBookClass QofMockBookClass;
 
-G_DEFINE_TYPE(QofMockBook, qof_mockbook, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(QofMockBook, qof_mockbook, QOF_TYPE_INSTANCE)
 
 static void
 qof_mockbook_init (QofMockBook *inst)
diff --git a/libgnucash/engine/mocks/gmock-qofinstance.cpp b/libgnucash/engine/mocks/gmock-qofinstance.cpp
index cd253b199d..542684e20b 100644
--- a/libgnucash/engine/mocks/gmock-qofinstance.cpp
+++ b/libgnucash/engine/mocks/gmock-qofinstance.cpp
@@ -6,7 +6,7 @@
 #include <qofinstance-p.h>
 
 
-G_DEFINE_TYPE(QofInstance, qof_instance, G_TYPE_OBJECT);
+G_DEFINE_TYPE(QofInstance, qof_instance, G_TYPE_OBJECT)
 
 static void
 qof_instance_init (QofInstance *inst)
diff --git a/libgnucash/engine/qof-gobject.h b/libgnucash/engine/qof-gobject.h
index d051657f28..44e996a333 100644
--- a/libgnucash/engine/qof-gobject.h
+++ b/libgnucash/engine/qof-gobject.h
@@ -57,7 +57,7 @@
  */
 
 #define QOF_GOBJECT_GET_TYPE(TypeName, type_name, TYPE_PARENT, CODE)	\
-  G_DEFINE_TYPE_WITH_CODE(TypeName, type_name, TYPE_PARENT, CODE);
+  G_DEFINE_TYPE_WITH_CODE(TypeName, type_name, TYPE_PARENT, CODE)
 
 #define QOF_GOBJECT_CLASS_INIT(type_name, TypeName)			\
   static void type_name##_dispose(GObject *object);			\
@@ -86,10 +86,10 @@
   }
 
 #define QOF_GOBJECT_IMPL_WITH_CODE(type_name, TypeName, TYPE_PARENT, CODE) \
-  QOF_GOBJECT_GET_TYPE(TypeName, type_name, TYPE_PARENT, CODE);		\
-  QOF_GOBJECT_CLASS_INIT(type_name, TypeName);				\
-  QOF_GOBJECT_DISPOSE(type_name);					\
-  QOF_GOBJECT_FINALIZE(type_name);
+  QOF_GOBJECT_GET_TYPE(TypeName, type_name, TYPE_PARENT, CODE)		\
+  QOF_GOBJECT_CLASS_INIT(type_name, TypeName)				\
+  QOF_GOBJECT_DISPOSE(type_name)					\
+  QOF_GOBJECT_FINALIZE(type_name)
 
 #define QOF_GOBJECT_IMPL(type_name, TypeName, TYPE_PARENT) \
   QOF_GOBJECT_IMPL_WITH_CODE(type_name, TypeName, TYPE_PARENT, {})
diff --git a/libgnucash/engine/qofbook.cpp b/libgnucash/engine/qofbook.cpp
index ba73cdc947..5c4b8a8fbb 100644
--- a/libgnucash/engine/qofbook.cpp
+++ b/libgnucash/engine/qofbook.cpp
@@ -89,7 +89,7 @@ qof_book_option_num_autoreadonly_changed_cb (GObject *gobject,
 #define PARAM_NAME_NUM_FIELD_SOURCE "split-action-num-field"
 #define PARAM_NAME_NUM_AUTOREAD_ONLY "autoreadonly-days"
 
-G_DEFINE_TYPE(QofBook, qof_book, QOF_TYPE_INSTANCE);
+G_DEFINE_TYPE(QofBook, qof_book, QOF_TYPE_INSTANCE)
 QOF_GOBJECT_DISPOSE(qof_book);
 QOF_GOBJECT_FINALIZE(qof_book);
 
diff --git a/libgnucash/engine/qofinstance.cpp b/libgnucash/engine/qofinstance.cpp
index c79663741b..6b7d3393f9 100644
--- a/libgnucash/engine/qofinstance.cpp
+++ b/libgnucash/engine/qofinstance.cpp
@@ -111,7 +111,7 @@ typedef struct QofInstancePrivate
 #define GET_PRIVATE(o)  \
     ((QofInstancePrivate*)qof_instance_get_instance_private((QofInstance*)o))
 
-G_DEFINE_TYPE_WITH_PRIVATE(QofInstance, qof_instance, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE(QofInstance, qof_instance, G_TYPE_OBJECT)
 QOF_GOBJECT_FINALIZE(qof_instance);
 #undef G_PARAM_READWRITE
 #define G_PARAM_READWRITE static_cast<GParamFlags>(G_PARAM_READABLE | G_PARAM_WRITABLE)