diff --git a/fstester/setter/os2_16.lk1 b/fstester/setter/os2_16.lk1
index 18d110b6..4a7f66e1 100644
--- a/fstester/setter/os2_16.lk1
+++ b/fstester/setter/os2_16.lk1
@@ -1,2 +1,2 @@
-FIL main.obj,os2.obj,os2_16.obj
+FIL main.obj,os2_16.obj
 
diff --git a/fstester/setter/os2_16.mk1 b/fstester/setter/os2_16.mk1
index 044d729d..6ce3318b 100644
--- a/fstester/setter/os2_16.mk1
+++ b/fstester/setter/os2_16.mk1
@@ -5,32 +5,25 @@ C:\dic\main.obj : C:\dic\main.c .AUTODEPEND
  *wcc main.c -i="C:\WATCOM/h;C:\WATCOM/h/os21x" -w4 -e25 -zq -od -d2 -bt=os2&
  -fo=.obj -ml
 
-C:\dic\os2.obj : C:\dic\os2.c .AUTODEPEND
- @C:
- cd C:\dic
- *wcc os2.c -i="C:\WATCOM/h;C:\WATCOM/h/os21x" -w4 -e25 -zq -od -d2 -bt=os2 &
--fo=.obj -ml
-
 C:\dic\os2_16.obj : C:\dic\os2_16.c .AUTODEPEND
  @C:
  cd C:\dic
  *wcc os2_16.c -i="C:\WATCOM/h;C:\WATCOM/h/os21x" -w4 -e25 -zq -od -d2 -bt=o&
 s2 -fo=.obj -ml
 
-C:\dic\os2_16.exe : C:\dic\main.obj C:\dic\os2.obj C:\dic\os2_16.obj C:\dic\&
-consts.h C:\dic\defs.h C:\dic\dosos2.h C:\dic\main.h C:\dic\os2_16.h .AUTODE&
-PEND
+C:\dic\os2_16.exe : C:\dic\main.obj C:\dic\os2_16.obj C:\dic\consts.h C:\dic&
+\defs.h C:\dic\dosos2.h C:\dic\main.h C:\dic\os2_16.h .AUTODEPEND
  @C:
  cd C:\dic
- @%write os2_16.lk1 FIL main.obj,os2.obj,os2_16.obj
+ @%write os2_16.lk1 FIL main.obj,os2_16.obj
  @%append os2_16.lk1 
 !ifneq BLANK ""
  *wlib -q -n -b os2_16.imp 
  @%append os2_16.lk1 LIBR os2_16.imp
 !endif
- *wlink name os2_16 d all SYS os2 op m libr os2 op maxe=25 op q op symf @os2&
+ *wlink name os2_16 d all sys os2 op m libr os2 op maxe=25 op q op symf @os2&
 _16.lk1
 !ifneq BLANK ""
