diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index 885af9476faa..4e04fd800755 100644
--- a/lib/msun/src/k_cosf.c
+++ b/lib/msun/src/k_cosf.c
@@ -14,9 +14,11 @@
  * ====================================================
  */
 
+#ifndef INLINE_KERNEL_COSF
 #ifndef lint
 static char rcsid[] = "$FreeBSD$";
 #endif
+#endif
 
 #include "math.h"
 #include "math_private.h"
@@ -28,6 +30,9 @@ C1  =  0xaaaaa5.0p-28,		/*  0.041666645557 */
 C2  = -0xb60615.0p-33,		/* -0.0013887310633 */
 C3  =  0xccf47d.0p-39;		/*  0.000024432542887 */
 
+#ifdef INLINE_KERNEL_COSF
+extern inline
+#endif
 float
 __kernel_cosf(float x, float y)
 {
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index d393db7092af..ad8d9de4ed7a 100644
--- a/lib/msun/src/k_sinf.c
+++ b/lib/msun/src/k_sinf.c
@@ -14,9 +14,11 @@
  * ====================================================
  */
 
+#ifndef INLINE_KERNEL_SINF
 #ifndef lint
 static char rcsid[] = "$FreeBSD$";
 #endif
+#endif
 
 #include "math.h"
 #include "math_private.h"
@@ -29,6 +31,9 @@ S2  =  0x8888bb.0p-30,		/*  0.0083333803341 */
 S3  = -0xd02de1.0p-36,		/* -0.00019853517006 */
 S4  =  0xbe6dbe.0p-42;		/*  0.0000028376084629 */
 
+#ifdef INLINE_KERNEL_SINF
+extern inline
+#endif
 float
 __kernel_sinf(float x, float y, int iy)
 {
diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c
index 377db78c368f..cc498d55e3ab 100644
--- a/lib/msun/src/k_tanf.c
+++ b/lib/msun/src/k_tanf.c
@@ -12,9 +12,11 @@
  * ====================================================
  */
 
+#ifndef INLINE_KERNEL_TANF
 #ifndef lint
 static char rcsid[] = "$FreeBSD$";
 #endif
+#endif
 
 #include "math.h"
 #include "math_private.h"
@@ -32,6 +34,9 @@ T[] =  {
   0xeaf97e.0p-31,		/* 0.0071708550677 */
 };
 
+#ifdef INLINE_KERNEL_TANF
+extern inline
+#endif
 float
 __kernel_tanf(float x, float y, int iy)
 {
diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c
index ec7f0cf17a9a..ced11eb79b27 100644
--- a/lib/msun/src/s_cosf.c
+++ b/lib/msun/src/s_cosf.c
@@ -18,7 +18,11 @@ static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
+#define	INLINE_KERNEL_COSF
+#define	INLINE_KERNEL_SINF
 #include "math_private.h"
+#include "k_cosf.c"
+#include "k_sinf.c"
 
 /* Small multiples of pi/2 rounded to double precision. */
 static const double
diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c
index cac6e260f612..1e4270e1688d 100644
--- a/lib/msun/src/s_sinf.c
+++ b/lib/msun/src/s_sinf.c
@@ -18,7 +18,11 @@ static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
+#define	INLINE_KERNEL_COSF
+#define	INLINE_KERNEL_SINF
 #include "math_private.h"
+#include "k_cosf.c"
+#include "k_sinf.c"
 
 /* Small multiples of pi/2 rounded to double precision. */
 static const double
diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c
index 852dc12d3981..470b3360fdf7 100644
--- a/lib/msun/src/s_tanf.c
+++ b/lib/msun/src/s_tanf.c
@@ -18,7 +18,9 @@ static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
+#define	INLINE_KERNEL_TANF
 #include "math_private.h"
+#include "k_tanf.c"
 
 /* Small multiples of pi/2 rounded to double precision. */
 static const double