diff --git a/lasso/id-ff/federation.c b/lasso/id-ff/federation.c
index c4c8015a..1af5f924 100644
--- a/lasso/id-ff/federation.c
+++ b/lasso/id-ff/federation.c
@@ -218,7 +218,7 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoFederation *federation)
+instance_init(LassoFederation *federation, G_GNUC_UNUSED void *unused)
 {
 	federation->private_data = g_new0(LassoFederationPrivate, 1);
 	federation->private_data->dispose_has_run = FALSE;
diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index 7c37e6f7..b21ff248 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -216,7 +216,7 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdentity *identity)
+instance_init(LassoIdentity *identity, G_GNUC_UNUSED void *unused)
 {
 	identity->private_data = g_new0(LassoIdentityPrivate, 1);
 	identity->private_data->dispose_has_run = FALSE;
diff --git a/lasso/id-ff/lecp.c b/lasso/id-ff/lecp.c
index a323e9e4..1b9771c1 100644
--- a/lasso/id-ff/lecp.c
+++ b/lasso/id-ff/lecp.c
@@ -408,7 +408,7 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoLecp *lecp)
+instance_init(LassoLecp *lecp, G_GNUC_UNUSED void *unused)
 {
 	lecp->authnRequestEnvelope = NULL;
 	lecp->authnResponseEnvelope = NULL;
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index d5559901..bc3b2249 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -2453,7 +2453,7 @@ dispose(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoLogin *login)
+instance_init(LassoLogin *login, G_GNUC_UNUSED void *unused)
 {
 	login->private_data = LASSO_LOGIN_GET_PRIVATE(login);
 	login->protocolProfile = 0;
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index d307db58..f6307e54 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -1216,7 +1216,7 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoLogout *logout)
+instance_init(LassoLogout *logout, G_GNUC_UNUSED void *unused)
 {
 	logout->initial_http_request_method = LASSO_HTTP_METHOD_NONE;
 	logout->private_data = g_new0(LassoLogoutPrivate, 1);
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index 076cf962..fdfa2d1a 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -664,7 +664,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 /*****************************************************************************/
 
 static void
-instance_init(LassoNameRegistration *name_registration)
+instance_init(LassoNameRegistration *name_registration, G_GNUC_UNUSED void *unused)
 {
 	name_registration->oldNameIdentifier = NULL;
 }
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 6decfee1..d8e1d1d3 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -929,7 +929,7 @@ dispose(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoProfile *profile)
+instance_init(LassoProfile *profile, G_GNUC_UNUSED void *unused)
 {
 	profile->private_data = LASSO_PROFILE_GET_PRIVATE(profile);
 	profile->private_data->dispose_has_run = FALSE;
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 496a961c..ec097974 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -882,7 +882,7 @@ dispose(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoProvider *provider)
+instance_init(LassoProvider *provider, G_GNUC_UNUSED void *unused)
 {
 	provider->role = LASSO_PROVIDER_ROLE_NONE;
 	provider->ProviderID = NULL;
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 352d7737..c4b35cac 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -426,7 +426,8 @@ get_first_providerID(gchar *key, G_GNUC_UNUSED gpointer value, char **providerID
 }
 
 static gboolean
-get_first_providerID_by_role(G_GNUC_UNUSED gchar *key, gpointer value, LassoProviderRole role) {
+get_first_providerID_by_role(G_GNUC_UNUSED gchar *key, gpointer value, gpointer _role) {
+	LassoProviderRole role = (LassoProviderRole)_role;
 	LassoProvider *provider = (LassoProvider*)value;
 	if (provider->role == role || role == LASSO_PROVIDER_ROLE_ANY) {
 		return TRUE;
@@ -648,7 +649,7 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoServer *server)
+instance_init(LassoServer *server, G_GNUC_UNUSED void *unused)
 {
 	server->private_data = g_new0(LassoServerPrivate, 1);
 	server->private_data->dispose_has_run = FALSE;
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index c303470c..86f5fdec 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -63,8 +63,8 @@ lasso_new_nid_and_session_index(LassoNode *name_id, const char *assertion_id, co
 	return nid_and_session_index;
 }
 
-void
-lasso_release_nid_and_session_index(struct _NidAndSessionIndex *nid_and_session_index)
+static void
+lasso_release_nid_and_session_index(struct _NidAndSessionIndex *nid_and_session_index, G_GNUC_UNUSED void *unused)
 {
 	lasso_release_gobject(nid_and_session_index->name_id);
 	lasso_release_string(nid_and_session_index->session_index);
@@ -97,7 +97,7 @@ lasso_session_add_nid_and_session_index(LassoSession *session,
 		/* do some sharing and limit doublons */
 		if (lasso_match_name_id(other_nid_and_sid->name_id, nid_and_session_index->name_id)) {
 			if (lasso_strisequal(other_nid_and_sid->session_index, nid_and_session_index->session_index)) {
-				lasso_release_nid_and_session_index(nid_and_session_index);
+				lasso_release_nid_and_session_index(nid_and_session_index, NULL);
 				return;
 			}
 			// lasso_assign_gobject(nid_and_session_index->name_id, other_nid_and_sid->name_id);
@@ -952,7 +952,7 @@ dispose(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoSession *session)
+instance_init(LassoSession *session, G_GNUC_UNUSED void *unused)
 {
 	session->private_data = LASSO_SESSION_GET_PRIVATE(session);
 	session->private_data->dispose_has_run = FALSE;
diff --git a/lasso/key.c b/lasso/key.c
index f6b83a5b..6bf16d0c 100644
--- a/lasso/key.c
+++ b/lasso/key.c
@@ -51,7 +51,7 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoKey *key)
+instance_init(LassoKey *key, G_GNUC_UNUSED void *unused)
 {
 	key->private_data = LASSO_KEY_GET_PRIVATE(key);
 }
diff --git a/lasso/saml-2.0/assertion_query.c b/lasso/saml-2.0/assertion_query.c
index 9005916a..4811f20b 100644
--- a/lasso/saml-2.0/assertion_query.c
+++ b/lasso/saml-2.0/assertion_query.c
@@ -537,7 +537,7 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoAssertionQuery *assertion_query)
+instance_init(LassoAssertionQuery *assertion_query, G_GNUC_UNUSED void *unused)
 {
 	assertion_query->private_data = g_new0(LassoAssertionQueryPrivate, 1);
 }
diff --git a/lasso/saml-2.0/ecp.c b/lasso/saml-2.0/ecp.c
index 99afb9e9..6855a452 100644
--- a/lasso/saml-2.0/ecp.c
+++ b/lasso/saml-2.0/ecp.c
@@ -434,7 +434,7 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoEcp *ecp)
+instance_init(LassoEcp *ecp, G_GNUC_UNUSED void *unused)
 {
 	ecp->private_data = g_new0(LassoEcpPrivate, 1);
 }
diff --git a/lasso/utils.c b/lasso/utils.c
index f7a305b9..5d729fea 100644
--- a/lasso/utils.c
+++ b/lasso/utils.c
@@ -121,12 +121,16 @@ lasso_gobject_is_of_type(GObject *a, GType b)
 	return 1;
 }
 
+static int lasso_extract_gtype_from_list_compare_func(const void *a, const void *b) {
+	return lasso_gobject_is_of_type((GObject*)a, (GType)b);
+}
+
 GObject*
 lasso_extract_gtype_from_list(GType type, GList *list)
 {
 	GList *needle;
 
-	needle = g_list_find_custom(list, (gconstpointer)type, (GCompareFunc)lasso_gobject_is_of_type);
+	needle = g_list_find_custom(list, (gconstpointer)type, lasso_extract_gtype_from_list_compare_func);
 	if (needle) {
 		return needle->data;
 	}
diff --git a/lasso/xml/dsig/ds_x509_data.c b/lasso/xml/dsig/ds_x509_data.c
index c8149009..9ee612b9 100644
--- a/lasso/xml/dsig/ds_x509_data.c
+++ b/lasso/xml/dsig/ds_x509_data.c
@@ -59,7 +59,7 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoDsX509Data *x509_data)
+instance_init(LassoDsX509Data *x509_data, G_GNUC_UNUSED void *unused)
 {
 	x509_data->private_data = LASSO_DS_X509_DATA_GET_PRIVATE(x509_data);
 }
diff --git a/lasso/xml/ecp/ecp_request.c b/lasso/xml/ecp/ecp_request.c
index 0a1fa6be..775823b6 100644
--- a/lasso/xml/ecp/ecp_request.c
+++ b/lasso/xml/ecp/ecp_request.c
@@ -131,7 +131,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 
 
 static void
-instance_init(LassoEcpRequest *node)
+instance_init(LassoEcpRequest *node, G_GNUC_UNUSED void *unused)
 {
 	node->IsPassive = TRUE;
 }
diff --git a/lasso/xml/lib_authn_request.c b/lasso/xml/lib_authn_request.c
index f6e515ab..35f69abf 100644
--- a/lasso/xml/lib_authn_request.c
+++ b/lasso/xml/lib_authn_request.c
@@ -164,7 +164,7 @@ init_from_query(LassoNode *node, char **query_fields)
 /*****************************************************************************/
 
 static void
-instance_init(LassoLibAuthnRequest *node)
+instance_init(LassoLibAuthnRequest *node, G_GNUC_UNUSED void *unused)
 {
 	node->IsPassive = TRUE;
 }
diff --git a/lasso/xml/lib_scoping.c b/lasso/xml/lib_scoping.c
index 9b839211..0bf311e7 100644
--- a/lasso/xml/lib_scoping.c
+++ b/lasso/xml/lib_scoping.c
@@ -57,7 +57,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoLibScoping *node)
+instance_init(LassoLibScoping *node, G_GNUC_UNUSED void *unused)
 {
 	node->ProxyCount = -1;
 }
diff --git a/lasso/xml/saml-2.0/saml2_assertion.c b/lasso/xml/saml-2.0/saml2_assertion.c
index a87e48d9..452974d8 100644
--- a/lasso/xml/saml-2.0/saml2_assertion.c
+++ b/lasso/xml/saml-2.0/saml2_assertion.c
@@ -144,7 +144,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 /*****************************************************************************/
 
 static void
-instance_init(LassoSaml2Assertion *node)
+instance_init(LassoSaml2Assertion *node, G_GNUC_UNUSED void *unused)
 {
 	node->sign_type = LASSO_SIGNATURE_TYPE_NONE;
 	node->encryption_sym_key_type = LASSO_ENCRYPTION_SYM_KEY_TYPE_DEFAULT;
diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c
index 7ca83fbd..8ba3d72e 100644
--- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c
+++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c
@@ -78,7 +78,7 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSaml2KeyInfoConfirmationDataType *saml2_key_info_confirmation_data_type)
+instance_init(LassoSaml2KeyInfoConfirmationDataType *saml2_key_info_confirmation_data_type, G_GNUC_UNUSED void *unused)
 {
 	saml2_key_info_confirmation_data_type->private_data =
 		LASSO_SAML2_KEY_INFO_CONFIRMATION_DATA_TYPE_GET_PRIVATE(
diff --git a/lasso/xml/saml-2.0/samlp2_authn_request.c b/lasso/xml/saml-2.0/samlp2_authn_request.c
index c55b5862..3edbc4e5 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_request.c
+++ b/lasso/xml/saml-2.0/samlp2_authn_request.c
@@ -99,7 +99,7 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2AuthnRequest *node)
+instance_init(LassoSamlp2AuthnRequest *node, G_GNUC_UNUSED void *unused)
 {
 	node->AssertionConsumerServiceIndex = -1;
 	node->AttributeConsumingServiceIndex = -1;
diff --git a/lasso/xml/saml-2.0/samlp2_request_abstract.c b/lasso/xml/saml-2.0/samlp2_request_abstract.c
index a0f49c78..b09af9ca 100644
--- a/lasso/xml/saml-2.0/samlp2_request_abstract.c
+++ b/lasso/xml/saml-2.0/samlp2_request_abstract.c
@@ -115,7 +115,7 @@ build_query(LassoNode *node)
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2RequestAbstract *node)
+instance_init(LassoSamlp2RequestAbstract *node, G_GNUC_UNUSED void *unused)
 {
 	node->sign_type = LASSO_SIGNATURE_TYPE_NONE;
 }
diff --git a/lasso/xml/saml-2.0/samlp2_status_response.c b/lasso/xml/saml-2.0/samlp2_status_response.c
index 206bb1a8..83ed382c 100644
--- a/lasso/xml/saml-2.0/samlp2_status_response.c
+++ b/lasso/xml/saml-2.0/samlp2_status_response.c
@@ -122,7 +122,7 @@ init_from_query(LassoNode *node, char **query_fields)
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2StatusResponse *node)
+instance_init(LassoSamlp2StatusResponse *node, G_GNUC_UNUSED void *unused)
 {
 	node->sign_type = LASSO_SIGNATURE_TYPE_NONE;
 }
diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c
index 0ec10825..2a2176c2 100644
--- a/lasso/xml/samlp_request_abstract.c
+++ b/lasso/xml/samlp_request_abstract.c
@@ -82,7 +82,7 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlpRequestAbstract *node)
+instance_init(LassoSamlpRequestAbstract *node, G_GNUC_UNUSED void *unused)
 {
 	node->sign_type = LASSO_SIGNATURE_TYPE_NONE;
 }
diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c
index ce6db4c6..05194810 100644
--- a/lasso/xml/samlp_response_abstract.c
+++ b/lasso/xml/samlp_response_abstract.c
@@ -87,7 +87,7 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlpResponseAbstract *node)
+instance_init(LassoSamlpResponseAbstract *node, G_GNUC_UNUSED void *unused)
 {
 	node->sign_type = LASSO_SIGNATURE_TYPE_NONE;
 }