diff --git a/mps/code/amcss.c b/mps/code/amcss.c
index 3f9afba4e82..f8e9afdf595 100644
--- a/mps/code/amcss.c
+++ b/mps/code/amcss.c
@@ -12,11 +12,9 @@
 #include "mpscamc.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
 #include "mpslib.h"
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/mps/code/amcsshe.c b/mps/code/amcsshe.c
index 15dd342336c..03ba07eb92c 100644
--- a/mps/code/amcsshe.c
+++ b/mps/code/amcsshe.c
@@ -12,10 +12,8 @@
 #include "mpscamc.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/mps/code/amsss.c b/mps/code/amsss.c
index c678f26ff45..6cddbe98fd3 100644
--- a/mps/code/amsss.c
+++ b/mps/code/amsss.c
@@ -15,10 +15,8 @@
 #include "mpscams.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
diff --git a/mps/code/amssshe.c b/mps/code/amssshe.c
index 37408340a00..cd5d1d370f7 100644
--- a/mps/code/amssshe.c
+++ b/mps/code/amssshe.c
@@ -13,10 +13,8 @@
 #include "mpscams.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
diff --git a/mps/code/awlut.c b/mps/code/awlut.c
index b8e14a0db7d..3a5e419666e 100644
--- a/mps/code/awlut.c
+++ b/mps/code/awlut.c
@@ -16,9 +16,7 @@
 #include "mpslib.h"
 #include "mps.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <string.h>
 
 
diff --git a/mps/code/awluthe.c b/mps/code/awluthe.c
index 257b4142723..3ccdff7110f 100644
--- a/mps/code/awluthe.c
+++ b/mps/code/awluthe.c
@@ -17,9 +17,7 @@
 #include "mpslib.h"
 #include "mps.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <string.h>
 
 
diff --git a/mps/code/awlutth.c b/mps/code/awlutth.c
index f12d8913543..505a46826a8 100644
--- a/mps/code/awlutth.c
+++ b/mps/code/awlutth.c
@@ -16,13 +16,9 @@
 #include "mpslib.h"
 #include "mps.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <string.h>
-#if defined(MPS_OS_LI) || defined(MPS_OS_FR) || defined(MPS_OS_XC)
 #include <pthread.h>
-#endif
 
 
 #define testArenaSIZE     ((size_t)64<<20)
diff --git a/mps/code/exposet0.c b/mps/code/exposet0.c
index 11e78ad29cb..e2ef9728cfe 100644
--- a/mps/code/exposet0.c
+++ b/mps/code/exposet0.c
@@ -19,10 +19,8 @@
 #include "mpscamc.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/mps/code/expt825.c b/mps/code/expt825.c
index 5947a0cff68..f72ec532859 100644
--- a/mps/code/expt825.c
+++ b/mps/code/expt825.c
@@ -34,9 +34,7 @@
 #include "fmtdy.h"
 #include "fmtdytst.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <stdlib.h>
 
 
diff --git a/mps/code/finalcv.c b/mps/code/finalcv.c
index e8f7e251a6e..ce82197b657 100644
--- a/mps/code/finalcv.c
+++ b/mps/code/finalcv.c
@@ -26,9 +26,7 @@
 #include "fmtdy.h"
 #include "fmtdytst.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <stdlib.h>
 
 
diff --git a/mps/code/finaltest.c b/mps/code/finaltest.c
index dd6146851df..13cf9ef0afa 100644
--- a/mps/code/finaltest.c
+++ b/mps/code/finaltest.c
@@ -26,9 +26,7 @@
 #include "fmtdy.h"
 #include "fmtdytst.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <stdlib.h>
 
 
diff --git a/mps/code/mpsicv.c b/mps/code/mpsicv.c
index a4d8c3750b5..9cabc84c119 100644
--- a/mps/code/mpsicv.c
+++ b/mps/code/mpsicv.c
@@ -15,9 +15,7 @@
 #include "fmtdytst.h"
 #include "mps.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#  include "mpsw3.h"
-#endif
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
diff --git a/mps/code/qs.c b/mps/code/qs.c
index 31005b4fc9b..0e73fd0d6da 100644
--- a/mps/code/qs.c
+++ b/mps/code/qs.c
@@ -29,9 +29,7 @@
 #include "mpscamc.h"
 #include "mpscmv.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <stdlib.h>
 
 
diff --git a/mps/code/segsmss.c b/mps/code/segsmss.c
index 21a8b8846ed..91539a8feb9 100644
--- a/mps/code/segsmss.c
+++ b/mps/code/segsmss.c
@@ -21,10 +21,8 @@
 #include "mpscams.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
diff --git a/mps/code/steptest.c b/mps/code/steptest.c
index 4d6353e78df..74baa2662cb 100644
--- a/mps/code/steptest.c
+++ b/mps/code/steptest.c
@@ -14,10 +14,8 @@
 #include "mpscamc.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/mps/code/walkt0.c b/mps/code/walkt0.c
index 629a5276ead..1ec5cf9064b 100644
--- a/mps/code/walkt0.c
+++ b/mps/code/walkt0.c
@@ -15,9 +15,6 @@
 #include "mpscawl.h"
 #include "mpsavm.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
 #include "mps.h"
 
 #include <stdlib.h>
diff --git a/mps/code/zcoll.c b/mps/code/zcoll.c
index 20cb8f06dc1..36931aa4860 100644
--- a/mps/code/zcoll.c
+++ b/mps/code/zcoll.c
@@ -62,9 +62,7 @@
 #include "fmtdy.h"
 #include "fmtdytst.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <stdlib.h>
 #include <time.h>  /* clock */
 
diff --git a/mps/code/zmess.c b/mps/code/zmess.c
index a97c10ea8f1..f7970de168d 100644
--- a/mps/code/zmess.c
+++ b/mps/code/zmess.c
@@ -107,9 +107,7 @@
 #include "fmtdy.h"
 #include "fmtdytst.h"
 #include "mpstd.h"
-#ifdef MPS_OS_W3
-#include "mpsw3.h"
-#endif
+
 #include <stdlib.h>