diff --git a/src/libopensc/pkcs15-atrust-acos.c b/src/libopensc/pkcs15-atrust-acos.c
index 723c8325..dbe04034 100644
--- a/src/libopensc/pkcs15-atrust-acos.c
+++ b/src/libopensc/pkcs15-atrust-acos.c
@@ -134,7 +134,7 @@ static int sc_pkcs15emu_atrust_acos_init(sc_pkcs15_card_t *p15card)
 		  SC_PKCS15_PIN_FLAG_LOCAL, -1, 0x00,
 		  SC_PKCS15_CO_FLAG_MODIFIABLE | SC_PKCS15_CO_FLAG_PRIVATE },
 #endif
-		{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0} 
+		{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0} 
 	};
 
 	const prdata prkeys[] = {
diff --git a/src/libopensc/pkcs15-gemsafe.c b/src/libopensc/pkcs15-gemsafe.c
index 98b17cdb..d5854250 100644
--- a/src/libopensc/pkcs15-gemsafe.c
+++ b/src/libopensc/pkcs15-gemsafe.c
@@ -180,7 +180,7 @@ static int sc_pkcs15emu_gemsafe_init(sc_pkcs15_card_t *p15card)
 		  8, 4, 8, SC_PKCS15_PIN_FLAG_NEEDS_PADDING |
 		  SC_PKCS15_PIN_FLAG_LOCAL, -1, 0x00,
 		  SC_PKCS15_CO_FLAG_PRIVATE },
-		{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0}
+		{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 	};
 
 	const prdata prkeys[] = {
diff --git a/src/libopensc/pkcs15-netkey.c b/src/libopensc/pkcs15-netkey.c
index d4ea7e20..b3a90a72 100644
--- a/src/libopensc/pkcs15-netkey.c
+++ b/src/libopensc/pkcs15-netkey.c
@@ -59,7 +59,7 @@ sc_pkcs15emu_netkey_init(sc_pkcs15_card_t *p15card) {
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_LOCAL |
 			SC_PKCS15_PIN_FLAG_INITIALIZED | SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN |
 			SC_PKCS15_PIN_FLAG_SO_PIN},
-		{0}
+		{0, 0, 0, 0, NULL, NULL, 0}
 	};
 	static const struct {
 		int           id, auth_id;
@@ -70,7 +70,7 @@ sc_pkcs15emu_netkey_init(sc_pkcs15_card_t *p15card) {
 		{1, 4, "DF015331", 0x80, "Signatur-Schlüssel"},
 		{2, 4, "DF015371", 0x82, "Authentifizierungs-Schlüssel"},
 		{3, 3, "DF0153B1", 0x81, "Verschlüsselungs-Schlüssel"},
-		{0}
+		{0, 0, NULL, 0, NULL}
 	};
 	static const struct {
 		int         id;
@@ -87,7 +87,7 @@ sc_pkcs15emu_netkey_init(sc_pkcs15_card_t *p15card) {
 		{3, 0, "DF01C200", "Telesec Verschlüsselungs Zertifikat"},
 		{3, 1, "DF0143B1", "User Verschlüsselungs Zertifikat 1"},
 		{3, 1, "DF0143B2", "User Verschlüsselungs Zertifikat 2"},
-		{0}
+		{0, 0, NULL, NULL}
 	};
 	sc_card_t         *card = p15card->card;
 	sc_context_t      *ctx = p15card->card->ctx;
diff --git a/src/libopensc/pkcs15-starcert.c b/src/libopensc/pkcs15-starcert.c
index a2893deb..90141878 100644
--- a/src/libopensc/pkcs15-starcert.c
+++ b/src/libopensc/pkcs15-starcert.c
@@ -138,7 +138,7 @@ static int sc_pkcs15emu_starcert_init(sc_pkcs15_card_t *p15card)
 		  8, 8, 8, SC_PKCS15_PIN_FLAG_NEEDS_PADDING |
 		  SC_PKCS15_PIN_FLAG_LOCAL, -1, 0x00,
 		  SC_PKCS15_CO_FLAG_MODIFIABLE | SC_PKCS15_CO_FLAG_PRIVATE },
-		{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0}
+		{ NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 	};
 
 	const prdata prkeys[] = {