diff --git a/src/cpu/x87_ops_misc.h b/src/cpu/x87_ops_misc.h
index cbad12e56..5821a5cd5 100644
--- a/src/cpu/x87_ops_misc.h
+++ b/src/cpu/x87_ops_misc.h
@@ -554,6 +554,7 @@ opFTST(UNUSED(uint32_t fetchdat))
     return 0;
 }
 
+#ifndef FPU_8087
 static int
 opFTSTP(UNUSED(uint32_t fetchdat))
 {
@@ -569,6 +570,7 @@ opFTSTP(UNUSED(uint32_t fetchdat))
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.ftst) : (x87_concurrency.ftst * cpu_multi));
     return 0;
 }
+#endif
 
 static int
 opFXAM(UNUSED(uint32_t fetchdat))
@@ -854,6 +856,8 @@ opFRNDINT(UNUSED(uint32_t fetchdat))
     return 0;
 }
 
+#ifndef FPU_8087
+#ifndef OPS_286_386
 static int
 opFRINT2(UNUSED(uint32_t fetchdat))
 {
@@ -882,7 +886,6 @@ opFRINT2(UNUSED(uint32_t fetchdat))
 static int
 opFRINEAR(UNUSED(uint32_t fetchdat))
 {
-    double dst0, st0, integral, frac;
     int prevRound;
 
     FP_ENTER();
@@ -896,11 +899,11 @@ opFRINEAR(UNUSED(uint32_t fetchdat))
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
     return 0;
 }
+#endif
 
 static int
 opFRICHOP(UNUSED(uint32_t fetchdat))
 {
-    double dst0, st0, integral, frac;
     int prevRound;
 
     FP_ENTER();
@@ -914,6 +917,7 @@ opFRICHOP(UNUSED(uint32_t fetchdat))
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
     return 0;
 }
+#endif
 
 static int
 opFSCALE(UNUSED(uint32_t fetchdat))
diff --git a/src/cpu/x87_ops_sf_arith.h b/src/cpu/x87_ops_sf_arith.h
index 620c44691..7abde322b 100644
--- a/src/cpu/x87_ops_sf_arith.h
+++ b/src/cpu/x87_ops_sf_arith.h
@@ -801,6 +801,8 @@ next_ins:
     return 0;
 }
 
+#ifndef FPU_8087
+#ifndef OPS_286_386
 static int
 sf_FRINT2(uint32_t fetchdat)
 {
@@ -854,6 +856,7 @@ next_ins:
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
     return 0;
 }
+#endif
 
 static int
 sf_FRICHOP(uint32_t fetchdat)
@@ -881,3 +884,4 @@ next_ins:
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.frndint) : (x87_concurrency.frndint * cpu_multi));
     return 0;
 }
+#endif
diff --git a/src/cpu/x87_ops_sf_compare.h b/src/cpu/x87_ops_sf_compare.h
index d1d9bc1dd..d90526b82 100644
--- a/src/cpu/x87_ops_sf_compare.h
+++ b/src/cpu/x87_ops_sf_compare.h
@@ -459,6 +459,7 @@ sf_FTST(uint32_t fetchdat)
     return 0;
 }
 
+#ifndef FPU_8087
 static int
 sf_FTSTP(uint32_t fetchdat)
 {
@@ -484,6 +485,7 @@ sf_FTSTP(uint32_t fetchdat)
     CONCURRENCY_CYCLES((fpu_type >= FPU_487SX) ? (x87_concurrency.ftst) : (x87_concurrency.ftst * cpu_multi));
     return 0;
 }
+#endif
 
 static int
 sf_FXAM(UNUSED(uint32_t fetchdat))