diff --git a/src/libopensc/card-myeid.c b/src/libopensc/card-myeid.c
index 846ca549..b957d2d9 100644
--- a/src/libopensc/card-myeid.c
+++ b/src/libopensc/card-myeid.c
@@ -38,12 +38,12 @@
 
 static struct sc_card_operations myeid_ops;
 static struct sc_card_driver myeid_drv = {
-     .name = "MyEID cards with PKCS#15 applet",
-     .short_name = "myeid",
-     .ops = &myeid_ops,
-	 .atr_map = NULL,
-	 .natrs = 0,
-	 .dll = NULL
+	"MyEID cards with PKCS#15 applet",
+	"myeid",
+	&myeid_ops,
+	NULL,
+	0,
+	NULL
 };
 
 static const char *myeid_atrs[] = {
diff --git a/src/pkcs11/openssl.c b/src/pkcs11/openssl.c
index e4beac67..979d9b6c 100644
--- a/src/pkcs11/openssl.c
+++ b/src/pkcs11/openssl.c
@@ -32,154 +32,154 @@ static CK_RV	sc_pkcs11_openssl_md_final(sc_pkcs11_operation_t *,
 static void	sc_pkcs11_openssl_md_release(sc_pkcs11_operation_t *);
 
 static sc_pkcs11_mechanism_type_t openssl_sha1_mech = {
-	.mech = CKM_SHA_1,
-	.mech_info = { 0, 0, CKF_DIGEST },
-	.key_type = 0,
-	.obj_size = sizeof(struct sc_pkcs11_operation),
-	.release = sc_pkcs11_openssl_md_release,
-	.md_init = sc_pkcs11_openssl_md_init,
-	.md_update = sc_pkcs11_openssl_md_update,
-	.md_final = sc_pkcs11_openssl_md_final,
-	.sign_init = NULL,
-	.sign_update = NULL,
-	.sign_final = NULL,
-	.sign_size = NULL,
-	.verif_init = NULL,
-	.verif_update = NULL,
-	.verif_final = NULL,
-	.decrypt_init = NULL,
-	.decrypt = NULL,
-	.mech_data = NULL
+	CKM_SHA_1,
+	{ 0, 0, CKF_DIGEST },
+	0,
+	sizeof(struct sc_pkcs11_operation),
+	sc_pkcs11_openssl_md_release,
+	sc_pkcs11_openssl_md_init,
+	sc_pkcs11_openssl_md_update,
+	sc_pkcs11_openssl_md_final,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
 static sc_pkcs11_mechanism_type_t openssl_sha256_mech = {
-	.mech = CKM_SHA256,
-	.mech_info = { 0, 0, CKF_DIGEST },
-	.key_type = 0,
-	.obj_size = sizeof(struct sc_pkcs11_operation),
-	.release = sc_pkcs11_openssl_md_release,
-	.md_init = sc_pkcs11_openssl_md_init,
-	.md_update = sc_pkcs11_openssl_md_update,
-	.md_final = sc_pkcs11_openssl_md_final,
-	.sign_init = NULL,
-	.sign_update = NULL,
-	.sign_final = NULL,
-	.sign_size = NULL,
-	.verif_init = NULL,
-	.verif_update = NULL,
-	.verif_final = NULL,
-	.decrypt_init = NULL,
-	.decrypt = NULL,
-	.mech_data = NULL
+	CKM_SHA256,
+	{ 0, 0, CKF_DIGEST },
+	0,
+	sizeof(struct sc_pkcs11_operation),
+	sc_pkcs11_openssl_md_release,
+	sc_pkcs11_openssl_md_init,
+	sc_pkcs11_openssl_md_update,
+	sc_pkcs11_openssl_md_final,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static sc_pkcs11_mechanism_type_t openssl_sha384_mech = {
-	.mech = CKM_SHA384,
-	.mech_info = { 0, 0, CKF_DIGEST },
-	.key_type = 0,
-	.obj_size = sizeof(struct sc_pkcs11_operation),
-	.release = sc_pkcs11_openssl_md_release,
-	.md_init = sc_pkcs11_openssl_md_init,
-	.md_update = sc_pkcs11_openssl_md_update,
-	.md_final = sc_pkcs11_openssl_md_final,
-	.sign_init = NULL,
-	.sign_update = NULL,
-	.sign_final = NULL,
-	.sign_size = NULL,
-	.verif_init = NULL,
-	.verif_update = NULL,
-	.verif_final = NULL,
-	.decrypt_init = NULL,
-	.decrypt = NULL,
-	.mech_data = NULL
+	CKM_SHA384,
+	{ 0, 0, CKF_DIGEST },
+	0,
+	sizeof(struct sc_pkcs11_operation),
+	sc_pkcs11_openssl_md_release,
+	sc_pkcs11_openssl_md_init,
+	sc_pkcs11_openssl_md_update,
+	sc_pkcs11_openssl_md_final,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static sc_pkcs11_mechanism_type_t openssl_sha512_mech = {
-	.mech = CKM_SHA512,
-	.mech_info = { 0, 0, CKF_DIGEST },
-	.key_type = 0,
-	.obj_size = sizeof(struct sc_pkcs11_operation),
-	.release = sc_pkcs11_openssl_md_release,
-	.md_init = sc_pkcs11_openssl_md_init,
-	.md_update = sc_pkcs11_openssl_md_update,
-	.md_final = sc_pkcs11_openssl_md_final,
-	.sign_init = NULL,
-	.sign_update = NULL,
-	.sign_final = NULL,
-	.sign_size = NULL,
-	.verif_init = NULL,
-	.verif_update = NULL,
-	.verif_final = NULL,
-	.decrypt_init = NULL,
-	.decrypt = NULL,
-	.mech_data = NULL
+	CKM_SHA512,
+	{ 0, 0, CKF_DIGEST },
+	0,
+	sizeof(struct sc_pkcs11_operation),
+	sc_pkcs11_openssl_md_release,
+	sc_pkcs11_openssl_md_init,
+	sc_pkcs11_openssl_md_update,
+	sc_pkcs11_openssl_md_final,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 static sc_pkcs11_mechanism_type_t openssl_gostr3411_mech = {
-	.mech = CKM_GOSTR3411,
-	.mech_info = { 0, 0, CKF_DIGEST },
-	.key_type = 0,
-	.obj_size = sizeof(struct sc_pkcs11_operation),
-	.release = sc_pkcs11_openssl_md_release,
-	.md_init = sc_pkcs11_openssl_md_init,
-	.md_update = sc_pkcs11_openssl_md_update,
-	.md_final = sc_pkcs11_openssl_md_final,
-	.sign_init = NULL,
-	.sign_update = NULL,
-	.sign_final = NULL,
-	.sign_size = NULL,
-	.verif_init = NULL,
-	.verif_update = NULL,
-	.verif_final = NULL,
-	.decrypt_init = NULL,
-	.decrypt = NULL,
-	.mech_data = NULL
+	CKM_GOSTR3411,
+	{ 0, 0, CKF_DIGEST },
+	0,
+	sizeof(struct sc_pkcs11_operation),
+	sc_pkcs11_openssl_md_release,
+	sc_pkcs11_openssl_md_init,
+	sc_pkcs11_openssl_md_update,
+	sc_pkcs11_openssl_md_final,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 #endif
 
 static sc_pkcs11_mechanism_type_t openssl_md5_mech = {
-	.mech = CKM_MD5,
-	.mech_info = { 0, 0, CKF_DIGEST },
-	.key_type = 0,
-	.obj_size = sizeof(struct sc_pkcs11_operation),
-	.release = sc_pkcs11_openssl_md_release,
-	.md_init = sc_pkcs11_openssl_md_init,
-	.md_update = sc_pkcs11_openssl_md_update,
-	.md_final = sc_pkcs11_openssl_md_final,
-	.sign_init = NULL,
-	.sign_update = NULL,
-	.sign_final = NULL,
-	.sign_size = NULL,
-	.verif_init = NULL,
-	.verif_update = NULL,
-	.verif_final = NULL,
-	.decrypt_init = NULL,
-	.decrypt = NULL,
-	.mech_data = NULL
+	CKM_MD5,
+	{ 0, 0, CKF_DIGEST },
+	0,
+	sizeof(struct sc_pkcs11_operation),
+	sc_pkcs11_openssl_md_release,
+	sc_pkcs11_openssl_md_init,
+	sc_pkcs11_openssl_md_update,
+	sc_pkcs11_openssl_md_final,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static sc_pkcs11_mechanism_type_t openssl_ripemd160_mech = {
-	.mech = CKM_RIPEMD160,
-	.mech_info = { 0, 0, CKF_DIGEST },
-	.key_type = 0,
-	.obj_size = sizeof(struct sc_pkcs11_operation),
-	.release = sc_pkcs11_openssl_md_release,
-	.md_init = sc_pkcs11_openssl_md_init,
-	.md_update = sc_pkcs11_openssl_md_update,
-	.md_final = sc_pkcs11_openssl_md_final,
-	.sign_init = NULL,
-	.sign_update = NULL,
-	.sign_final = NULL,
-	.sign_size = NULL,
-	.verif_init = NULL,
-	.verif_update = NULL,
-	.verif_final = NULL,
-	.decrypt_init = NULL,
-	.decrypt = NULL,
-	.mech_data = NULL
+	CKM_RIPEMD160,
+	{ 0, 0, CKF_DIGEST },
+	0,
+	sizeof(struct sc_pkcs11_operation),
+	sc_pkcs11_openssl_md_release,
+	sc_pkcs11_openssl_md_init,
+	sc_pkcs11_openssl_md_update,
+	sc_pkcs11_openssl_md_final,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 void
diff --git a/src/pkcs15init/pkcs15-setcos.c b/src/pkcs15init/pkcs15-setcos.c
index 43d799a4..9a5d0c78 100644
--- a/src/pkcs15init/pkcs15-setcos.c
+++ b/src/pkcs15init/pkcs15-setcos.c
@@ -572,24 +572,24 @@ setcos_create_pin_internal(sc_profile_t *profile, sc_pkcs15_card_t *p15card,
 
 
 static struct sc_pkcs15init_operations sc_pkcs15init_setcos_operations = {
-	.erase_card = setcos_erase_card,
-	.init_card = setcos_init_card,		/* init_card     */
-	.create_dir = setcos_create_dir,	/* create_dir    */
-	.create_domain = NULL,				/* create_domain */
-	.select_pin_reference = setcos_select_pin_reference,
-	.create_pin = setcos_create_pin,
-	.select_key_reference = NULL, 		/* select_key_reference */
-	.create_key = setcos_create_key,	/* create_key */
-	.store_key = setcos_store_key,		/* store_key  */
-	.generate_key = setcos_generate_key,	/* generate_key */
-	.encode_private_key = setcos_encode_private_key,
-	.encode_public_key = setcos_encode_public_key,
-	.finalize_card = NULL,				/* finalize_card */
-	.delete_object = setcos_delete_object,
-	.emu_update_dir = NULL,
-	.emu_update_any_df = NULL,
-	.emu_update_tokeninfo = NULL,
-	.emu_write_info = NULL
+	setcos_erase_card,		/* erase_card */
+	setcos_init_card,		/* init_card     */
+	setcos_create_dir,		/* create_dir    */
+	NULL,				/* create_domain */
+	setcos_select_pin_reference,	/* select_pin_reference */
+	setcos_create_pin,		/* create_pin */
+	NULL, 				/* select_key_reference */
+	setcos_create_key,		/* create_key */
+	setcos_store_key,		/* store_key  */
+	setcos_generate_key,		/* generate_key */
+	setcos_encode_private_key, 	/* encode_private_key  */ 
+	setcos_encode_public_key, 	/* encode_public_key */
+	NULL,				/* finalize_card */
+	setcos_delete_object,		/* setcos_delete_object */
+	NULL,				/* emu_update_dir */
+	NULL, 				/* emu_update_any_df */
+	NULL, 				/* emu_update_tokeninfo */
+	NULL 				/* emu_write_info */
 };
 
 struct sc_pkcs15init_operations *