- rc -i $[: -i C:\WATCOM\h -i C:\WATCOM\h\os2  os2_16.exe
+ *wrc -q -ad  os2_16.exe
 !endif
 
diff --git a/fstester/setter/os2_16.tgt b/fstester/setter/os2_16.tgt
index db27f5aa..14c27a60 100644
--- a/fstester/setter/os2_16.tgt
+++ b/fstester/setter/os2_16.tgt
@@ -58,7 +58,7 @@ WVList
 0
 14
 WPickList
-10
+9
 15
 MItem
 3
@@ -97,8 +97,8 @@ WVList
 0
 23
 MItem
-5
-os2.c
+8
+os2_16.c
 24
 WString
 4
@@ -115,26 +115,26 @@ WVList
 0
 27
 MItem
-8
-os2_16.c
+3
+*.h
 28
 WString
-4
-COBJ
+3
+NIL
 29
 WVList
 0
 30
 WVList
 0
-15
+-1
 1
 1
 0
 31
 MItem
-3
-*.h
+8
+consts.h
 32
 WString
 3
@@ -145,14 +145,14 @@ WVList
 34
 WVList
 0
--1
+27
 1
 1
 0
 35
 MItem
-8
-consts.h
+6
+defs.h
 36
 WString
 3
@@ -163,14 +163,14 @@ WVList
 38
 WVList
 0
-31
+27
 1
 1
 0
 39
 MItem
-6
-defs.h
+8
+dosos2.h
 40
 WString
 3
@@ -181,14 +181,14 @@ WVList
 42
 WVList
 0
-31
+27
 1
 1
 0
 43
 MItem
-8
-dosos2.h
+6
+main.h
 44
 WString
 3
@@ -199,14 +199,14 @@ WVList
 46
 WVList
 0
-31
+27
 1
 1
 0
 47
 MItem
-6
-main.h
+8
+os2_16.h
 48
 WString
 3
@@ -217,25 +217,7 @@ WVList
 50
 WVList
 0
-31
-1
-1
-0
-51
-MItem
-8
-os2_16.h
-52
-WString
-3
-NIL
-53
-WVList
-0
-54
-WVList
-0
-31
+27
 1
 1
 0
diff --git a/fstester/setter/os2_16.wpj b/fstester/setter/os2_16.wpj
index 16c8f058..45b84352 100644
--- a/fstester/setter/os2_16.wpj
+++ b/fstester/setter/os2_16.wpj
@@ -4,8 +4,8 @@ projectIdent
 VpeMain
 1
 WRect
-1496
-1450
+1504
+1490
 7680
 9220
 2
@@ -39,5 +39,5 @@ WFileName
 10
 os2_16.tgt
 0
-5
+8
 7
diff --git a/fstester/setter/os2_32.lk1 b/fstester/setter/os2_32.lk1
index d10dc187..81c58972 100644
--- a/fstester/setter/os2_32.lk1
+++ b/fstester/setter/os2_32.lk1
@@ -1,2 +1,2 @@
-FIL common.obj,main.obj,os2.obj,os2_32.obj
+FIL main.obj,os2_32.obj
 
diff --git a/fstester/setter/os2_32.mk1 b/fstester/setter/os2_32.mk1
index 2637ab02..dd999ec3 100644
--- a/fstester/setter/os2_32.mk1
+++ b/fstester/setter/os2_32.mk1
@@ -1,40 +1,28 @@
 !define BLANK ""
-C:\dic\common.obj : C:\dic\common.c .AUTODEPEND
- @C:
- cd C:\dic
- *wcc386 common.c -i="C:\WATCOM/h;C:\WATCOM/h/os2" -w4 -e25 -zq -od -d2 -3r &
--bt=os2 -fo=.obj -mf
-
 C:\dic\main.obj : C:\dic\main.c .AUTODEPEND
  @C:
  cd C:\dic
  *wcc386 main.c -i="C:\WATCOM/h;C:\WATCOM/h/os2" -w4 -e25 -zq -od -d2 -3r -b&
 t=os2 -fo=.obj -mf
 
-C:\dic\os2.obj : C:\dic\os2.c .AUTODEPEND
- @C:
- cd C:\dic
- *wcc386 os2.c -i="C:\WATCOM/h;C:\WATCOM/h/os2" -w4 -e25 -zq -od -d2 -3r -bt&
-=os2 -fo=.obj -mf
-
 C:\dic\os2_32.obj : C:\dic\os2_32.c .AUTODEPEND
  @C:
  cd C:\dic
  *wcc386 os2_32.c -i="C:\WATCOM/h;C:\WATCOM/h/os2" -w4 -e25 -zq -od -d2 -3r &
 -bt=os2 -fo=.obj -mf
 
-C:\dic\os2_32.exe : C:\dic\common.obj C:\dic\main.obj C:\dic\os2.obj C:\dic\&
-os2_32.obj C:\dic\defs.h C:\dic\main.h .AUTODEPEND
+C:\dic\os2_32.exe : C:\dic\main.obj C:\dic\os2_32.obj C:\dic\consts.h C:\dic&
+\defs.h C:\dic\dosos2.h C:\dic\main.h C:\dic\os2_32.h .AUTODEPEND
  @C:
  cd C:\dic
- @%write os2_32.lk1 FIL common.obj,main.obj,os2.obj,os2_32.obj
+ @%write os2_32.lk1 FIL main.obj,os2_32.obj
  @%append os2_32.lk1 
 !ifneq BLANK ""
  *wlib -q -n -b os2_32.imp 
  @%append os2_32.lk1 LIBR os2_32.imp
 !endif
- *wlink name os2_32 d all SYS os2v2 op m op maxe=25 op q op symf @os2_32.lk1
+ *wlink name os2_32 d all sys os2v2 op m op maxe=25 op q op symf @os2_32.lk1
 !ifneq BLANK ""
- rc -i $[: -i C:\WATCOM\h -i C:\WATCOM\h\os2  os2_32.exe
+ *wrc -q -ad  os2_32.exe
 !endif
 
diff --git a/fstester/setter/os2_32.tgt b/fstester/setter/os2_32.tgt
index 0e1e6848..a573ac1c 100644
--- a/fstester/setter/os2_32.tgt
+++ b/fstester/setter/os2_32.tgt
@@ -42,7 +42,7 @@ WVList
 0
 10
 WPickList
-8
+9
 11
 MItem
 3
@@ -63,7 +63,7 @@ WCC
 16
 WString
 33
-??2??80386 Register based calling
+??2??80386 register-based calling
 1
 1
 17
@@ -75,7 +75,7 @@ WCC
 19
 WString
 39
-??2??Pentium Pro Register based calling
+??2??Pentium Pro register-based calling
 1
 0
 20
@@ -87,8 +87,8 @@ WVList
 0
 21
 MItem
-8
-common.c
+6
+main.c
 22
 WString
 4
@@ -105,8 +105,8 @@ WVList
 0
 25
 MItem
-6
-main.c
+8
+os2_32.c
 26
 WString
 4
@@ -123,44 +123,44 @@ WVList
 0
 29
 MItem
-5
-os2.c
+3
+*.h
 30
 WString
-4
-COBJ
+3
+NIL
 31
 WVList
 0
 32
 WVList
 0
-11
+-1
 1
 1
 0
 33
 MItem
 8
-os2_32.c
+consts.h
 34
 WString
-4
-COBJ
+3
+NIL
 35
 WVList
 0
 36
 WVList
 0
-11
+29
 1
 1
 0
 37
 MItem
-3
-*.h
+6
+defs.h
 38
 WString
 3
@@ -171,14 +171,14 @@ WVList
 40
 WVList
 0
--1
+29
 1
 1
 0
 41
 MItem
-6
-defs.h
+8
+dosos2.h
 42
 WString
 3
@@ -189,7 +189,7 @@ WVList
 44
 WVList
 0
-37
+29
 1
 1
 0
@@ -207,7 +207,25 @@ WVList
 48
 WVList
 0
-37
+29
+1
+1
+0
+49
+MItem
+8
+os2_32.h
+50
+WString
+3
+NIL
+51
+WVList
+0
+52
+WVList
+0
+29
 1
 1
 0
diff --git a/fstester/setter/os2_32.wpj b/fstester/setter/os2_32.wpj
index 55da0fd7..ca05b0b8 100644
--- a/fstester/setter/os2_32.wpj
+++ b/fstester/setter/os2_32.wpj
@@ -4,8 +4,8 @@ projectIdent
 VpeMain
 1
 WRect
-1504
-1490
+672
+1060
 7680
 9210
 2
@@ -39,5 +39,5 @@ WFileName
 10
 os2_32.tgt
 0
-0
+5
 7