diff --git a/src/libopensc/cardctl.h b/src/libopensc/cardctl.h
index 56598f126b..8d6c8d31f4 100644
--- a/src/libopensc/cardctl.h
+++ b/src/libopensc/cardctl.h
@@ -56,7 +56,7 @@ enum {
 	/*
 	 * TCOS specific calls
 	 */
-	SC_CARDCTL_TCOS_BASE = _CTL_PREFIX('T','C','S'),
+	SC_CARDCTL_TCOS_BASE = _CTL_PREFIX('T', 'C', 'S'),
 	SC_CARDCTL_TCOS_SETPERM,
 
 	/*
@@ -99,7 +99,7 @@ enum {
 	/*
 	 * Muscle specific calls
 	 */
-	SC_CARDCTL_MUSCLE_BASE = _CTL_PREFIX('M','S','C'),
+	SC_CARDCTL_MUSCLE_BASE = _CTL_PREFIX('M', 'S', 'C'),
 	SC_CARDCTL_MUSCLE_GENERATE_KEY,
 	SC_CARDCTL_MUSCLE_EXTRACT_KEY,
 	SC_CARDCTL_MUSCLE_IMPORT_KEY,
@@ -108,26 +108,26 @@ enum {
 	/*
 	 * ASEPCOS specific calls
 	 */
-	SC_CARDCTL_ASEPCOS_BASE = _CTL_PREFIX('A','S','E'),
+	SC_CARDCTL_ASEPCOS_BASE = _CTL_PREFIX('A', 'S', 'E'),
 	SC_CARDCTL_ASEPCOS_CHANGE_KEY,
 	SC_CARDCTL_ASEPCOS_AKN2FILEID,
 	SC_CARDCTL_ASEPCOS_SET_SATTR,
 	SC_CARDCTL_ASEPCOS_ACTIVATE_FILE,
 
- 	/*
+	/*
 	 * ruToken specific calls
 	 */
- 	SC_CARDCTL_RUTOKEN_BASE = _CTL_PREFIX('R', 'T', 'K'),
- 	/*  PUT_DATA  */
- 	SC_CARDCTL_RUTOKEN_CREATE_DO,
- 	SC_CARDCTL_RUTOKEN_CHANGE_DO,
- 	SC_CARDCTL_RUTOKEN_GENERATE_KEY_DO,
- 	SC_CARDCTL_RUTOKEN_DELETE_DO,
- 	SC_CARDCTL_RUTOKEN_GET_INFO,
- 	/* NON STANDARD  */
- 	SC_CARDCTL_RUTOKEN_GET_DO_INFO,
- 	SC_CARDCTL_RUTOKEN_GOST_ENCIPHER,
- 	SC_CARDCTL_RUTOKEN_GOST_DECIPHER,
+	SC_CARDCTL_RUTOKEN_BASE = _CTL_PREFIX('R', 'T', 'K'),
+	/*  PUT_DATA  */
+	SC_CARDCTL_RUTOKEN_CREATE_DO,
+	SC_CARDCTL_RUTOKEN_CHANGE_DO,
+	SC_CARDCTL_RUTOKEN_GENERATE_KEY_DO,
+	SC_CARDCTL_RUTOKEN_DELETE_DO,
+	SC_CARDCTL_RUTOKEN_GET_INFO,
+	/* NON STANDARD  */
+	SC_CARDCTL_RUTOKEN_GET_DO_INFO,
+	SC_CARDCTL_RUTOKEN_GOST_ENCIPHER,
+	SC_CARDCTL_RUTOKEN_GOST_DECIPHER,
 	SC_CARDCTL_RUTOKEN_FORMAT_INIT,
 	SC_CARDCTL_RUTOKEN_FORMAT_END,
 
@@ -150,8 +150,8 @@ enum {
 	SC_CARDCTL_RTECP_GENERATE_KEY,
 
 	/*
-	* Westcos specific
-	*/
+	 * Westcos specific
+	 */
 	SC_CARDCTL_WESTCOS_FREEZE = _CTL_PREFIX('W', 'T', 'C'),
 	SC_CARDCTL_WESTCOS_CREATE_MF,
 	SC_CARDCTL_WESTCOS_COMMIT,
@@ -192,14 +192,14 @@ enum {
 	SC_CARDCTL_CAC_FINAL_GET_CERT_OBJECTS,
 	SC_CARDCTL_CAC_GET_ACA_PATH,
 
-        /*
+	/*
 	 * AuthentIC v3
 	 */
-        SC_CARDCTL_AUTHENTIC_BASE = _CTL_PREFIX('A','V','3'),
-        SC_CARDCTL_AUTHENTIC_SDO_CREATE,
-        SC_CARDCTL_AUTHENTIC_SDO_DELETE,
-        SC_CARDCTL_AUTHENTIC_SDO_STORE,
-        SC_CARDCTL_AUTHENTIC_SDO_GENERATE,
+	SC_CARDCTL_AUTHENTIC_BASE = _CTL_PREFIX('A', 'V', '3'),
+	SC_CARDCTL_AUTHENTIC_SDO_CREATE,
+	SC_CARDCTL_AUTHENTIC_SDO_DELETE,
+	SC_CARDCTL_AUTHENTIC_SDO_STORE,
+	SC_CARDCTL_AUTHENTIC_SDO_GENERATE,
 
 	/*
 	 * Coolkey specific calls
@@ -212,13 +212,13 @@ enum {
 	SC_CARDCTL_COOLKEY_GET_TOKEN_INFO,
 	SC_CARDCTL_COOLKEY_FIND_OBJECT,
 
-        /*
+	/*
 	 * IAS/ECC
 	 */
-	SC_CARDCTL_IASECC_BASE = _CTL_PREFIX('E','C','C'),
+	SC_CARDCTL_IASECC_BASE = _CTL_PREFIX('E', 'C', 'C'),
 	SC_CARDCTL_IASECC_GET_FREE_KEY_REFERENCE,
-	SC_CARDCTL_IASECC_SDO_MAGIC = _CTL_PREFIX('S','D','O') | 'M',
-	SC_CARDCTL_IASECC_SDO_MAGIC_PUT_DATA = _CTL_PREFIX('S','D','O') | 'P',
+	SC_CARDCTL_IASECC_SDO_MAGIC = _CTL_PREFIX('S', 'D', 'O') | 'M',
+	SC_CARDCTL_IASECC_SDO_MAGIC_PUT_DATA = _CTL_PREFIX('S', 'D', 'O') | 'P',
 	SC_CARDCTL_IASECC_SDO_PUT_DATA,
 	SC_CARDCTL_IASECC_SDO_KEY_RSA_PUT_DATA,
 	SC_CARDCTL_IASECC_SDO_GET_DATA,
@@ -249,21 +249,21 @@ enum {
 	/*
 	 * DNIe specific calls
 	 */
-    SC_CARDCTL_DNIE_BASE = _CTL_PREFIX('D', 'N', 'I'),
+	SC_CARDCTL_DNIE_BASE = _CTL_PREFIX('D', 'N', 'I'),
 	SC_CARDCTL_DNIE_GENERATE_KEY,
 	SC_CARDCTL_DNIE_GET_INFO,
 
 	/*
 	 * isoApplet Java Card Applet
 	 */
-	SC_CARDCTL_ISOAPPLET_BASE = _CTL_PREFIX('I','S','O'),
+	SC_CARDCTL_ISOAPPLET_BASE = _CTL_PREFIX('I', 'S', 'O'),
 	SC_CARDCTL_ISOAPPLET_GENERATE_KEY,
 	SC_CARDCTL_ISOAPPLET_IMPORT_KEY,
 
 	/*
 	 * GIDS cards
 	 */
-	SC_CARDCTL_GIDS_BASE = _CTL_PREFIX('G','I','D'),
+	SC_CARDCTL_GIDS_BASE = _CTL_PREFIX('G', 'I', 'D'),
 	SC_CARDCTL_GIDS_GET_ALL_CONTAINERS,
 	SC_CARDCTL_GIDS_GET_CONTAINER_DETAIL,
 	SC_CARDCTL_GIDS_SELECT_KEY_REFERENCE,