diff --git a/i387/fenv.c b/i387/fenv.c
index 4c13c19..530f488 100644
--- a/i387/fenv.c
+++ b/i387/fenv.c
@@ -28,7 +28,7 @@
 
 #include <include/cdefs-compat.h>
 #include <include/types-compat.h>
-#ifdef __WIN32__
+#if defined(__WIN32__) || defined(__linux__)
 #include <i387/bsd_npx.h>
 #else
 #include <machine/npx.h>
diff --git a/ia64/s_fma.S b/ia64/s_fma.S
index 3b5d88e..f1ffa3f 100644
--- a/ia64/s_fma.S
+++ b/ia64/s_fma.S
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/asm.h>
+#include <bsd_asm.h>
 //__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fma.S,v 1.2 2009/05/25 14:37:10 attilio Exp $")
 
 ENTRY(fma, 3)
diff --git a/ia64/s_fmaf.S b/ia64/s_fmaf.S
index 88150ad..d632149 100644
--- a/ia64/s_fmaf.S
+++ b/ia64/s_fmaf.S
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/asm.h>
+#include <bsd_asm.h>
 //__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fmaf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $")
 
 ENTRY(fmaf, 3)
diff --git a/ia64/s_fmal.S b/ia64/s_fmal.S
index 847341d..d272cb2 100644
--- a/ia64/s_fmal.S
+++ b/ia64/s_fmal.S
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/asm.h>
+#include <bsd_asm.h>
 //__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fmal.S,v 1.2 2009/05/25 14:37:10 attilio Exp $")
 
 ENTRY(fmal, 3)
diff --git a/sparc64/e_sqrt.S b/sparc64/e_sqrt.S
index a8e7c84..ce9b6de 100644
--- a/sparc64/e_sqrt.S
+++ b/sparc64/e_sqrt.S
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/asm.h>
+#include <bsd_asm.h>
 //__FBSDID("$FreeBSD: src/lib/msun/sparc64/e_sqrt.S,v 1.1 2005/02/21 18:27:57 das Exp $")
 
 ENTRY(sqrt)
diff --git a/sparc64/e_sqrtf.S b/sparc64/e_sqrtf.S
index c834d24..db53643 100644
--- a/sparc64/e_sqrtf.S
+++ b/sparc64/e_sqrtf.S
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/asm.h>
+#include <bsd_asm.h>
 //__FBSDID("$FreeBSD: src/lib/msun/sparc64/e_sqrtf.S,v 1.1 2005/02/21 18:27:57 das Exp $")
 
 ENTRY(sqrtf)