Compiling cwwm continued

Starting a new thread as Google helpfully doesn't let me download my 
responses etc using POP, leaving holes in the thread. Really need to get 
away from Gmail but even my ISP is migrating to Gmail :(

Anyways after screwing around with the environment, adding empty 
directories to make icc happy and trying to figure out why GCC 2.81 
insists on using the emxomfld in @unixroot/usr/bin instead of its own 
that is first on PATH, I've gotten to compiling mediafolder.
This fails with lots of errors starting with
include\mediafolder.hh(85:10) : error EDC3008: Source file 
"progfolder.hh" cannot be opened.
include\cwmmdataf.hh(39:10) : error EDC3008: Source file <wpdataf.hh> 
cannot be opened.
...
The progfolder.hh can be worked around I think as the code has the 
existing progfolder.h commented out.
For <wpdataf.hh>, all I can find is in the toolkit (and VACPP) these files,
G:\os2tk45\h\wpdataf.h
G:\os2tk45\h\wpdataf.xh
G:\os2tk45\idl\wpdataf.idl
so I thought I'd try replacing wpdataf.hh with wpdataf.xh. This results in,
[K:\work\cwmmclasses\branches\v2.9\mediafolder]make 2>&1 | tee build.log
icc /G5 /Ge- /Gm+ /Gl  /O+ /Ss /Oc+ /Ol- /Q+ /DNO_ECS  /C+ -I./include 
-IK:/work/cwmmclasses/branches/v2.9/common_functions/include 
/Foob/mediafolder.obj c/mediafldr/mediafolder.cpp
General Protection Fault exception occurred at EIP = 00123A36 on thread 
0001.
Register Dump at point of exception:
EAX = 003EE440    EBX = 00000000  ECX = 00000000    EDX = 003EE440
EBP = 004F0548    EDI = 004DC7C0  ESI = 00000000    ESP = 002AA2B4
  CS =     005B  CSLIM = FFFFFFFF   DS =     0053  DSLIM = FFFFFFFF
  ES =     0053  ESLIM = FFFFFFFF   FS =     150B  FSLIM = 00000030
  GS =     0000  GSLIM = 00000000   SS =     0053  SSLIM = FFFFFFFF
Process terminating.
severe error EDC1030: Unable to execute dde4cpp.exe.
make: *** [obj/mediafolder.obj] Error 12

Ideas?
Dave