Flag all final types accordingly

Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1312>

85 files changed, 144 insertions, 144 deletions

diff --git a/embed/ephy-about-handler.c b/embed/ephy-about-handler.c
index 2008f3831..2632820ce 100644
--- a/embed/ephy-about-handler.c
+++ b/embed/ephy-about-handler.c
@@ -44,7 +44,7 @@ struct _EphyAboutHandler {
   EphySMaps *smaps;
 };
 
-G_DEFINE_TYPE (EphyAboutHandler, ephy_about_handler, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyAboutHandler, ephy_about_handler, G_TYPE_OBJECT)
 
 
 #define EPHY_ABOUT_OVERVIEW_MAX_ITEMS 9
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 5e5c838cc..bc6ca61d1 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -64,7 +64,7 @@ struct _EphyDownload {
   gboolean was_moved;
 };
 
-G_DEFINE_TYPE (EphyDownload, ephy_download, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyDownload, ephy_download, G_TYPE_OBJECT)
 
 enum {
   PROP_0,
diff --git a/embed/ephy-downloads-manager.c b/embed/ephy-downloads-manager.c
index 5c9580a7f..78e1ba786 100644
--- a/embed/ephy-downloads-manager.c
+++ b/embed/ephy-downloads-manager.c
@@ -45,7 +45,7 @@ struct _EphyDownloadsManager {
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (EphyDownloadsManager, ephy_downloads_manager, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyDownloadsManager, ephy_downloads_manager, G_TYPE_OBJECT)
 
 static void
 ephy_downloads_manager_acquire_session_inhibitor (EphyDownloadsManager *manager)
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 77cf36bcb..64da1d7d5 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -89,7 +89,7 @@ struct _EphyEmbed {
   gboolean progress_bar_enabled;
 };
 
-G_DEFINE_TYPE (EphyEmbed, ephy_embed, GTK_TYPE_BOX)
+G_DEFINE_FINAL_TYPE (EphyEmbed, ephy_embed, GTK_TYPE_BOX)
 
 enum {
   PROP_0,
diff --git a/embed/ephy-encoding.c b/embed/ephy-encoding.c
index 5122e981b..33586b5a8 100644
--- a/embed/ephy-encoding.c
+++ b/embed/ephy-encoding.c
@@ -33,7 +33,7 @@ struct _EphyEncoding {
   int language_groups;
 };
 
-G_DEFINE_TYPE (EphyEncoding, ephy_encoding, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyEncoding, ephy_encoding, G_TYPE_OBJECT)
 
 enum {
   PROP_0,
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index 38a61b34d..63606d206 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -142,7 +142,7 @@ encoding_entries [] = {
 
 #define RECENT_MAX  4
 
-G_DEFINE_TYPE (EphyEncodings, ephy_encodings, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyEncodings, ephy_encodings, G_TYPE_OBJECT)
 
 static void
 ephy_encodings_finalize (GObject *object)
diff --git a/embed/ephy-file-monitor.c b/embed/ephy-file-monitor.c
index efdf14657..a1f1cda9e 100644
--- a/embed/ephy-file-monitor.c
+++ b/embed/ephy-file-monitor.c
@@ -39,7 +39,7 @@ struct _EphyFileMonitor {
   EphyWebView *view;
 };
 
-G_DEFINE_TYPE (EphyFileMonitor, ephy_file_monitor, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyFileMonitor, ephy_file_monitor, G_TYPE_OBJECT)
 
 enum {
   PROP_0,
diff --git a/embed/ephy-filters-manager.c b/embed/ephy-filters-manager.c
index eb6232a37..2d82f14d8 100644
--- a/embed/ephy-filters-manager.c
+++ b/embed/ephy-filters-manager.c
@@ -48,7 +48,7 @@ struct _EphyFiltersManager {
   WebKitUserContentFilterStore *store;
 };
 
-G_DEFINE_TYPE (EphyFiltersManager, ephy_filters_manager, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyFiltersManager, ephy_filters_manager, G_TYPE_OBJECT)
 
 enum {
   FILTER_READY,
diff --git a/embed/ephy-find-toolbar.c b/embed/ephy-find-toolbar.c
index 015460ef6..791da0f5e 100644
--- a/embed/ephy-find-toolbar.c
+++ b/embed/ephy-find-toolbar.c
@@ -50,7 +50,7 @@ struct _EphyFindToolbar {
   char *find_string;
 };
 
-G_DEFINE_TYPE (EphyFindToolbar, ephy_find_toolbar, ADW_TYPE_BIN)
+G_DEFINE_FINAL_TYPE (EphyFindToolbar, ephy_find_toolbar, ADW_TYPE_BIN)
 
 enum {
   PROP_0,
diff --git a/embed/ephy-floating-bar.c b/embed/ephy-floating-bar.c
index cb0eeecb5..c63c4b376 100644
--- a/embed/ephy-floating-bar.c
+++ b/embed/ephy-floating-bar.c
@@ -41,7 +41,7 @@ enum {
 
 static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE (EphyFloatingBar, ephy_floating_bar, GTK_TYPE_BOX);
+G_DEFINE_FINAL_TYPE (EphyFloatingBar, ephy_floating_bar, GTK_TYPE_BOX);
 
 static void
 ephy_floating_bar_finalize (GObject *obj)
diff --git a/embed/ephy-reader-handler.c b/embed/ephy-reader-handler.c
index ad46def74..f33599262 100644
--- a/embed/ephy-reader-handler.c
+++ b/embed/ephy-reader-handler.c
@@ -39,7 +39,7 @@ struct _EphyReaderHandler {
   GList *outstanding_requests;
 };
 
-G_DEFINE_TYPE (EphyReaderHandler, ephy_reader_handler, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyReaderHandler, ephy_reader_handler, G_TYPE_OBJECT)
 
 typedef struct {
   EphyReaderHandler *source_handler;
diff --git a/embed/ephy-search-entry.c b/embed/ephy-search-entry.c
index e0f1c5df1..859d9dd73 100644
--- a/embed/ephy-search-entry.c
+++ b/embed/ephy-search-entry.c
@@ -62,11 +62,11 @@ static int signals[LAST_SIGNAL] = {};
 static void ephy_search_entry_editable_init (GtkEditableInterface *iface);
 static void ephy_search_entry_accessible_init (GtkAccessibleInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphySearchEntry, ephy_search_entry, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-                                                ephy_search_entry_editable_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACCESSIBLE,
-                                                ephy_search_entry_accessible_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphySearchEntry, ephy_search_entry, GTK_TYPE_WIDGET,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+                                                      ephy_search_entry_editable_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_ACCESSIBLE,
+                                                      ephy_search_entry_accessible_init))
 
 static void
 update_matches (EphySearchEntry *self)
diff --git a/embed/ephy-view-source-handler.c b/embed/ephy-view-source-handler.c
index bd8abd2db..9adf5d0c2 100644
--- a/embed/ephy-view-source-handler.c
+++ b/embed/ephy-view-source-handler.c
@@ -36,7 +36,7 @@ struct _EphyViewSourceHandler {
   GList *outstanding_requests;
 };
 
-G_DEFINE_TYPE (EphyViewSourceHandler, ephy_view_source_handler, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyViewSourceHandler, ephy_view_source_handler, G_TYPE_OBJECT)
 
 typedef struct {
   EphyViewSourceHandler *source_handler;
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 6fb07538d..6a4e95b30 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -147,7 +147,7 @@ enum {
 
 static GParamSpec *obj_properties[LAST_PROP];
 
-G_DEFINE_TYPE (EphyWebView, ephy_web_view, WEBKIT_TYPE_WEB_VIEW)
+G_DEFINE_FINAL_TYPE (EphyWebView, ephy_web_view, WEBKIT_TYPE_WEB_VIEW)
 
 static void
 open_dialog_cb (GtkFileDialog            *dialog,
diff --git a/embed/web-process-extension/ephy-web-overview-model.c b/embed/web-process-extension/ephy-web-overview-model.c
index 59995af29..44930bfc2 100644
--- a/embed/web-process-extension/ephy-web-overview-model.c
+++ b/embed/web-process-extension/ephy-web-overview-model.c
@@ -32,7 +32,7 @@ struct _EphyWebOverviewModel {
   GHashTable *title_listeners;
 };
 
-G_DEFINE_TYPE (EphyWebOverviewModel, ephy_web_overview_model, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyWebOverviewModel, ephy_web_overview_model, G_TYPE_OBJECT)
 
 static void
 ephy_web_overview_model_dispose (GObject *object)
diff --git a/embed/web-process-extension/ephy-web-process-extension.c b/embed/web-process-extension/ephy-web-process-extension.c
index 5081ebc00..732ed2965 100644
--- a/embed/web-process-extension/ephy-web-process-extension.c
+++ b/embed/web-process-extension/ephy-web-process-extension.c
@@ -61,7 +61,7 @@ struct _EphyWebProcessExtension {
   GHashTable *translation_table;
 };
 
-G_DEFINE_TYPE (EphyWebProcessExtension, ephy_web_process_extension, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyWebProcessExtension, ephy_web_process_extension, G_TYPE_OBJECT)
 
 static void
 web_page_will_submit_form (WebKitWebPage *web_page,
diff --git a/embed/web-process-extension/ephy-webextension-api.c b/embed/web-process-extension/ephy-webextension-api.c
index 86e7fc3b3..e04cf9ad0 100644
--- a/embed/web-process-extension/ephy-webextension-api.c
+++ b/embed/web-process-extension/ephy-webextension-api.c
@@ -36,7 +36,7 @@ struct _EphyWebExtensionExtension {
   int counter;
 };
 
-G_DEFINE_TYPE (EphyWebExtensionExtension, ephy_web_extension_extension, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyWebExtensionExtension, ephy_web_extension_extension, G_TYPE_OBJECT)
 
 static EphyWebExtensionExtension *extension = NULL;
 
diff --git a/lib/ephy-notification-container.c b/lib/ephy-notification-container.c
index 52322de35..42263c6da 100644
--- a/lib/ephy-notification-container.c
+++ b/lib/ephy-notification-container.c
@@ -29,7 +29,7 @@ struct _EphyNotificationContainer {
   GtkWidget *box;
 };
 
-G_DEFINE_TYPE (EphyNotificationContainer, ephy_notification_container, ADW_TYPE_BIN);
+G_DEFINE_FINAL_TYPE (EphyNotificationContainer, ephy_notification_container, ADW_TYPE_BIN);
 
 static EphyNotificationContainer *notification_container = NULL;
 
diff --git a/lib/ephy-notification.c b/lib/ephy-notification.c
index 835e815cb..7991451b8 100644
--- a/lib/ephy-notification.c
+++ b/lib/ephy-notification.c
@@ -49,7 +49,7 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (EphyNotification, ephy_notification, ADW_TYPE_BIN);
+G_DEFINE_FINAL_TYPE (EphyNotification, ephy_notification, ADW_TYPE_BIN);
 
 static void
 ephy_notification_constructed (GObject *object)
diff --git a/lib/ephy-permissions-manager.c b/lib/ephy-permissions-manager.c
index ea7717940..4e1cfd458 100644
--- a/lib/ephy-permissions-manager.c
+++ b/lib/ephy-permissions-manager.c
@@ -43,7 +43,7 @@ struct _EphyPermissionsManager {
   GSettingsBackend *backend;
 };
 
-G_DEFINE_TYPE (EphyPermissionsManager, ephy_permissions_manager, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyPermissionsManager, ephy_permissions_manager, G_TYPE_OBJECT)
 
 #define PERMISSIONS_FILENAME "permissions.ini"
 
diff --git a/lib/ephy-search-engine-manager.c b/lib/ephy-search-engine-manager.c
index 9db8bbed8..580b3d32b 100644
--- a/lib/ephy-search-engine-manager.c
+++ b/lib/ephy-search-engine-manager.c
@@ -47,9 +47,9 @@ struct _EphySearchEngineManager {
 static void list_model_iface_init (GListModelInterface *iface,
                                    gpointer             iface_data);
 
-G_DEFINE_TYPE_WITH_CODE (EphySearchEngineManager, ephy_search_engine_manager,
-                         G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, list_model_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphySearchEngineManager, ephy_search_engine_manager,
+                               G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, list_model_iface_init))
 
 enum {
   PROP_0,
diff --git a/lib/ephy-smaps.c b/lib/ephy-smaps.c
index ab85ae1e1..1d58a2e88 100644
--- a/lib/ephy-smaps.c
+++ b/lib/ephy-smaps.c
@@ -32,7 +32,7 @@ struct _EphySMaps {
   GRegex *detail;
 };
 
-G_DEFINE_TYPE (EphySMaps, ephy_smaps, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphySMaps, ephy_smaps, G_TYPE_OBJECT)
 
 typedef struct {
   char *start;
diff --git a/lib/ephy-snapshot-service.c b/lib/ephy-snapshot-service.c
index 7c203687d..810a4219e 100644
--- a/lib/ephy-snapshot-service.c
+++ b/lib/ephy-snapshot-service.c
@@ -37,7 +37,7 @@ struct _EphySnapshotService {
   GHashTable *cache;
 };
 
-G_DEFINE_TYPE (EphySnapshotService, ephy_snapshot_service, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphySnapshotService, ephy_snapshot_service, G_TYPE_OBJECT)
 
 typedef enum {
   SNAPSHOT_STALE,
diff --git a/lib/ephy-sqlite-connection.c b/lib/ephy-sqlite-connection.c
index 4059db865..d8e5cb7be 100644
--- a/lib/ephy-sqlite-connection.c
+++ b/lib/ephy-sqlite-connection.c
@@ -35,7 +35,7 @@ struct _EphySQLiteConnection {
   EphySQLiteConnectionMode mode;
 };
 
-G_DEFINE_TYPE (EphySQLiteConnection, ephy_sqlite_connection, G_TYPE_OBJECT);
+G_DEFINE_FINAL_TYPE (EphySQLiteConnection, ephy_sqlite_connection, G_TYPE_OBJECT);
 
 enum {
   PROP_0,
diff --git a/lib/ephy-sqlite-statement.c b/lib/ephy-sqlite-statement.c
index 2f5c48d35..263054730 100644
--- a/lib/ephy-sqlite-statement.c
+++ b/lib/ephy-sqlite-statement.c
@@ -39,7 +39,7 @@ struct _EphySQLiteStatement {
   EphySQLiteConnection *connection;
 };
 
-G_DEFINE_TYPE (EphySQLiteStatement, ephy_sqlite_statement, G_TYPE_OBJECT);
+G_DEFINE_FINAL_TYPE (EphySQLiteStatement, ephy_sqlite_statement, G_TYPE_OBJECT);
 
 static void
 ephy_sqlite_statement_set_property (GObject      *object,
diff --git a/lib/ephy-suggestion.c b/lib/ephy-suggestion.c
index b608c810a..4b26f6749 100644
--- a/lib/ephy-suggestion.c
+++ b/lib/ephy-suggestion.c
@@ -31,7 +31,7 @@ struct _EphySuggestion {
   cairo_surface_t *favicon;
 };
 
-G_DEFINE_TYPE (EphySuggestion, ephy_suggestion, DZL_TYPE_SUGGESTION)
+G_DEFINE_FINAL_TYPE (EphySuggestion, ephy_suggestion, DZL_TYPE_SUGGESTION)
 
 enum {
   PROP_0,
diff --git a/lib/history/ephy-history-service.c b/lib/history/ephy-history-service.c
index bf98a36a2..2c15e9994 100644
--- a/lib/history/ephy-history-service.c
+++ b/lib/history/ephy-history-service.c
@@ -102,7 +102,7 @@ enum {
 
 static GParamSpec *obj_properties[LAST_PROP];
 
-G_DEFINE_TYPE (EphyHistoryService, ephy_history_service, G_TYPE_OBJECT);
+G_DEFINE_FINAL_TYPE (EphyHistoryService, ephy_history_service, G_TYPE_OBJECT);
 
 static void
 ephy_history_service_set_property (GObject      *object,
diff --git a/lib/safe-browsing/ephy-gsb-storage.c b/lib/safe-browsing/ephy-gsb-storage.c
index 75ae0741d..e7ea1113a 100644
--- a/lib/safe-browsing/ephy-gsb-storage.c
+++ b/lib/safe-browsing/ephy-gsb-storage.c
@@ -59,7 +59,7 @@ struct _EphyGSBStorage {
   gboolean is_operable;
 };
 
-G_DEFINE_TYPE (EphyGSBStorage, ephy_gsb_storage, G_TYPE_OBJECT);
+G_DEFINE_FINAL_TYPE (EphyGSBStorage, ephy_gsb_storage, G_TYPE_OBJECT);
 
 enum {
   PROP_0,
diff --git a/lib/sync/ephy-history-manager.c b/lib/sync/ephy-history-manager.c
index 4f95b10fc..31bcb8fbb 100644
--- a/lib/sync/ephy-history-manager.c
+++ b/lib/sync/ephy-history-manager.c
@@ -33,9 +33,9 @@ struct _EphyHistoryManager {
 
 static void ephy_synchronizable_manager_iface_init (EphySynchronizableManagerInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyHistoryManager, ephy_history_manager, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
-                                                ephy_synchronizable_manager_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyHistoryManager, ephy_history_manager, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
+                                                      ephy_synchronizable_manager_iface_init))
 
 enum {
   PROP_0,
diff --git a/lib/sync/ephy-history-record.c b/lib/sync/ephy-history-record.c
index 79968ad50..48e0e46e7 100644
--- a/lib/sync/ephy-history-record.c
+++ b/lib/sync/ephy-history-record.c
@@ -36,11 +36,11 @@ struct _EphyHistoryRecord {
 static void json_serializable_iface_init (JsonSerializableIface *iface);
 static void ephy_synchronizable_iface_init (EphySynchronizableInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyHistoryRecord, ephy_history_record, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
-                                                json_serializable_iface_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
-                                                ephy_synchronizable_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyHistoryRecord, ephy_history_record, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
+                                                      json_serializable_iface_init)
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
+                                                      ephy_synchronizable_iface_init))
 
 enum {
   PROP_0,
diff --git a/lib/sync/ephy-open-tabs-manager.c b/lib/sync/ephy-open-tabs-manager.c
index 52f6d8e3f..a0cc8033b 100644
--- a/lib/sync/ephy-open-tabs-manager.c
+++ b/lib/sync/ephy-open-tabs-manager.c
@@ -37,9 +37,9 @@ struct _EphyOpenTabsManager {
 
 static void ephy_synchronizable_manager_iface_init (EphySynchronizableManagerInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyOpenTabsManager, ephy_open_tabs_manager, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
-                                                ephy_synchronizable_manager_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyOpenTabsManager, ephy_open_tabs_manager, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
+                                                      ephy_synchronizable_manager_iface_init))
 
 enum {
   PROP_0,
diff --git a/lib/sync/ephy-open-tabs-record.c b/lib/sync/ephy-open-tabs-record.c
index 29f071707..1e6175460 100644
--- a/lib/sync/ephy-open-tabs-record.c
+++ b/lib/sync/ephy-open-tabs-record.c
@@ -43,11 +43,11 @@ struct _EphyOpenTabsRecord {
 static void json_serializable_iface_init (JsonSerializableIface *iface);
 static void ephy_synchronizable_iface_init (EphySynchronizableInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyOpenTabsRecord, ephy_open_tabs_record, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
-                                                json_serializable_iface_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
-                                                ephy_synchronizable_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyOpenTabsRecord, ephy_open_tabs_record, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
+                                                      json_serializable_iface_init)
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
+                                                      ephy_synchronizable_iface_init))
 
 enum {
   PROP_0,
diff --git a/lib/sync/ephy-password-manager.c b/lib/sync/ephy-password-manager.c
index ed998a713..186158459 100644
--- a/lib/sync/ephy-password-manager.c
+++ b/lib/sync/ephy-password-manager.c
@@ -77,9 +77,9 @@ static void ephy_password_manager_forget_record (EphyPasswordManager *self,
 
 static void ephy_synchronizable_manager_iface_init (EphySynchronizableManagerInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyPasswordManager, ephy_password_manager, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
-                                                ephy_synchronizable_manager_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyPasswordManager, ephy_password_manager, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
+                                                      ephy_synchronizable_manager_iface_init))
 
 typedef struct {
   EphyPasswordManagerQueryCallback callback;
diff --git a/lib/sync/ephy-password-record.c b/lib/sync/ephy-password-record.c
index b156d49e8..92d7763c3 100644
--- a/lib/sync/ephy-password-record.c
+++ b/lib/sync/ephy-password-record.c
@@ -41,11 +41,11 @@ struct _EphyPasswordRecord {
 static void json_serializable_iface_init (JsonSerializableIface *iface);
 static void ephy_synchronizable_iface_init (EphySynchronizableInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyPasswordRecord, ephy_password_record, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
-                                                json_serializable_iface_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
-                                                ephy_synchronizable_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyPasswordRecord, ephy_password_record, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
+                                                      json_serializable_iface_init)
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
+                                                      ephy_synchronizable_iface_init))
 
 enum {
   PROP_0,
diff --git a/lib/sync/ephy-sync-service.c b/lib/sync/ephy-sync-service.c
index 9ad95a8c2..ff33f8d25 100644
--- a/lib/sync/ephy-sync-service.c
+++ b/lib/sync/ephy-sync-service.c
@@ -62,7 +62,7 @@ struct _EphySyncService {
   gboolean is_signing_in;
 };
 
-G_DEFINE_TYPE (EphySyncService, ephy_sync_service, G_TYPE_OBJECT);
+G_DEFINE_FINAL_TYPE (EphySyncService, ephy_sync_service, G_TYPE_OBJECT);
 
 enum {
   UID,
diff --git a/src/bookmarks/ephy-add-bookmark-popover.c b/src/bookmarks/ephy-add-bookmark-popover.c
index 98bcb6a0e..aa73662e4 100644
--- a/src/bookmarks/ephy-add-bookmark-popover.c
+++ b/src/bookmarks/ephy-add-bookmark-popover.c
@@ -37,7 +37,7 @@ struct _EphyAddBookmarkPopover {
   GtkWidget *grid;
 };
 
-G_DEFINE_TYPE (EphyAddBookmarkPopover, ephy_add_bookmark_popover, GTK_TYPE_POPOVER)
+G_DEFINE_FINAL_TYPE (EphyAddBookmarkPopover, ephy_add_bookmark_popover, GTK_TYPE_POPOVER)
 
 static void
 bookmark_removed_cb (EphyAddBookmarkPopover *self,
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 2ad48b292..8bab7bbe1 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -54,7 +54,7 @@ struct _EphyBookmarkProperties {
   GtkWidget *add_tag_button;
 };
 
-G_DEFINE_TYPE (EphyBookmarkProperties, ephy_bookmark_properties, GTK_TYPE_BOX)
+G_DEFINE_FINAL_TYPE (EphyBookmarkProperties, ephy_bookmark_properties, GTK_TYPE_BOX)
 
 enum {
   PROP_0,
diff --git a/src/bookmarks/ephy-bookmark-row.c b/src/bookmarks/ephy-bookmark-row.c
index e9109e202..83337918d 100644
--- a/src/bookmarks/ephy-bookmark-row.c
+++ b/src/bookmarks/ephy-bookmark-row.c
@@ -38,7 +38,7 @@ struct _EphyBookmarkRow {
   GtkWidget *properties_button;
 };
 
-G_DEFINE_TYPE (EphyBookmarkRow, ephy_bookmark_row, GTK_TYPE_LIST_BOX_ROW)
+G_DEFINE_FINAL_TYPE (EphyBookmarkRow, ephy_bookmark_row, GTK_TYPE_LIST_BOX_ROW)
 
 enum {
   PROP_0,
diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c
index d013d12cd..67f773da4 100644
--- a/src/bookmarks/ephy-bookmark.c
+++ b/src/bookmarks/ephy-bookmark.c
@@ -53,11 +53,11 @@ struct _EphyBookmark {
 static void json_serializable_iface_init (JsonSerializableIface *iface);
 static void ephy_synchronizable_iface_init (EphySynchronizableInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyBookmark, ephy_bookmark, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
-                                                json_serializable_iface_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
-                                                ephy_synchronizable_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyBookmark, ephy_bookmark, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE,
+                                                      json_serializable_iface_init)
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE,
+                                                      ephy_synchronizable_iface_init))
 
 enum {
   PROP_0,
diff --git a/src/bookmarks/ephy-bookmarks-manager.c b/src/bookmarks/ephy-bookmarks-manager.c
index c7a68e3ba..6843d02f5 100644
--- a/src/bookmarks/ephy-bookmarks-manager.c
+++ b/src/bookmarks/ephy-bookmarks-manager.c
@@ -47,11 +47,11 @@ struct _EphyBookmarksManager {
 static void list_model_iface_init (GListModelInterface *iface);
 static void ephy_synchronizable_manager_iface_init (EphySynchronizableManagerInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyBookmarksManager, ephy_bookmarks_manager, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
-                                                list_model_iface_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
-                                                ephy_synchronizable_manager_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyBookmarksManager, ephy_bookmarks_manager, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+                                                      list_model_iface_init)
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_SYNCHRONIZABLE_MANAGER,
+                                                      ephy_synchronizable_manager_iface_init))
 
 enum {
   BOOKMARK_ADDED,
diff --git a/src/bookmarks/ephy-bookmarks-popover.c b/src/bookmarks/ephy-bookmarks-popover.c
index 40698a15b..b179df753 100644
--- a/src/bookmarks/ephy-bookmarks-popover.c
+++ b/src/bookmarks/ephy-bookmarks-popover.c
@@ -45,7 +45,7 @@ struct _EphyBookmarksPopover {
   EphyBookmarksManager *manager;
 };
 
-G_DEFINE_TYPE (EphyBookmarksPopover, ephy_bookmarks_popover, GTK_TYPE_POPOVER)
+G_DEFINE_FINAL_TYPE (EphyBookmarksPopover, ephy_bookmarks_popover, GTK_TYPE_POPOVER)
 
 #define EPHY_LIST_BOX_ROW_TYPE_BOOKMARK "bookmark"
 #define EPHY_LIST_BOX_ROW_TYPE_TAG "tag"
diff --git a/src/ephy-action-bar-end.c b/src/ephy-action-bar-end.c
index b54e4d6e5..479b7a52c 100644
--- a/src/ephy-action-bar-end.c
+++ b/src/ephy-action-bar-end.c
@@ -55,7 +55,7 @@ struct _EphyActionBarEnd {
   guint downloads_button_attention_timeout_id;
 };
 
-G_DEFINE_TYPE (EphyActionBarEnd, ephy_action_bar_end, GTK_TYPE_BOX)
+G_DEFINE_FINAL_TYPE (EphyActionBarEnd, ephy_action_bar_end, GTK_TYPE_BOX)
 
 static void set_browser_actions (EphyActionBarEnd *action_bar_end,
                                  GListStore       *browser_actions);
diff --git a/src/ephy-action-bar-start.c b/src/ephy-action-bar-start.c
index b43a7a29d..59da178a4 100644
--- a/src/ephy-action-bar-start.c
+++ b/src/ephy-action-bar-start.c
@@ -51,7 +51,7 @@ struct _EphyActionBarStart {
   GCancellable *cancellable;
 };
 
-G_DEFINE_TYPE (EphyActionBarStart, ephy_action_bar_start, GTK_TYPE_BOX)
+G_DEFINE_FINAL_TYPE (EphyActionBarStart, ephy_action_bar_start, GTK_TYPE_BOX)
 
 typedef enum {
   EPHY_NAVIGATION_HISTORY_DIRECTION_BACK,
diff --git a/src/ephy-action-bar.c b/src/ephy-action-bar.c
index f6e9c2c9a..69622e559 100644
--- a/src/ephy-action-bar.c
+++ b/src/ephy-action-bar.c
@@ -47,7 +47,7 @@ struct _EphyActionBar {
   gboolean can_reveal;
 };
 
-G_DEFINE_TYPE (EphyActionBar, ephy_action_bar, ADW_TYPE_BIN)
+G_DEFINE_FINAL_TYPE (EphyActionBar, ephy_action_bar, ADW_TYPE_BIN)
 
 static void
 sync_chromes_visibility (EphyActionBar *action_bar)
diff --git a/src/ephy-certificate-dialog.c b/src/ephy-certificate-dialog.c
index bd4006697..657a3241e 100644
--- a/src/ephy-certificate-dialog.c
+++ b/src/ephy-certificate-dialog.c
@@ -61,7 +61,7 @@ struct _EphyCertificateDialog {
   EphySecurityLevel security_level;
 };
 
-G_DEFINE_TYPE (EphyCertificateDialog, ephy_certificate_dialog, GTK_TYPE_WINDOW)
+G_DEFINE_FINAL_TYPE (EphyCertificateDialog, ephy_certificate_dialog, GTK_TYPE_WINDOW)
 
 static char *
 bytes_to_display (GBytes *bytes)
diff --git a/src/ephy-download-widget.c b/src/ephy-download-widget.c
index f6c8f1064..9d1d8c7fd 100644
--- a/src/ephy-download-widget.c
+++ b/src/ephy-download-widget.c
@@ -41,7 +41,7 @@ struct _EphyDownloadWidget {
   GtkWidget *action_button;
 };
 
-G_DEFINE_TYPE (EphyDownloadWidget, ephy_download_widget, ADW_TYPE_BIN)
+G_DEFINE_FINAL_TYPE (EphyDownloadWidget, ephy_download_widget, ADW_TYPE_BIN)
 
 enum {
   PROP_0,
diff --git a/src/ephy-downloads-paintable.c b/src/ephy-downloads-paintable.c
index 557c700c2..4d2976294 100644
--- a/src/ephy-downloads-paintable.c
+++ b/src/ephy-downloads-paintable.c
@@ -43,11 +43,11 @@ struct _EphyDownloadsPaintable {
 static void ephy_downloads_paintable_paintable_init (GdkPaintableInterface *iface);
 static void ephy_downloads_paintable_symbolic_paintable_init (GtkSymbolicPaintableInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyDownloadsPaintable, ephy_downloads_paintable, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                ephy_downloads_paintable_paintable_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_SYMBOLIC_PAINTABLE,
-                                                ephy_downloads_paintable_symbolic_paintable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyDownloadsPaintable, ephy_downloads_paintable, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
+                                                      ephy_downloads_paintable_paintable_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_SYMBOLIC_PAINTABLE,
+                                                      ephy_downloads_paintable_symbolic_paintable_init))
 
 enum {
   PROP_0,
diff --git a/src/ephy-downloads-popover.c b/src/ephy-downloads-popover.c
index 632131897..aae3155dc 100644
--- a/src/ephy-downloads-popover.c
+++ b/src/ephy-downloads-popover.c
@@ -34,7 +34,7 @@ struct _EphyDownloadsPopover {
   GtkWidget *clear_button;
 };
 
-G_DEFINE_TYPE (EphyDownloadsPopover, ephy_downloads_popover, GTK_TYPE_POPOVER)
+G_DEFINE_FINAL_TYPE (EphyDownloadsPopover, ephy_downloads_popover, GTK_TYPE_POPOVER)
 
 #define DOWNLOADS_BOX_MIN_SIZE 330
 
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 355db0888..4e95971fa 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -70,7 +70,7 @@ enum {
 
 static GParamSpec *obj_properties[LAST_PROP];
 
-G_DEFINE_TYPE (EphyEncodingDialog, ephy_encoding_dialog, GTK_TYPE_WINDOW)
+G_DEFINE_FINAL_TYPE (EphyEncodingDialog, ephy_encoding_dialog, GTK_TYPE_WINDOW)
 
 static void
 select_encoding_row (GtkListBox   *list_box,
diff --git a/src/ephy-encoding-row.c b/src/ephy-encoding-row.c
index 9f514fe24..9982206d7 100644
--- a/src/ephy-encoding-row.c
+++ b/src/ephy-encoding-row.c
@@ -44,7 +44,7 @@ enum {
 
 static GParamSpec *obj_properties[LAST_PROP];
 
-G_DEFINE_TYPE (EphyEncodingRow, ephy_encoding_row, GTK_TYPE_BOX)
+G_DEFINE_FINAL_TYPE (EphyEncodingRow, ephy_encoding_row, GTK_TYPE_BOX)
 
 void
 ephy_encoding_row_set_selected (EphyEncodingRow *row,
diff --git a/src/ephy-firefox-sync-dialog.c b/src/ephy-firefox-sync-dialog.c
index afa6429c5..eef53ac79 100644
--- a/src/ephy-firefox-sync-dialog.c
+++ b/src/ephy-firefox-sync-dialog.c
@@ -92,7 +92,7 @@ struct _EphyFirefoxSyncDialog {
   WebKitUserScript *fxa_script;
 };
 
-G_DEFINE_TYPE (EphyFirefoxSyncDialog, ephy_firefox_sync_dialog, GTK_TYPE_WINDOW)
+G_DEFINE_FINAL_TYPE (EphyFirefoxSyncDialog, ephy_firefox_sync_dialog, GTK_TYPE_WINDOW)
 
 static const guint sync_frequency_minutes[] = { 5, 15, 30, 60 };
 
diff --git a/src/ephy-fullscreen-box.c b/src/ephy-fullscreen-box.c
index ce8ef93a5..d5ce0cf66 100644
--- a/src/ephy-fullscreen-box.c
+++ b/src/ephy-fullscreen-box.c
@@ -43,9 +43,9 @@ struct _EphyFullscreenBox {
 
 static void ephy_fullscreen_box_buildable_init (GtkBuildableIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyFullscreenBox, ephy_fullscreen_box, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
-                                                ephy_fullscreen_box_buildable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyFullscreenBox, ephy_fullscreen_box, GTK_TYPE_WIDGET,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                      ephy_fullscreen_box_buildable_init))
 
 enum {
   PROP_0,
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index cb8cbcda4..9412f5e0b 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -70,7 +70,7 @@ struct _EphyHeaderBar {
   guint popover_hide_timeout_id;
 };
 
-G_DEFINE_TYPE (EphyHeaderBar, ephy_header_bar, ADW_TYPE_BIN)
+G_DEFINE_FINAL_TYPE (EphyHeaderBar, ephy_header_bar, ADW_TYPE_BIN)
 
 static void
 ephy_header_bar_set_property (GObject      *object,
diff --git a/src/ephy-history-dialog.c b/src/ephy-history-dialog.c
index ed389aa41..bcf909ecc 100644
--- a/src/ephy-history-dialog.c
+++ b/src/ephy-history-dialog.c
@@ -90,7 +90,7 @@ struct _EphyHistoryDialog {
   gboolean has_search_results;
 };
 
-G_DEFINE_TYPE (EphyHistoryDialog, ephy_history_dialog, ADW_TYPE_WINDOW)
+G_DEFINE_FINAL_TYPE (EphyHistoryDialog, ephy_history_dialog, ADW_TYPE_WINDOW)
 
 enum {
   PROP_0,
diff --git a/src/ephy-location-controller.c b/src/ephy-location-controller.c
index 85967b77d..f5e9eacf4 100644
--- a/src/ephy-location-controller.c
+++ b/src/ephy-location-controller.c
@@ -70,9 +70,9 @@ enum {
 };
 static GParamSpec *obj_properties[LAST_PROP];
 
-G_DEFINE_TYPE_WITH_CODE (EphyLocationController, ephy_location_controller, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
-                                                NULL))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyLocationController, ephy_location_controller, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
+                                                      NULL))
 
 static gboolean
 handle_ephy_tab_uri (EphyLocationController *controller,
diff --git a/src/ephy-location-entry.c b/src/ephy-location-entry.c
index 624c3c092..57059ab14 100644
--- a/src/ephy-location-entry.c
+++ b/src/ephy-location-entry.c
@@ -115,13 +115,13 @@ static void ephy_location_entry_editable_init (GtkEditableInterface *iface);
 static void ephy_location_entry_accessible_init (GtkAccessibleInterface *iface);
 static void ephy_location_entry_title_widget_interface_init (EphyTitleWidgetInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyLocationEntry, ephy_location_entry, GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-                                                ephy_location_entry_editable_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACCESSIBLE,
-                                                ephy_location_entry_accessible_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_TITLE_WIDGET,
-                                                ephy_location_entry_title_widget_interface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyLocationEntry, ephy_location_entry, GTK_TYPE_WIDGET,
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+                                                      ephy_location_entry_editable_init)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_ACCESSIBLE,
+                                                      ephy_location_entry_accessible_init)
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_TITLE_WIDGET,
+                                                      ephy_location_entry_title_widget_interface_init))
 
 typedef struct {
   GUri *uri;
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 7ec9beaee..3d4536780 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -42,7 +42,7 @@ struct _EphyLockdown {
   GObject parent_instance;
 };
 
-G_DEFINE_TYPE (EphyLockdown, ephy_lockdown, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyLockdown, ephy_lockdown, G_TYPE_OBJECT)
 
 static void
 arbitrary_url_cb (GSettings  *settings,
diff --git a/src/ephy-mouse-gesture-controller.c b/src/ephy-mouse-gesture-controller.c
index 231a776a0..f791051ce 100644
--- a/src/ephy-mouse-gesture-controller.c
+++ b/src/ephy-mouse-gesture-controller.c
@@ -62,7 +62,7 @@ enum {
 
 static GParamSpec *obj_properties[LAST_PROP];
 
-G_DEFINE_TYPE (EphyMouseGestureController, ephy_mouse_gesture_controller, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyMouseGestureController, ephy_mouse_gesture_controller, G_TYPE_OBJECT)
 
 static void
 ephy_mouse_gesture_controller_reset (EphyMouseGestureController *self)
diff --git a/src/ephy-page-row.c b/src/ephy-page-row.c
index 618921bbf..7ea926ef0 100644
--- a/src/ephy-page-row.c
+++ b/src/ephy-page-row.c
@@ -41,7 +41,7 @@ struct _EphyPageRow {
   EphyTabView *tab_view;
 };
 
-G_DEFINE_TYPE (EphyPageRow, ephy_page_row, GTK_TYPE_LIST_BOX_ROW)
+G_DEFINE_FINAL_TYPE (EphyPageRow, ephy_page_row, GTK_TYPE_LIST_BOX_ROW)
 
 static void
 update_spinner (EphyPageRow *self)
diff --git a/src/ephy-pages-popover.c b/src/ephy-pages-popover.c
index f6c028e11..8cc71a862 100644
--- a/src/ephy-pages-popover.c
+++ b/src/ephy-pages-popover.c
@@ -36,7 +36,7 @@ struct _EphyPagesPopover {
   EphyTabView *tab_view;
 };
 
-G_DEFINE_TYPE (EphyPagesPopover, ephy_pages_popover, GTK_TYPE_POPOVER)
+G_DEFINE_FINAL_TYPE (EphyPagesPopover, ephy_pages_popover, GTK_TYPE_POPOVER)
 
 static void
 drop_tab_view (EphyPagesPopover *self)
diff --git a/src/ephy-pages-view.c b/src/ephy-pages-view.c
index 4eb11ab56..de680984d 100644
--- a/src/ephy-pages-view.c
+++ b/src/ephy-pages-view.c
@@ -36,7 +36,7 @@ struct _EphyPagesView {
   EphyTabView *tab_view;
 };
 
-G_DEFINE_TYPE (EphyPagesView, ephy_pages_view, GTK_TYPE_BOX)
+G_DEFINE_FINAL_TYPE (EphyPagesView, ephy_pages_view, GTK_TYPE_BOX)
 
 static void
 row_activated_cb (EphyPagesView *self,
diff --git a/src/ephy-security-popover.c b/src/ephy-security-popover.c
index baa4410c7..08bb3484b 100644
--- a/src/ephy-security-popover.c
+++ b/src/ephy-security-popover.c
@@ -71,7 +71,7 @@ struct _EphySecurityPopover {
   EphySecurityLevel security_level;
 };
 
-G_DEFINE_TYPE (EphySecurityPopover, ephy_security_popover, GTK_TYPE_POPOVER)
+G_DEFINE_FINAL_TYPE (EphySecurityPopover, ephy_security_popover, GTK_TYPE_POPOVER)
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static void
diff --git a/src/ephy-session.c b/src/ephy-session.c
index d9abe0a9f..f04eaf0a3 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -78,7 +78,7 @@ static GParamSpec *obj_properties[LAST_PROP];
 
 static void ephy_session_save_now (EphySession *session);
 
-G_DEFINE_TYPE (EphySession, ephy_session, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphySession, ephy_session, G_TYPE_OBJECT)
 
 /* Helper functions */
 
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 4b328d2ba..e3c0bb399 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -85,7 +85,7 @@ static EphyShell *ephy_shell = NULL;
 static void ephy_shell_dispose (GObject *object);
 static void ephy_shell_finalize (GObject *object);
 
-G_DEFINE_TYPE (EphyShell, ephy_shell, EPHY_TYPE_EMBED_SHELL)
+G_DEFINE_FINAL_TYPE (EphyShell, ephy_shell, EPHY_TYPE_EMBED_SHELL)
 
 /**
  * ephy_shell_startup_context_new:
diff --git a/src/ephy-suggestion-model.c b/src/ephy-suggestion-model.c
index 176e2e593..85ad346e4 100644
--- a/src/ephy-suggestion-model.c
+++ b/src/ephy-suggestion-model.c
@@ -59,8 +59,8 @@ enum {
 
 static void list_model_iface_init (GListModelInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphySuggestionModel, ephy_suggestion_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, list_model_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphySuggestionModel, ephy_suggestion_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, list_model_iface_init))
 
 static GParamSpec *properties[N_PROPS];
 
diff --git a/src/ephy-tab-view.c b/src/ephy-tab-view.c
index 2933ef091..c18ed7d9a 100644
--- a/src/ephy-tab-view.c
+++ b/src/ephy-tab-view.c
@@ -37,7 +37,7 @@ struct _EphyTabView {
   AdwTabPage *current_page;
 };
 
-G_DEFINE_TYPE (EphyTabView, ephy_tab_view, ADW_TYPE_BIN)
+G_DEFINE_FINAL_TYPE (EphyTabView, ephy_tab_view, ADW_TYPE_BIN)
 
 enum {
   PROP_0,
diff --git a/src/ephy-title-box.c b/src/ephy-title-box.c
index 78aa31d45..d8902733b 100644
--- a/src/ephy-title-box.c
+++ b/src/ephy-title-box.c
@@ -44,9 +44,9 @@ struct _EphyTitleBox {
 
 static void ephy_title_box_title_widget_interface_init (EphyTitleWidgetInterface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyTitleBox, ephy_title_box, ADW_TYPE_BIN,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_TITLE_WIDGET,
-                                                ephy_title_box_title_widget_interface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyTitleBox, ephy_title_box, ADW_TYPE_BIN,
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_TITLE_WIDGET,
+                                                      ephy_title_box_title_widget_interface_init))
 
 static void
 create_security_popup_cb (GtkMenuButton *button,
diff --git a/src/ephy-window.c b/src/ephy-window.c
index e2c30cff2..08bf24cd6 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -396,11 +396,11 @@ ephy_window_link_iface_init (EphyLinkInterface *iface)
   iface->open_link = ephy_window_open_link;
 }
 
-G_DEFINE_TYPE_WITH_CODE (EphyWindow, ephy_window, ADW_TYPE_APPLICATION_WINDOW,
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
-                                                ephy_window_link_iface_init)
-                         G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_CONTAINER,
-                                                ephy_window_embed_container_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyWindow, ephy_window, ADW_TYPE_APPLICATION_WINDOW,
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
+                                                      ephy_window_link_iface_init)
+                               G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_CONTAINER,
+                                                      ephy_window_embed_container_iface_init))
 
 static void
 sync_chromes_visibility (EphyWindow *window)
diff --git a/src/preferences/clear-data-view.c b/src/preferences/clear-data-view.c
index 06631ee47..b53c0ccfa 100644
--- a/src/preferences/clear-data-view.c
+++ b/src/preferences/clear-data-view.c
@@ -48,7 +48,7 @@ enum {
   SENSITIVE_COLUMN
 };
 
-G_DEFINE_TYPE (ClearDataView, clear_data_view, EPHY_TYPE_DATA_VIEW)
+G_DEFINE_FINAL_TYPE (ClearDataView, clear_data_view, EPHY_TYPE_DATA_VIEW)
 
 #define PERSISTENT_DATA_TYPES WEBKIT_WEBSITE_DATA_COOKIES | \
   WEBKIT_WEBSITE_DATA_DISK_CACHE | \
diff --git a/src/preferences/ephy-data-view.c b/src/preferences/ephy-data-view.c
index ed3fb05af..cea1db30d 100644
--- a/src/preferences/ephy-data-view.c
+++ b/src/preferences/ephy-data-view.c
@@ -47,10 +47,10 @@ typedef struct {
 
 static void ephy_data_view_buildable_init (GtkBuildableIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (EphyDataView, ephy_data_view, GTK_TYPE_WIDGET,
-                         G_ADD_PRIVATE (EphyDataView)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
-                                                ephy_data_view_buildable_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyDataView, ephy_data_view, GTK_TYPE_WIDGET,
+                               G_ADD_PRIVATE (EphyDataView)
+                               G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                      ephy_data_view_buildable_init))
 
 static GtkBuildableIface *parent_buildable_iface;
 
diff --git a/src/preferences/ephy-lang-row.c b/src/preferences/ephy-lang-row.c
index d7f5d9446..cad2d4460 100644
--- a/src/preferences/ephy-lang-row.c
+++ b/src/preferences/ephy-lang-row.c
@@ -37,7 +37,7 @@ struct _EphyLangRow {
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (EphyLangRow, ephy_lang_row, ADW_TYPE_ACTION_ROW)
+G_DEFINE_FINAL_TYPE (EphyLangRow, ephy_lang_row, ADW_TYPE_ACTION_ROW)
 
 static void
 ephy_lang_row_dispose (GObject *object)
diff --git a/src/preferences/ephy-prefs-dialog.c b/src/preferences/ephy-prefs-dialog.c
index 3e89f88ba..af5450cad 100644
--- a/src/preferences/ephy-prefs-dialog.c
+++ b/src/preferences/ephy-prefs-dialog.c
@@ -45,7 +45,7 @@ struct _EphyPrefsDialog {
   GtkWidget *active_data_view;
 };
 
-G_DEFINE_TYPE (EphyPrefsDialog, ephy_prefs_dialog, ADW_TYPE_PREFERENCES_WINDOW)
+G_DEFINE_FINAL_TYPE (EphyPrefsDialog, ephy_prefs_dialog, ADW_TYPE_PREFERENCES_WINDOW)
 
 static gboolean
 on_close_request (EphyPrefsDialog *prefs_dialog)
diff --git a/src/preferences/ephy-search-engine-listbox.c b/src/preferences/ephy-search-engine-listbox.c
index 3dc6b1501..ea09918c5 100644
--- a/src/preferences/ephy-search-engine-listbox.c
+++ b/src/preferences/ephy-search-engine-listbox.c
@@ -41,7 +41,7 @@ struct _EphyAddSearchEngineRowItem {
   GObject parent_instance;
 };
 
-G_DEFINE_TYPE (EphyAddSearchEngineRowItem, ephy_add_search_engine_row_item, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyAddSearchEngineRowItem, ephy_add_search_engine_row_item, G_TYPE_OBJECT)
 
 static void ephy_add_search_engine_row_item_class_init (EphyAddSearchEngineRowItemClass *klass) {}
 
@@ -68,8 +68,8 @@ struct _EphyAddEngineButtonMergedModel {
 static void list_model_iface_init (GListModelInterface *iface,
                                    gpointer             iface_data);
 
-G_DEFINE_TYPE_WITH_CODE (EphyAddEngineButtonMergedModel, ephy_add_engine_button_merged_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, list_model_iface_init))
+G_DEFINE_FINAL_TYPE_WITH_CODE (EphyAddEngineButtonMergedModel, ephy_add_engine_button_merged_model, G_TYPE_OBJECT,
+                               G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, list_model_iface_init))
 
 static void
 inner_model_items_changed_cb (GListModel *list,
@@ -189,7 +189,7 @@ struct _EphySearchEngineListBox {
   gboolean is_model_initially_loaded;
 };
 
-G_DEFINE_TYPE (EphySearchEngineListBox, ephy_search_engine_list_box, ADW_TYPE_BIN)
+G_DEFINE_FINAL_TYPE (EphySearchEngineListBox, ephy_search_engine_list_box, ADW_TYPE_BIN)
 
 GtkWidget *
 ephy_search_engine_list_box_new (void)
diff --git a/src/preferences/ephy-search-engine-row.c b/src/preferences/ephy-search-engine-row.c
index a3463a375..fb0b955ef 100644
--- a/src/preferences/ephy-search-engine-row.c
+++ b/src/preferences/ephy-search-engine-row.c
@@ -42,7 +42,7 @@ struct _EphySearchEngineRow {
   EphySearchEngineManager *manager;
 };
 
-G_DEFINE_TYPE (EphySearchEngineRow, ephy_search_engine_row, ADW_TYPE_EXPANDER_ROW)
+G_DEFINE_FINAL_TYPE (EphySearchEngineRow, ephy_search_engine_row, ADW_TYPE_EXPANDER_ROW)
 
 enum {
   PROP_0,
diff --git a/src/preferences/passwords-view.c b/src/preferences/passwords-view.c
index 851574442..1e7c85fa7 100644
--- a/src/preferences/passwords-view.c
+++ b/src/preferences/passwords-view.c
@@ -44,7 +44,7 @@ struct _EphyPasswordsView {
   GCancellable *cancellable;
 };
 
-G_DEFINE_TYPE (EphyPasswordsView, ephy_passwords_view, EPHY_TYPE_DATA_VIEW)
+G_DEFINE_FINAL_TYPE (EphyPasswordsView, ephy_passwords_view, EPHY_TYPE_DATA_VIEW)
 
 static void populate_model (EphyPasswordsView *passwords_view);
 
diff --git a/src/preferences/prefs-appearance-page.c b/src/preferences/prefs-appearance-page.c
index 0ea94b685..234c27812 100644
--- a/src/preferences/prefs-appearance-page.c
+++ b/src/preferences/prefs-appearance-page.c
@@ -53,7 +53,7 @@ struct _PrefsAppearancePage {
   GtkWidget *default_zoom_spin_button;
 };
 
-G_DEFINE_TYPE (PrefsAppearancePage, prefs_appearance_page, ADW_TYPE_PREFERENCES_PAGE)
+G_DEFINE_FINAL_TYPE (PrefsAppearancePage, prefs_appearance_page, ADW_TYPE_PREFERENCES_PAGE)
 
 static gchar *
 reader_font_style_get_name (gpointer                 user_data,
diff --git a/src/preferences/prefs-extensions-page.c b/src/preferences/prefs-extensions-page.c
index df9d3343f..fc98f8fd9 100644
--- a/src/preferences/prefs-extensions-page.c
+++ b/src/preferences/prefs-extensions-page.c
@@ -43,7 +43,7 @@ struct _PrefsExtensionsPage {
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (PrefsExtensionsPage, prefs_extensions_page, ADW_TYPE_PREFERENCES_PAGE)
+G_DEFINE_FINAL_TYPE (PrefsExtensionsPage, prefs_extensions_page, ADW_TYPE_PREFERENCES_PAGE)
 
 static void
 on_extension_row_activated (GtkWidget           *row,
diff --git a/src/preferences/prefs-general-page.c b/src/preferences/prefs-general-page.c
index 740521fe9..cdb86aaa2 100644
--- a/src/preferences/prefs-general-page.c
+++ b/src/preferences/prefs-general-page.c
@@ -94,7 +94,7 @@ struct _PrefsGeneralPage {
   GCancellable *cancellable;
 };
 
-G_DEFINE_TYPE (PrefsGeneralPage, prefs_general_page, ADW_TYPE_PREFERENCES_PAGE)
+G_DEFINE_FINAL_TYPE (PrefsGeneralPage, prefs_general_page, ADW_TYPE_PREFERENCES_PAGE)
 
 static void
 prefs_general_page_dispose (GObject *object)
diff --git a/src/preferences/prefs-privacy-page.c b/src/preferences/prefs-privacy-page.c
index 92ed43c57..906987454 100644
--- a/src/preferences/prefs-privacy-page.c
+++ b/src/preferences/prefs-privacy-page.c
@@ -54,7 +54,7 @@ struct _PrefsPrivacyPage {
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (PrefsPrivacyPage, prefs_privacy_page, ADW_TYPE_PREFERENCES_PAGE)
+G_DEFINE_FINAL_TYPE (PrefsPrivacyPage, prefs_privacy_page, ADW_TYPE_PREFERENCES_PAGE)
 
 static void
 on_passwords_row_activated (GtkWidget        *row,
diff --git a/src/preferences/webapp-additional-urls-dialog.c b/src/preferences/webapp-additional-urls-dialog.c
index 958bc42a7..73215884a 100644
--- a/src/preferences/webapp-additional-urls-dialog.c
+++ b/src/preferences/webapp-additional-urls-dialog.c
@@ -34,7 +34,7 @@ struct _EphyWebappAdditionalURLsDialog {
   GActionGroup *action_group;
 };
 
-G_DEFINE_TYPE (EphyWebappAdditionalURLsDialog, ephy_webapp_additional_urls_dialog, GTK_TYPE_WINDOW)
+G_DEFINE_FINAL_TYPE (EphyWebappAdditionalURLsDialog, ephy_webapp_additional_urls_dialog, GTK_TYPE_WINDOW)
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static gboolean
diff --git a/src/search-provider/ephy-search-provider.c b/src/search-provider/ephy-search-provider.c
index 031337d13..00ae67171 100644
--- a/src/search-provider/ephy-search-provider.c
+++ b/src/search-provider/ephy-search-provider.c
@@ -52,7 +52,7 @@ struct _EphySearchProviderClass {
   EphyEmbedShellClass parent_class;
 };
 
-G_DEFINE_TYPE (EphySearchProvider, ephy_search_provider, EPHY_TYPE_EMBED_SHELL)
+G_DEFINE_FINAL_TYPE (EphySearchProvider, ephy_search_provider, EPHY_TYPE_EMBED_SHELL)
 
 #define INACTIVITY_TIMEOUT 60 * 1000 /* One minute, in milliseconds */
 
diff --git a/src/synced-tabs-dialog.c b/src/synced-tabs-dialog.c
index 8df58b50d..c3f060ba2 100644
--- a/src/synced-tabs-dialog.c
+++ b/src/synced-tabs-dialog.c
@@ -42,7 +42,7 @@ struct _SyncedTabsDialog {
   GCancellable *cancellable;
 };
 
-G_DEFINE_TYPE (SyncedTabsDialog, synced_tabs_dialog, GTK_TYPE_WINDOW)
+G_DEFINE_FINAL_TYPE (SyncedTabsDialog, synced_tabs_dialog, GTK_TYPE_WINDOW)
 
 enum {
   ICON_COLUMN,
diff --git a/src/webapp-provider/ephy-webapp-provider.c b/src/webapp-provider/ephy-webapp-provider.c
index efef16d3c..29f07e1ea 100644
--- a/src/webapp-provider/ephy-webapp-provider.c
+++ b/src/webapp-provider/ephy-webapp-provider.c
@@ -38,7 +38,7 @@ struct _EphyWebAppProviderServiceClass {
   GApplicationClass parent_class;
 };
 
-G_DEFINE_TYPE (EphyWebAppProviderService, ephy_web_app_provider_service, G_TYPE_APPLICATION)
+G_DEFINE_FINAL_TYPE (EphyWebAppProviderService, ephy_web_app_provider_service, G_TYPE_APPLICATION)
 
 #define INACTIVITY_TIMEOUT 60 * 1000 /* One minute, in milliseconds */
 
diff --git a/src/webextension/ephy-web-extension-manager.c b/src/webextension/ephy-web-extension-manager.c
index 3350fd83b..a584a0df2 100644
--- a/src/webextension/ephy-web-extension-manager.c
+++ b/src/webextension/ephy-web-extension-manager.c
@@ -73,7 +73,7 @@ struct _EphyWebExtensionManager {
   GHashTable *pending_messages;
 };
 
-G_DEFINE_TYPE (EphyWebExtensionManager, ephy_web_extension_manager, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyWebExtensionManager, ephy_web_extension_manager, G_TYPE_OBJECT)
 
 EphyWebExtensionApiHandler api_handlers[] = {
   {"alarms", ephy_web_extension_api_alarms_handler},
diff --git a/src/webextension/ephy-web-extension.c b/src/webextension/ephy-web-extension.c
index c1860fa9d..6eff031e3 100644
--- a/src/webextension/ephy-web-extension.c
+++ b/src/webextension/ephy-web-extension.c
@@ -111,7 +111,7 @@ struct _EphyWebExtension {
 
 G_DEFINE_QUARK (web - extension - error - quark, web_extension_error)
 
-G_DEFINE_TYPE (EphyWebExtension, ephy_web_extension, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (EphyWebExtension, ephy_web_extension, G_TYPE_OBJECT)
 
 static gboolean is_supported_scheme (const char *scheme);