diff --git a/sys/sparc64/include/limits.h b/sys/sparc64/include/limits.h
index 6d3833765b63..679dcec51b31 100644
--- a/sys/sparc64/include/limits.h
+++ b/sys/sparc64/include/limits.h
@@ -30,7 +30,9 @@
 #ifndef _MACHINE_LIMITS_H_
 #define	_MACHINE_LIMITS_H_
 
-#if __GNUC__
+#include <sys/cdefs.h>
+
+#if __CC_SUPPORTS_WARNING
 #warning "machine/limits.h is deprecated.  Include sys/limits.h instead."
 #endif
 
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index ab4a7e3da6f1..224ee2c719fa 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -36,15 +36,6 @@
 #ifndef _SYS_KTR_H_
 #define _SYS_KTR_H_
 
-/*
- * Hack around due to egcs-1.1.2 not knowing what __func__ is.
- */
-#ifdef __GNUC__
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 91      /* egcs 1.1.2 */
-#define        __func__        __FUNCTION__
-#endif
-#endif
-
 /*
  * Trace classes
  */