diff --git a/NEWS b/NEWS
index 7aeb845a2..6d37ba33f 100644
--- a/NEWS
+++ b/NEWS
@@ -233,7 +233,7 @@ Release Notes - Heimdal - Version Heimdal 1.3
 
  - Support for settin friendly name on credential caches
  - Move to using doxygen to generate documentation.
- - Sprinkling __attribute__((depricated)) for old function to be removed
+ - Sprinkling __attribute__((__deprecated__)) for old function to be removed
  - Support to export LAST-REQUST information in AS-REQ
  - Support for client deferrals in in AS-REQ
  - Add seek support for krb5_storage.
diff --git a/include/bits.c b/include/bits.c
index af077f3b4..326b67b7c 100644
--- a/include/bits.c
+++ b/include/bits.c
@@ -68,13 +68,13 @@ RCSID("$Id$");
 #endif
 
 static void
-try_signed(FILE *f, int len)  __attribute__ ((unused));
+try_signed(FILE *f, int len)  __attribute__ ((__unused__));
 
 static void
-try_unsigned(FILE *f, int len) __attribute__ ((unused));
+try_unsigned(FILE *f, int len) __attribute__ ((__unused__));
 
 static int
-print_bt(FILE *f, int flag) __attribute__ ((unused));
+print_bt(FILE *f, int flag) __attribute__ ((__unused__));
 
 static void
 try_signed(FILE *f, int len)
