diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index 07b70b3f7..bbed9eff8 100644
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -35,6 +35,9 @@
 
 RCSID("$Id$");
 
+#undef __attribute__
+#define __attribute__(x)
+
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_init_etype (krb5_context context,
 		 unsigned *len,
@@ -299,7 +302,6 @@ noreferral:
 }
 
 
-
 static krb5_error_code
 decrypt_tkt (krb5_context context,
 	     krb5_keyblock *key,
@@ -546,6 +548,7 @@ out:
     return ret;
 }
 
+#ifndef HEIMDAL_SMALLER
 
 static krb5_error_code
 make_pa_enc_timestamp(krb5_context context, PA_DATA *pa,
@@ -882,6 +885,7 @@ krb5_get_in_cred(krb5_context context,
 		 krb5_const_pointer decryptarg,
 		 krb5_creds *creds,
 		 krb5_kdc_rep *ret_as_reply)
+  __attribute__((deprecated))
 {
     krb5_error_code ret;
     AS_REQ a;
@@ -1046,6 +1050,7 @@ krb5_get_in_tkt(krb5_context context,
 		krb5_creds *creds,
 		krb5_ccache ccache,
 		krb5_kdc_rep *ret_as_reply)
+  __attribute__((deprecated))
 {
     krb5_error_code ret;
 
@@ -1067,3 +1072,5 @@ krb5_get_in_tkt(krb5_context context,
 	ret = krb5_cc_store_cred (context, ccache, creds);
     return ret;
 }
+
+#endif /* HEIMDAL_SMALLER */
diff --git a/lib/krb5/get_in_tkt_pw.c b/lib/krb5/get_in_tkt_pw.c
index 34b59c4c7..1c49138fa 100644
--- a/lib/krb5/get_in_tkt_pw.c
+++ b/lib/krb5/get_in_tkt_pw.c
@@ -35,6 +35,11 @@
 
 RCSID("$Id$");
 
+#ifndef HEIMDAL_SMALLER
+
+#undef __attribute__
+#define __attribute__(x)
+
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_password_key_proc (krb5_context context,
 			krb5_enctype type,
@@ -74,6 +79,7 @@ krb5_get_in_tkt_with_password (krb5_context context,
 			       krb5_ccache ccache,
 			       krb5_creds *creds,
 			       krb5_kdc_rep *ret_as_reply)
+  __attribute__((deprecated))
 {
      return krb5_get_in_tkt (context,
 			     options,
@@ -88,3 +94,5 @@ krb5_get_in_tkt_with_password (krb5_context context,
 			     ccache,
 			     ret_as_reply);
 }
+
+#endif /* HEIMDAL_SMALLER */
diff --git a/lib/krb5/get_in_tkt_with_keytab.c b/lib/krb5/get_in_tkt_with_keytab.c
index 0dedbefd2..b7396657c 100644
--- a/lib/krb5/get_in_tkt_with_keytab.c
+++ b/lib/krb5/get_in_tkt_with_keytab.c
@@ -35,6 +35,11 @@
 
 RCSID("$Id$");
 
+#ifndef HEIMDAL_SMALLER
+
+#undef __attribute__
+#define __attribute__(x)
+
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_keytab_key_proc (krb5_context context,
 		      krb5_enctype enctype,
@@ -78,6 +83,7 @@ krb5_get_in_tkt_with_keytab (krb5_context context,
 			     krb5_ccache ccache,
 			     krb5_creds *creds,
 			     krb5_kdc_rep *ret_as_reply)
+  __attribute__((deprecated))
 {
     krb5_keytab_key_proc_args a;
 
@@ -97,3 +103,5 @@ krb5_get_in_tkt_with_keytab (krb5_context context,
 			    ccache,
 			    ret_as_reply);
 }
+
+#endif
diff --git a/lib/krb5/get_in_tkt_with_skey.c b/lib/krb5/get_in_tkt_with_skey.c
index a58a088a6..da3c6ddf1 100644
--- a/lib/krb5/get_in_tkt_with_skey.c
+++ b/lib/krb5/get_in_tkt_with_skey.c
@@ -35,6 +35,11 @@
 
 RCSID("$Id$");
 
+#ifndef HEIMDAL_SMALLER
+
+#undef __attribute__
+#define __attribute__(x)
+
 static krb5_error_code
 krb5_skey_key_proc (krb5_context context,
 		    krb5_enctype type,
@@ -55,6 +60,7 @@ krb5_get_in_tkt_with_skey (krb5_context context,
 			   krb5_ccache ccache,
 			   krb5_creds *creds,
 			   krb5_kdc_rep *ret_as_reply)
+  __attribute__((deprecated))
 {
     if(key == NULL)
 	return krb5_get_in_tkt_with_keytab (context,
@@ -80,3 +86,5 @@ krb5_get_in_tkt_with_skey (krb5_context context,
 				ccache,
 				ret_as_reply);
 }
+
+#endif /* HEIMDAL_SMALLER */