diff --git a/kdc/digest.c b/kdc/digest.c
index 566880584..295189c66 100644
--- a/kdc/digest.c
+++ b/kdc/digest.c
@@ -608,7 +608,7 @@ _kdc_do_digest(krb5_context context,
 	    }
 	    t = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
 
-	    if (abs((kdc_time & 0xffffffff) - t) > context->max_skew) {
+	    if (labs((kdc_time & 0xffffffff) - t) > context->max_skew) {
 		ret = EINVAL;
 		krb5_set_error_message(context, ret, "time screw in server nonce ");
 		goto out;
diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index 6096fd78c..53680d487 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -516,7 +516,7 @@ pa_enc_chal_validate(kdc_request_t r, const PA_DATA *pa)
 	    continue;
 	}
 
-	if (abs(kdc_time - p.patimestamp) > r->context->max_skew) {
+	if (labs(kdc_time - p.patimestamp) > r->context->max_skew) {
 	    char client_time[100];
 
 	    krb5_crypto_destroy(r->context, challangecrypto);
@@ -528,7 +528,7 @@ pa_enc_chal_validate(kdc_request_t r, const PA_DATA *pa)
 	    _kdc_r_log(r, 0, "Too large time skew, "
 		       "client time %s is out by %u > %u seconds -- %s",
 		       client_time,
-		       (unsigned)abs(kdc_time - p.patimestamp),
+		       (unsigned)labs(kdc_time - p.patimestamp),
 		       r->context->max_skew,
 		       r->client_name);
 
@@ -680,7 +680,7 @@ pa_enc_ts_validate(kdc_request_t r, const PA_DATA *pa)
 		   r->client_name);
 	goto out;
     }
-    if (abs(kdc_time - p.patimestamp) > r->context->max_skew) {
+    if (labs(kdc_time - p.patimestamp) > r->context->max_skew) {
 	char client_time[100];
 		
 	krb5_format_time(r->context, p.patimestamp,
@@ -690,7 +690,7 @@ pa_enc_ts_validate(kdc_request_t r, const PA_DATA *pa)
 	_kdc_r_log(r, 0, "Too large time skew, "
 		   "client time %s is out by %u > %u seconds -- %s",
 		   client_time,
-		   (unsigned)abs(kdc_time - p.patimestamp),
+		   (unsigned)labs(kdc_time - p.patimestamp),
 		   r->context->max_skew,
 		   r->client_name);
 
diff --git a/kdc/pkinit.c b/kdc/pkinit.c
index 66c27504a..4e35fa681 100644
--- a/kdc/pkinit.c
+++ b/kdc/pkinit.c
@@ -101,7 +101,7 @@ pk_check_pkauthenticator_win2k(krb5_context context,
     krb5_timeofday (context, &now);
 
     /* XXX cusec */
-    if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) {
+    if (a->ctime == 0 || labs(a->ctime - now) > context->max_skew) {
 	krb5_clear_error_message(context);
 	return KRB5KRB_AP_ERR_SKEW;
     }
@@ -123,7 +123,7 @@ pk_check_pkauthenticator(krb5_context context,
     krb5_timeofday (context, &now);
 
     /* XXX cusec */
-    if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) {
+    if (a->ctime == 0 || labs(a->ctime - now) > context->max_skew) {
 	krb5_clear_error_message(context);
 	return KRB5KRB_AP_ERR_SKEW;
     }
diff --git a/kuser/kinit.c b/kuser/kinit.c
index 7cd867314..c96bf1a97 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -709,7 +709,7 @@ get_new_tickets(krb5_context context,
     }
 
     if (ticket_life != 0) {
-	if (abs(cred.times.endtime - cred.times.starttime - ticket_life) > 30) {
+	if (labs(cred.times.endtime - cred.times.starttime - ticket_life) > 30) {
 	    char life[64];
 	    unparse_time_approx(cred.times.endtime - cred.times.starttime,
 				life, sizeof(life));
@@ -717,7 +717,7 @@ get_new_tickets(krb5_context context,
 	}
     }
     if (renew_life) {
-	if (abs(cred.times.renew_till - cred.times.starttime - renew) > 30) {
+	if (labs(cred.times.renew_till - cred.times.starttime - renew) > 30) {
 	    char life[64];
 	    unparse_time_approx(cred.times.renew_till - cred.times.starttime,
 				life, sizeof(life));
diff --git a/lib/hcrypto/libtommath/bn_mp_rand.c b/lib/hcrypto/libtommath/bn_mp_rand.c
index af66a67ee..14f5b7503 100644
--- a/lib/hcrypto/libtommath/bn_mp_rand.c
+++ b/lib/hcrypto/libtommath/bn_mp_rand.c
@@ -29,7 +29,7 @@ mp_rand (mp_int * a, int digits)
 
   /* first place a random non-zero digit */
   do {
-    d = ((mp_digit) abs (rand ())) & MP_MASK;
+    d = ((mp_digit) labs (rand ())) & MP_MASK;
   } while (d == 0);
 
   if ((res = mp_add_d (a, d, a)) != MP_OKAY) {
@@ -41,7 +41,7 @@ mp_rand (mp_int * a, int digits)
       return res;
     }
 
-    if ((res = mp_add_d (a, ((mp_digit) abs (rand ())), a)) != MP_OKAY) {
+    if ((res = mp_add_d (a, ((mp_digit) labs (rand ())), a)) != MP_OKAY) {
       return res;
     }
   }
diff --git a/lib/hcrypto/libtommath/demo/demo.c b/lib/hcrypto/libtommath/demo/demo.c
index 2442611f9..e1b2eb238 100644
--- a/lib/hcrypto/libtommath/demo/demo.c
+++ b/lib/hcrypto/libtommath/demo/demo.c
@@ -83,7 +83,7 @@ int main(void)
 
          // now test a random reduction
          for (ix = 0; ix < 100; ix++) {
-             mp_rand(&c, 1 + abs(rand()) % (2*i));
+             mp_rand(&c, 1 + labs(rand()) % (2*i));
              mp_copy(&c, &d);
              mp_copy(&c, &e);
 
@@ -286,7 +286,7 @@ printf("compare no compare!\n"); exit(EXIT_FAILURE); }
 
       if (!(++cnt & 127))
 	 printf("%9d\r", cnt);
-      mp_rand(&a, abs(rand()) % 128 + 1);
+      mp_rand(&a, labs(rand()) % 128 + 1);
       mp_div(&a, &d, &b, &e);
       mp_div_3(&a, &c, &r2);
 
@@ -394,7 +394,7 @@ printf("compare no compare!\n"); exit(EXIT_FAILURE); }
 
    for (;;) {
       /* randomly clear and re-init one variable, this has the affect of triming the alloc space */
-      switch (abs(rand()) % 7) {
+      switch (labs(rand()) % 7) {
       case 0:
 	 mp_clear(&a);
 	 mp_init(&a);
diff --git a/lib/hcrypto/libtommath/etc/pprime.c b/lib/hcrypto/libtommath/etc/pprime.c
index 317e2a0fc..bc9f87403 100644
--- a/lib/hcrypto/libtommath/etc/pprime.c
+++ b/lib/hcrypto/libtommath/etc/pprime.c
@@ -163,7 +163,7 @@ mp_digit prime_digit(void)
    int n;
    mp_digit d;
 
-   n = abs(rand()) % n_prime;
+   n = labs(rand()) % n_prime;
    fseek(primes, n * sizeof(mp_digit), SEEK_SET);
    fread(&d, 1, sizeof(mp_digit), primes);
    return d;
diff --git a/lib/hcrypto/libtommath/mtest/mpi.c b/lib/hcrypto/libtommath/mtest/mpi.c
index 4030841e5..d8d05b00b 100644
--- a/lib/hcrypto/libtommath/mtest/mpi.c
+++ b/lib/hcrypto/libtommath/mtest/mpi.c
@@ -492,7 +492,7 @@ void   mp_set(mp_int *mp, mp_digit d)
 mp_err mp_set_int(mp_int *mp, long z)
 {
   int            ix;
-  unsigned long  v = abs(z);
+  unsigned long  v = labs(z);
   mp_err         res;
 
   ARGCHK(mp != NULL, MP_BADARG);
diff --git a/lib/hcrypto/libtommath/mtest/mtest.c b/lib/hcrypto/libtommath/mtest/mtest.c
index bdfe6127a..6053f7b52 100644
--- a/lib/hcrypto/libtommath/mtest/mtest.c
+++ b/lib/hcrypto/libtommath/mtest/mtest.c
@@ -281,7 +281,7 @@ int main(void)
       printf("%s\n", buf);
    } else if (n == 13) {
       rand_num2(&a);
-      tmp = abs(rand()) & THE_MASK;
+      tmp = labs(rand()) & THE_MASK;
       mp_add_d(&a, tmp, &b);
       printf("add_d\n");
       mp_to64(&a, buf);
@@ -290,7 +290,7 @@ int main(void)
       printf("%s\n", buf);
    } else if (n == 14) {
       rand_num2(&a);
-      tmp = abs(rand()) & THE_MASK;
+      tmp = labs(rand()) & THE_MASK;
       mp_sub_d(&a, tmp, &b);
       printf("sub_d\n");
       mp_to64(&a, buf);
diff --git a/lib/hcrypto/libtommath/tommath.src b/lib/hcrypto/libtommath/tommath.src
index 40658222c..2e058056e 100644
--- a/lib/hcrypto/libtommath/tommath.src
+++ b/lib/hcrypto/libtommath/tommath.src
@@ -19,7 +19,7 @@
 \def\gcd{{\rm gcd}}
 \def\log{{\rm log}}
 \def\ord{{\rm ord}}
-\def\abs{{\mathit abs}}
+\def\labs{{\mathit labs}}
 \def\rep{{\mathit rep}}
 \def\mod{{\mathit\ mod\ }}
 \renewcommand{\pmod}[1]{\ ({\rm mod\ }{#1})}
diff --git a/lib/hcrypto/libtommath/tommath.tex b/lib/hcrypto/libtommath/tommath.tex
index c79a5370f..020c2e50c 100644
--- a/lib/hcrypto/libtommath/tommath.tex
+++ b/lib/hcrypto/libtommath/tommath.tex
@@ -19,7 +19,7 @@
 \def\gcd{{\rm gcd}}
 \def\log{{\rm log}}
 \def\ord{{\rm ord}}
-\def\abs{{\mathit abs}}
+\def\labs{{\mathit labs}}
 \def\rep{{\mathit rep}}
 \def\mod{{\mathit\ mod\ }}
 \renewcommand{\pmod}[1]{\ ({\rm mod\ }{#1})}
diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
index 753add41a..a46226f4a 100644
--- a/lib/krb5/init_creds_pw.c
+++ b/lib/krb5/init_creds_pw.c
@@ -346,7 +346,7 @@ krb5_process_last_request(krb5_context context,
 
     for (i = 0; i < lr->len; ++i) {
 	if (lr->val[i].lr_value <= t) {
-	    switch (abs(lr->val[i].lr_type)) {
+	    switch (lr->val[i].lr_type) {
 	    case LR_PW_EXPTIME :
 		report_expiration(context, ctx->prompter,
 				  ctx->prompter_data,
@@ -361,6 +361,8 @@ krb5_process_last_request(krb5_context context,
 				  lr->val[i].lr_value);
 		reported = TRUE;
 		break;
+            default:
+                break;
 	    }
 	}
     }
diff --git a/lib/krb5/rd_cred.c b/lib/krb5/rd_cred.c
index e6fe059f4..b9b18ee99 100644
--- a/lib/krb5/rd_cred.c
+++ b/lib/krb5/rd_cred.c
@@ -222,7 +222,7 @@ krb5_rd_cred(krb5_context context,
 
 	if (enc_krb_cred_part.timestamp == NULL ||
 	    enc_krb_cred_part.usec      == NULL ||
-	    abs(*enc_krb_cred_part.timestamp - sec)
+	    labs(*enc_krb_cred_part.timestamp - sec)
 	    > context->max_skew) {
 	    krb5_clear_error_message (context);
 	    ret = KRB5KRB_AP_ERR_SKEW;
diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
index 8a46195b6..3e49dd8b4 100644
--- a/lib/krb5/rd_priv.c
+++ b/lib/krb5/rd_priv.c
@@ -136,7 +136,7 @@ krb5_rd_priv(krb5_context context,
 	krb5_timeofday (context, &sec);
 	if (part.timestamp == NULL ||
 	    part.usec      == NULL ||
-	    abs(*part.timestamp - sec) > context->max_skew) {
+	    labs(*part.timestamp - sec) > context->max_skew) {
 	    krb5_clear_error_message (context);
 	    ret = KRB5KRB_AP_ERR_SKEW;
 	    goto failure_part;
diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index 326b4816a..b16c88265 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -409,7 +409,7 @@ krb5_verify_ap_req2(krb5_context context,
 
 	krb5_timeofday (context, &now);
 
-	if (abs(ac->authenticator->ctime - now) > context->max_skew) {
+	if (labs(ac->authenticator->ctime - now) > context->max_skew) {
 	    ret = KRB5KRB_AP_ERR_SKEW;
 	    krb5_clear_error_message (context);
 	    goto out;
diff --git a/lib/krb5/rd_safe.c b/lib/krb5/rd_safe.c
index 71c29c276..cfe1e9829 100644
--- a/lib/krb5/rd_safe.c
+++ b/lib/krb5/rd_safe.c
@@ -159,7 +159,7 @@ krb5_rd_safe(krb5_context context,
 
 	if (safe.safe_body.timestamp == NULL ||
 	    safe.safe_body.usec      == NULL ||
-	    abs(*safe.safe_body.timestamp - sec) > context->max_skew) {
+	    labs(*safe.safe_body.timestamp - sec) > context->max_skew) {
 	    ret = KRB5KRB_AP_ERR_SKEW;
 	    krb5_clear_error_message (context);
 	    goto failure;
diff --git a/lib/krb5/test_time.c b/lib/krb5/test_time.c
index 5f6625c90..36c78088b 100644
--- a/lib/krb5/test_time.c
+++ b/lib/krb5/test_time.c
@@ -54,11 +54,11 @@ check_set_time(krb5_context context)
     if (ret)
 	krb5_err(context, 1, ret, "krb5_us_timeofday");
 
-    diff2 = abs(sec - tv.tv_sec);
+    diff2 = labs(sec - tv.tv_sec);
 
     if (diff2 < 9 || diff > 11)
-	krb5_errx(context, 1, "set time error: diff: %d",
-		  abs(sec - tv.tv_sec));
+	krb5_errx(context, 1, "set time error: diff: %ld",
+		  labs(sec - tv.tv_sec));
 }
 
 
diff --git a/lib/krb5/ticket.c b/lib/krb5/ticket.c
index 04b8c464b..d95d96d1b 100644
--- a/lib/krb5/ticket.c
+++ b/lib/krb5/ticket.c
@@ -768,12 +768,12 @@ _krb5_extract_ticket(krb5_context context,
 	tmp_time = rep->enc_part.authtime;
 
     if (creds->times.starttime == 0
-	&& abs(tmp_time - sec_now) > context->max_skew) {
+	&& labs(tmp_time - sec_now) > context->max_skew) {
 	ret = KRB5KRB_AP_ERR_SKEW;
 	krb5_set_error_message (context, ret,
-				N_("time skew (%d) larger than max (%d)", ""),
-			       abs(tmp_time - sec_now),
-			       (int)context->max_skew);
+				N_("time skew (%ld) larger than max (%ld)", ""),
+			       labs(tmp_time - sec_now),
+			       (long)context->max_skew);
 	goto out;
     }
 
diff --git a/lib/libedit/src/readline.c b/lib/libedit/src/readline.c
index aeb6c46f4..e3a27ad2d 100644
--- a/lib/libedit/src/readline.c
+++ b/lib/libedit/src/readline.c
@@ -1619,7 +1619,7 @@ history_search_prefix(const char *str, int direction)
 
 /*
  * search for event in history containing str, starting at offset
- * abs(pos); continue backward, if pos<0, forward otherwise
+ * labs(pos); continue backward, if pos<0, forward otherwise
  */
 /* ARGSUSED */
 int
diff --git a/lib/ntlm/ntlm.c b/lib/ntlm/ntlm.c
index ea150da93..5d39bf2d4 100644
--- a/lib/ntlm/ntlm.c
+++ b/lib/ntlm/ntlm.c
@@ -1777,7 +1777,7 @@ verify_ntlm2(const void *key, size_t len,
 
     authtime = heim_ntlm_ts2unixtime(t);
 
-    if (abs((int)(authtime - now)) > authtimediff) {
+    if (labs((int)(authtime - now)) > authtimediff) {
 	ret = HNTLM_ERR_TIME_SKEW;
 	goto out;
     }
diff --git a/lib/roken/getcap.c b/lib/roken/getcap.c
index bfebe8a65..19802691e 100644
--- a/lib/roken/getcap.c
+++ b/lib/roken/getcap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcap.c,v 1.29 1999/03/29 09:27:29 abs Exp $	*/
+/*	$NetBSD: getcap.c,v 1.29 1999/03/29 09:27:29 labs Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993