@@ -262,7 +262,7 @@ int main(int argc, char **argv)
 
     fprintf(f, "#ifndef HEIMDAL_DEPRECATED\n");
     fprintf(f, "#if __has_extension(deprecated) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
-    fprintf(f, "#define HEIMDAL_DEPRECATED __attribute__((deprecated))\n");
+    fprintf(f, "#define HEIMDAL_DEPRECATED __attribute__ ((__deprecated__))\n");
     fprintf(f, "#elif defined(_MSC_VER) && (_MSC_VER>1200)\n");
     fprintf(f, "#define HEIMDAL_DEPRECATED __declspec(deprecated)\n");
     fprintf(f, "#else\n");
@@ -272,7 +272,7 @@ int main(int argc, char **argv)
 
     fprintf(f, "#ifndef HEIMDAL_PRINTF_ATTRIBUTE\n");
     fprintf(f, "#if __has_extension(format) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
-    fprintf(f, "#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))\n");
+    fprintf(f, "#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__ ((__format__ x))\n");
     fprintf(f, "#else\n");
     fprintf(f, "#define HEIMDAL_PRINTF_ATTRIBUTE(x)\n");
     fprintf(f, "#endif\n");
@@ -280,7 +280,7 @@ int main(int argc, char **argv)
 
     fprintf(f, "#ifndef HEIMDAL_NORETURN_ATTRIBUTE\n");
     fprintf(f, "#if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
-    fprintf(f, "#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))\n");
+    fprintf(f, "#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__ ((__noreturn__))\n");
     fprintf(f, "#else\n");
     fprintf(f, "#define HEIMDAL_NORETURN_ATTRIBUTE\n");
     fprintf(f, "#endif\n");
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
 
     fprintf(f, "#ifndef HEIMDAL_UNUSED_ATTRIBUTE\n");
     fprintf(f, "#if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
-    fprintf(f, "#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))\n");
+    fprintf(f, "#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__ ((__unused__))\n");
     fprintf(f, "#else\n");
     fprintf(f, "#define HEIMDAL_UNUSED_ATTRIBUTE\n");
     fprintf(f, "#endif\n");
@@ -296,7 +296,7 @@ int main(int argc, char **argv)
 
     fprintf(f, "#ifndef HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE\n");
     fprintf(f, "#if __has_extension(warn_unused_result) || KRB5TYPES_REQUIRE_GNUC(3,3,0)\n");
-    fprintf(f, "#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__((warn_unused_result))\n");
+    fprintf(f, "#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__ ((__warn_unused_result__))\n");
     fprintf(f, "#else\n");
     fprintf(f, "#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE\n");
     fprintf(f, "#endif\n");
diff --git a/include/krb5-types.cross b/include/krb5-types.cross
index bdd9b5a36..4dc5c6aa8 100644
--- a/include/krb5-types.cross
+++ b/include/krb5-types.cross
@@ -24,7 +24,7 @@ typedef ssize_t krb5_ssize_t;
 
 #ifndef HEIMDAL_DEPRECATED
 #if __has_extension(deprecated) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_DEPRECATED __attribute__((deprecated))
+#define HEIMDAL_DEPRECATED __attribute__ ((__deprecated__))
 #elif defined(_MSC_VER) && (_MSC_VER>1200) 
 #define HEIMDAL_DEPRECATED __declspec(deprecated)
 #else
@@ -34,7 +34,7 @@ typedef ssize_t krb5_ssize_t;
 
 #ifndef HEIMDAL_PRINTF_ATTRIBUTE
 #if __has_extension(format) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))
+#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__ ((__format__ x))
 #else
 #define HEIMDAL_PRINTF_ATTRIBUTE(x)
 #endif
@@ -42,7 +42,7 @@ typedef ssize_t krb5_ssize_t;
 
 #ifndef HEIMDAL_NORETURN_ATTRIBUTE
 #if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))
+#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__ ((__noreturn__))
 #else
 #define HEIMDAL_NORETURN_ATTRIBUTE
 #endif
@@ -50,7 +50,7 @@ typedef ssize_t krb5_ssize_t;
 
 #ifndef HEIMDAL_UNUSED_ATTRIBUTE
 #if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))
+#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__ ((__unused__))
 #else
 #define HEIMDAL_UNUSED_ATTRIBUTE
 #endif
@@ -58,7 +58,7 @@ typedef ssize_t krb5_ssize_t;
 
 #ifndef HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE
 #if __has_extension(__warn_unused_result__) || KRB5TYPES_REQUIRE_GNUC(3,3,0)
-#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__((__warn_unused_result__))
+#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__ ((__warn_unused_result__))
 #endif
 #endif
 
diff --git a/lib/asn1/gen_template.c b/lib/asn1/gen_template.c
index f0b94d75a..d469201e5 100644
--- a/lib/asn1/gen_template.c
+++ b/lib/asn1/gen_template.c
@@ -260,13 +260,13 @@ struct tlist {
 
 ASN1_TAILQ_HEAD(tlisthead, tlist);
 
-static void tlist_header(struct tlist *, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
+static void tlist_header(struct tlist *, const char *, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
 static struct template *
-    add_line(struct templatehead *, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
+    add_line(struct templatehead *, const char *, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
 static int tlist_cmp(const struct tlist *, const struct tlist *);
 
 static void add_line_pointer(struct templatehead *, const char *, const char *, const char *, ...)
-    __attribute__((__format__(__printf__, 4, 5)));
+    __attribute__ ((__format__ (__printf__, 4, 5)));
 
 
 static struct tlisthead tlistmaster = ASN1_TAILQ_HEAD_INITIALIZER(tlistmaster);
diff --git a/lib/base/heimbase.h b/lib/base/heimbase.h
index 32f457ff8..157cbd4c1 100644
--- a/lib/base/heimbase.h
+++ b/lib/base/heimbase.h
@@ -114,12 +114,12 @@ heim_base_once_f(heim_base_once_t *, void *, void (*)(void *));
 void
 heim_abort(const char *fmt, ...)
     HEIMDAL_NORETURN_ATTRIBUTE
-    HEIMDAL_PRINTF_ATTRIBUTE((printf, 1, 2));
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 1, 2));
 
 void
 heim_abortv(const char *fmt, va_list ap)
     HEIMDAL_NORETURN_ATTRIBUTE
-    HEIMDAL_PRINTF_ATTRIBUTE((printf, 1, 0));
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 1, 0));
 
 #define heim_assert(e,t) \
     (heim_builtin_expect(!(e), 0) ? heim_abort(t ":" #e) : (void)0)
@@ -220,13 +220,13 @@ typedef struct heim_error * heim_error_t;
 heim_error_t heim_error_create_enomem(void);
 
 heim_error_t	heim_error_create(int, const char *, ...)
-    HEIMDAL_PRINTF_ATTRIBUTE((printf, 2, 3));
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 2, 3));
 
 void		heim_error_create_opt(heim_error_t *error, int error_code, const char *fmt, ...)
-    HEIMDAL_PRINTF_ATTRIBUTE((printf, 3, 4));
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 3, 4));
 
 heim_error_t	heim_error_createv(int, const char *, va_list)
-    HEIMDAL_PRINTF_ATTRIBUTE((printf, 2, 0));
+    HEIMDAL_PRINTF_ATTRIBUTE((__printf__, 2, 0));
 
 heim_string_t heim_error_copy_string(heim_error_t);
 int heim_error_get_code(heim_error_t);
diff --git a/lib/com_err/com_err.c b/lib/com_err/com_err.c
index fe4cc2983..22a810f8f 100644
--- a/lib/com_err/com_err.c
+++ b/lib/com_err/com_err.c
@@ -70,7 +70,7 @@ init_error_table(const char **msgs, long base, int count)
 
 static void KRB5_CALLCONV
 default_proc (const char *whoami, long code, const char *fmt, va_list args)
-    __attribute__((__format__(__printf__, 3, 0)));
+    __attribute__ ((__format__ (__printf__, 3, 0)));
 
 static void KRB5_CALLCONV
 default_proc (const char *whoami, long code, const char *fmt, va_list args)
diff --git a/lib/com_err/com_err.h b/lib/com_err/com_err.h
index 5b8b7e28f..e71eabf2e 100644
--- a/lib/com_err/com_err.h
+++ b/lib/com_err/com_err.h
@@ -55,11 +55,11 @@ init_error_table (const char**, long, int);
 
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 com_err_va (const char *, long, const char *, va_list)
-    __attribute__((format(printf, 3, 0)));
+    __attribute__ ((__format__ (__printf__, 3, 0)));
 
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 com_err (const char *, long, const char *, ...)
-    __attribute__((format(printf, 3, 4)));
+    __attribute__ ((__format__ (__printf__, 3, 4)));
 
 KRB5_LIB_FUNCTION errf KRB5_LIB_CALL
 set_com_err_hook (errf);
diff --git a/lib/com_err/lex.h b/lib/com_err/lex.h
index e158816bb..dcf6e8710 100644
--- a/lib/com_err/lex.h
+++ b/lib/com_err/lex.h
@@ -34,6 +34,6 @@
 /* $Id$ */
 
 void _lex_error_message (const char *, ...)
-__attribute__ ((format (printf, 1, 2)));
+__attribute__ ((__format__ (__printf__, 1, 2)));
 
 int yylex(void);
diff --git a/lib/hx509/cert.c b/lib/hx509/cert.c
index 39790266f..dd6d38917 100644
--- a/lib/hx509/cert.c
+++ b/lib/hx509/cert.c
@@ -3404,7 +3404,7 @@ hx509_cert_binary(hx509_context context, hx509_cert c, heim_octet_string *os)
 
 void
 _hx509_abort(const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 1, 2)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2)))
 {
     va_list ap;
     va_start(ap, fmt);
diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
index 15ab7b647..868dc35cb 100644
--- a/lib/kadm5/ipropd_slave.c
+++ b/lib/kadm5/ipropd_slave.c
@@ -592,7 +592,7 @@ static void
 slave_status(krb5_context context,
 	     const char *file,
 	     const char *status, ...)
-     __attribute__ ((format (printf, 3, 4)));
+     __attribute__ ((__format__ (__printf__, 3, 4)));
 
 
 static void
diff --git a/lib/krb5/changepw.c b/lib/krb5/changepw.c
index bc2d094a3..e028753db 100644
--- a/lib/krb5/changepw.c
+++ b/lib/krb5/changepw.c
@@ -40,7 +40,7 @@
 static void
 str2data (krb5_data *d,
 	  const char *fmt,
-	  ...) __attribute__ ((format (printf, 2, 3)));
+	  ...) __attribute__ ((__format__ (__printf__, 2, 3)));
 
 static void
 str2data (krb5_data *d,
diff --git a/lib/krb5/deprecated.c b/lib/krb5/deprecated.c
index 59bae55d3..e3c142d88 100644
--- a/lib/krb5/deprecated.c
+++ b/lib/krb5/deprecated.c
@@ -470,7 +470,7 @@ krb5_free_error_string(krb5_context context, char *str)
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_set_error_string(krb5_context context, const char *fmt, ...)
-    __attribute__((format (printf, 2, 3)))
+    __attribute__ ((__format__ (__printf__, 2, 3)))
     KRB5_DEPRECATED_FUNCTION("Use X instead")
 {
     va_list ap;
@@ -498,7 +498,7 @@ krb5_set_error_string(krb5_context context, const char *fmt, ...)
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_vset_error_string(krb5_context context, const char *fmt, va_list args)
-    __attribute__ ((format (printf, 2, 0)))
+    __attribute__ ((__format__ (__printf__, 2, 0)))
     KRB5_DEPRECATED_FUNCTION("Use X instead")
 {
     krb5_vset_error_message(context, 0, fmt, args);
diff --git a/lib/krb5/error_string.c b/lib/krb5/error_string.c
index 0e6af96fe..fa181733d 100644
--- a/lib/krb5/error_string.c
+++ b/lib/krb5/error_string.c
@@ -72,7 +72,7 @@ krb5_clear_error_message(krb5_context context)
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_set_error_message(krb5_context context, krb5_error_code ret,
 		       const char *fmt, ...)
-    __attribute__ ((format (printf, 3, 4)))
+    __attribute__ ((__format__ (__printf__, 3, 4)))
 {
     va_list ap;
 
@@ -98,7 +98,7 @@ krb5_set_error_message(krb5_context context, krb5_error_code ret,
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_vset_error_message (krb5_context context, krb5_error_code ret,
 			 const char *fmt, va_list args)
-    __attribute__ ((format (printf, 3, 0)))
+    __attribute__ ((__format__ (__printf__, 3, 0)))
 {
     int r;
 
@@ -136,7 +136,7 @@ krb5_vset_error_message (krb5_context context, krb5_error_code ret,
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_prepend_error_message(krb5_context context, krb5_error_code ret,
 			   const char *fmt, ...)
-    __attribute__ ((format (printf, 3, 4)))
+    __attribute__ ((__format__ (__printf__, 3, 4)))
 {
     va_list ap;
 
@@ -161,7 +161,7 @@ krb5_prepend_error_message(krb5_context context, krb5_error_code ret,
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_vprepend_error_message(krb5_context context, krb5_error_code ret,
 			    const char *fmt, va_list args)
-    __attribute__ ((format (printf, 3, 0)))
+    __attribute__ ((__format__ (__printf__, 3, 0)))
 {
     char *str = NULL, *str2 = NULL;
 
diff --git a/lib/krb5/log.c b/lib/krb5/log.c
index d14802695..2d66ae4c9 100644
--- a/lib/krb5/log.c
+++ b/lib/krb5/log.c
@@ -411,7 +411,7 @@ krb5_vlog_msg(krb5_context context,
 	      int level,
 	      const char *fmt,
 	      va_list ap)
-     __attribute__((format (printf, 5, 0)))
+     __attribute__ ((__format__ (__printf__, 5, 0)))
 {
 
     char *msg = NULL;
@@ -449,7 +449,7 @@ krb5_vlog(krb5_context context,
 	  int level,
 	  const char *fmt,
 	  va_list ap)
-     __attribute__((format (printf, 4, 0)))
+     __attribute__ ((__format__ (__printf__, 4, 0)))
 {
     return krb5_vlog_msg(context, fac, NULL, level, fmt, ap);
 }
@@ -461,7 +461,7 @@ krb5_log_msg(krb5_context context,
 	     char **reply,
 	     const char *fmt,
 	     ...)
-     __attribute__((format (printf, 5, 6)))
+     __attribute__ ((__format__ (__printf__, 5, 6)))
 {
     va_list ap;
     krb5_error_code ret;
@@ -479,7 +479,7 @@ krb5_log(krb5_context context,
 	 int level,
 	 const char *fmt,
 	 ...)
-     __attribute__((format (printf, 4, 5)))
+     __attribute__ ((__format__ (__printf__, 4, 5)))
 {
     va_list ap;
     krb5_error_code ret;
@@ -495,7 +495,7 @@ _krb5_debug(krb5_context context,
 	    int level,
 	    const char *fmt,
 	    ...)
-    __attribute__((format (printf, 3, 4)))
+    __attribute__ ((__format__ (__printf__, 3, 4)))
 {
     va_list ap;
 
diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 9653734d2..0adb65e7a 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -64,7 +64,7 @@ pk_copy_error(krb5_context context,
 	      int hxret,
 	      const char *fmt,
 	      ...)
-    __attribute__ ((format (printf, 4, 5)));
+    __attribute__ ((__format__ (__printf__, 4, 5)));
 
 /*
  *
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index f4ffd4034..614e88d87 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -308,7 +308,7 @@ struct host {
 
 static void
 debug_host(krb5_context context, int level, struct host *host, const char *fmt, ...)
-	__attribute__((__format__(__printf__, 4, 5)));
+	__attribute__ ((__format__ (__printf__, 4, 5)));
 
 static void
 debug_host(krb5_context context, int level, struct host *host, const char *fmt, ...)
diff --git a/lib/krb5/warn.c b/lib/krb5/warn.c
index a0705b70c..8269aff74 100644
--- a/lib/krb5/warn.c
+++ b/lib/krb5/warn.c
@@ -36,7 +36,7 @@
 
 static krb5_error_code _warnerr(krb5_context context, int do_errtext,
 	 krb5_error_code code, int level, const char *fmt, va_list ap)
-	__attribute__((__format__(__printf__, 5, 0)));
+	__attribute__ ((__format__ (__printf__, 5, 0)));
 
 static krb5_error_code
 _warnerr(krb5_context context, int do_errtext,
@@ -110,7 +110,7 @@ _warnerr(krb5_context context, int do_errtext,
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_vwarn(krb5_context context, krb5_error_code code,
 	   const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 3, 0)))
+     __attribute__ ((__format__ (__printf__, 3, 0)))
 {
     return _warnerr(context, 1, code, 1, fmt, ap);
 }
@@ -128,7 +128,7 @@ krb5_vwarn(krb5_context context, krb5_error_code code,
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_warn(krb5_context context, krb5_error_code code, const char *fmt, ...)
-     __attribute__ ((format (printf, 3, 4)))
+     __attribute__ ((__format__ (__printf__, 3, 4)))
 {
     FUNC(1, code, 1);
     return ret;
@@ -146,7 +146,7 @@ krb5_warn(krb5_context context, krb5_error_code code, const char *fmt, ...)
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_vwarnx(krb5_context context, const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 2, 0)))
+     __attribute__ ((__format__ (__printf__, 2, 0)))
 {
     return _warnerr(context, 0, 0, 1, fmt, ap);
 }
@@ -162,7 +162,7 @@ krb5_vwarnx(krb5_context context, const char *fmt, va_list ap)
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_warnx(krb5_context context, const char *fmt, ...)
-     __attribute__ ((format (printf, 2, 3)))
+     __attribute__ ((__format__ (__printf__, 2, 3)))
 {
     FUNC(0, 0, 1);
     return ret;
@@ -184,7 +184,7 @@ krb5_warnx(krb5_context context, const char *fmt, ...)
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_verr(krb5_context context, int eval, krb5_error_code code,
 	  const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 4, 0)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 4, 0)))
 {
     _warnerr(context, 1, code, 0, fmt, ap);
     exit(eval);
@@ -206,7 +206,7 @@ krb5_verr(krb5_context context, int eval, krb5_error_code code,
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_err(krb5_context context, int eval, krb5_error_code code,
 	 const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 4, 5)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 4, 5)))
 {
     FUNC_NORET(1, code, 0);
     exit(eval);
@@ -226,7 +226,7 @@ krb5_err(krb5_context context, int eval, krb5_error_code code,
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_verrx(krb5_context context, int eval, const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 3, 0)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 3, 0)))
 {
     _warnerr(context, 0, 0, 0, fmt, ap);
     exit(eval);
@@ -245,7 +245,7 @@ krb5_verrx(krb5_context context, int eval, const char *fmt, va_list ap)
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_errx(krb5_context context, int eval, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 3, 4)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 3, 4)))
 {
     FUNC_NORET(0, 0, 0);
     exit(eval);
@@ -267,7 +267,7 @@ krb5_errx(krb5_context context, int eval, const char *fmt, ...)
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_vabort(krb5_context context, krb5_error_code code,
 	    const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 3, 0)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 3, 0)))
 {
     _warnerr(context, 1, code, 0, fmt, ap);
     abort();
@@ -288,7 +288,7 @@ krb5_vabort(krb5_context context, krb5_error_code code,
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_abort(krb5_context context, krb5_error_code code, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 3, 4)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 3, 4)))
 {
     FUNC_NORET(1, code, 0);
     abort();
@@ -297,7 +297,7 @@ krb5_abort(krb5_context context, krb5_error_code code, const char *fmt, ...)
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_vabortx(krb5_context context, const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 2, 0)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)))
 {
     _warnerr(context, 0, 0, 0, fmt, ap);
     abort();
@@ -316,7 +316,7 @@ krb5_vabortx(krb5_context context, const char *fmt, va_list ap)
 
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_abortx(krb5_context context, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 2, 3)))
+     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)))
 {
     FUNC_NORET(0, 0, 0);
     abort();
diff --git a/lib/roken/err.hin b/lib/roken/err.hin
index 96fe5cf85..c5343c49a 100644
--- a/lib/roken/err.hin
+++ b/lib/roken/err.hin
@@ -58,33 +58,33 @@
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 verr(int eval, const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 2, 0)));
+     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)));
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 err(int eval, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 2, 3)));
+     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 verrx(int eval, const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 2, 0)));
+     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)));
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 errx(int eval, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 2, 3)));
+     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 vwarn(const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 1, 0)));
+     __attribute__ ((__format__ (__printf__, 1, 0)));
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 warn(const char *fmt, ...)
-     __attribute__ ((format (printf, 1, 2)));
+     __attribute__ ((__format__ (__printf__, 1, 2)));
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 vwarnx(const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 1, 0)));
+     __attribute__ ((__format__ (__printf__, 1, 0)));
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 warnx(const char *fmt, ...)
-     __attribute__ ((format (printf, 1, 2)));
+     __attribute__ ((__format__ (__printf__, 1, 2)));
 
 #endif /* __ERR_H__ */
diff --git a/lib/roken/roken-common.h b/lib/roken/roken-common.h
index 6f50c9a31..4766538a0 100644
--- a/lib/roken/roken-common.h
+++ b/lib/roken/roken-common.h
@@ -468,7 +468,7 @@ free_environment(char **);
 #define warnerr rk_warnerr
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 rk_warnerr(int doerrno, const char *fmt, va_list ap)
-    __attribute__ ((format (printf, 2, 0)));
+    __attribute__ ((__format__ (__printf__, 2, 0)));
 
 ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
 rk_realloc(void *, size_t);
@@ -480,7 +480,7 @@ rk_strpoolcollect(struct rk_strpool *);
 
 ROKEN_LIB_FUNCTION struct rk_strpool * ROKEN_LIB_CALL
 rk_strpoolprintf(struct rk_strpool *, const char *, ...)
-    __attribute__ ((format (printf, 2, 3)));
+    __attribute__ ((__format__ (__printf__, 2, 3)));
 
 ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
 rk_strpoolfree(struct rk_strpool *);
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 74b1a8a61..1a9db6356 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -471,7 +471,7 @@ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL endusershell(void);
 #endif
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
      rk_snprintf (char *, size_t, const char *, ...)
-     __attribute__ ((format (printf, 3, 4)));
+     __attribute__ ((__format__ (__printf__, 3, 4)));
 #endif
 
 #if !defined(HAVE_VSNPRINTF) || defined(NEED_VSNPRINTF_PROTO)
@@ -480,7 +480,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 #endif
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
      rk_vsnprintf (char *, size_t, const char *, va_list)
-     __attribute__((format (printf, 3, 0)));
+     __attribute__ ((__format__ (__printf__, 3, 0)));
 #endif
 
 #if !defined(HAVE_ASPRINTF) || defined(NEED_ASPRINTF_PROTO)
@@ -489,7 +489,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 #endif
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
      rk_asprintf (char **, const char *, ...)
-     __attribute__ ((format (printf, 2, 3)));
+     __attribute__ ((__format__ (__printf__, 2, 3)));
 #endif
 
 #if !defined(HAVE_VASPRINTF) || defined(NEED_VASPRINTF_PROTO)
@@ -498,7 +498,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 #endif
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
     rk_vasprintf (char **, const char *, va_list)
-     __attribute__((format (printf, 2, 0)));
+     __attribute__ ((__format__ (__printf__, 2, 0)));
 #endif
 
 #if !defined(HAVE_ASNPRINTF) || defined(NEED_ASNPRINTF_PROTO)
@@ -507,7 +507,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 #endif
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
     rk_asnprintf (char **, size_t, const char *, ...)
-     __attribute__ ((format (printf, 3, 4)));
+     __attribute__ ((__format__ (__printf__, 3, 4)));
 #endif
 
 #if !defined(HAVE_VASNPRINTF) || defined(NEED_VASNPRINTF_PROTO)
@@ -516,7 +516,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 #endif
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
     vasnprintf (char **, size_t, const char *, va_list)
-     __attribute__((format (printf, 3, 0)));
+     __attribute__ ((__format__ (__printf__, 3, 0)));
 #endif
 
 #ifndef HAVE_STRDUP
diff --git a/lib/roken/rtbl.h b/lib/roken/rtbl.h
index c5c9f4f9f..274f75c12 100644
--- a/lib/roken/rtbl.h
+++ b/lib/roken/rtbl.h
@@ -72,14 +72,14 @@ rtbl_add_column_by_id (rtbl_t, unsigned int, const char*, unsigned int);
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 rtbl_add_column_entryv_by_id (rtbl_t table, unsigned int id,
 			      const char *fmt, ...)
-	__attribute__ ((format (printf, 3, 0)));
+	__attribute__ ((__format__ (__printf__, 3, 0)));
 
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 rtbl_add_column_entry (rtbl_t, const char*, const char*);
 
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 rtbl_add_column_entryv (rtbl_t, const char*, const char*, ...)
-	__attribute__ ((format (printf, 3, 0)));
+	__attribute__ ((__format__ (__printf__, 3, 0)));
 
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 rtbl_add_column_entry_by_id (rtbl_t, unsigned int, const char*);