diff --git a/contrib/samples/animate/makefile.wat b/contrib/samples/animate/makefile.wat
index de9f03d959..bb4b959669 100644
--- a/contrib/samples/animate/makefile.wat
+++ b/contrib/samples/animate/makefile.wat
@@ -6,9 +6,12 @@
 #
 
 WXDIR = $(%WXWIN)
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\animate
 
 PROGRAM = anitest
-OBJECTS = $(PROGRAM).obj animate.obj
+EXTRALIBS = $(WXDIR)\lib\anim_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/contrib/samples/gizmos/multicell/makefile.wat b/contrib/samples/gizmos/multicell/makefile.wat
index 64778d2b8f..19fa89a876 100644
--- a/contrib/samples/gizmos/multicell/makefile.wat
+++ b/contrib/samples/gizmos/multicell/makefile.wat
@@ -3,9 +3,13 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\gizmos\multicell
+
+
 PROGRAM = mtest
-OBJECTS = $(PROGRAM).obj ..\src\multicell.obj
-EXTRAINC=-I..\include
+EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/contrib/samples/gizmos/splittree/makefile.wat b/contrib/samples/gizmos/splittree/makefile.wat
index 2b200ba7ec..a972a0f335 100644
--- a/contrib/samples/gizmos/splittree/makefile.wat
+++ b/contrib/samples/gizmos/splittree/makefile.wat
@@ -1,14 +1,14 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
-# 
-#
+# Purpose: makefile for multicell example (Watcom)
+# Created 2000-07-28
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = minimal
-OBJECTS = $(PROGRAM).obj
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\gizmos\splittree
+
+PROGRAM = tree
+EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/contrib/samples/mmedia/makefile.wat b/contrib/samples/mmedia/makefile.wat
index 39b2eb6cba..11fd2bb642 100644
--- a/contrib/samples/mmedia/makefile.wat
+++ b/contrib/samples/mmedia/makefile.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = mmboard
-OBJECTS = $(PROGRAM).obj mmbman.obj
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj  mmbman.obj
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/contrib/samples/ogl/ogledit/makefile.wat b/contrib/samples/ogl/ogledit/makefile.wat
index 4d6b13097f..5991f8e9fd 100644
--- a/contrib/samples/ogl/ogledit/makefile.wat
+++ b/contrib/samples/ogl/ogledit/makefile.wat
@@ -7,9 +7,12 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
+
 PROGRAM = ogledit
-EXTRALIBS = $(WXDIR)\lib\ogl.lib
-OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
+EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj $(OUTPUTDIR)\palette.obj
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat
index 70896d9437..c85f5c97a4 100644
--- a/contrib/samples/ogl/studio/makefile.wat
+++ b/contrib/samples/ogl/studio/makefile.wat
@@ -7,10 +7,21 @@
 
 WXDIR = $(%WXWIN)
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\ogl\studio
+
 PROGRAM = studio
-EXTRALIBS = $(WXDIR)\lib\ogl.lib
-OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
-  mainfrm.obj project.obj dialogs.obj csprint.obj
+EXTRALIBS = $(WXDIR)\lib\ogl_w.lib
+OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj &
+  $(OUTPUTDIR)\doc.obj &
+  $(OUTPUTDIR)\shapes.obj &
+  $(OUTPUTDIR)\symbols.obj &
+  $(OUTPUTDIR)\view.obj &
+  $(OUTPUTDIR)\cspalette.obj &
+  $(OUTPUTDIR)\mainfrm.obj &
+  $(OUTPUTDIR)\project.obj &
+  $(OUTPUTDIR)\dialogs.obj &
+  $(OUTPUTDIR)\csprint.obj
 
 !include $(WXDIR)\src\makeprog.wat
 
diff --git a/contrib/src/gizmos/makefile.wat b/contrib/src/gizmos/makefile.wat
index a84c801924..2f6745c75b 100644
--- a/contrib/src/gizmos/makefile.wat
+++ b/contrib/src/gizmos/makefile.wat
@@ -1,22 +1,29 @@
 # Gizmos makefile for Watcom C++
 
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 WXDIR = ..\..\..
 
 !include $(WXDIR)\src\makewat.env
 
-GIZMOSLIB = $(WXDIR)\lib\gizmos.lib
+GIZMOSLIB = $(WXDIR)\lib\gizmos_w.lib
 THISDIR = $(WXDIR)\contrib\src\gizmos
+OUTPUTDIR = $(THISDIR)\
 
 NAME = gizmos
 LNK = $(name).lnk
 
 OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
 
-all: $(GIZMOSLIB)
+all: $(GIZMOSLIB) .SYMBOLIC
 
 $(GIZMOSLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(GIZMOSLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(GIZMOSLIB) *.lbc
+    -erase *.obj
+    -erase *.bak
+    -erase *.err 
+    -erase *.pch 
+    -erase $(GIZMOSLIB) 
+    -erase *.lbc
 
diff --git a/contrib/src/mmedia/makefile.wat b/contrib/src/mmedia/makefile.wat
index e5181dde55..ffbeda034b 100644
--- a/contrib/src/mmedia/makefile.wat
+++ b/contrib/src/mmedia/makefile.wat
@@ -6,15 +6,38 @@
 #
 # Makefile : Builds MMedia library for Watcom C++, WIN32
 
-WXDIR = $(%WXWIN)
+!error This will not work - there is no digitalv.h in Open Watcom as of 26 Feb 03 
 
-LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib
+WXDIR = ..\..\..
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+
+!include $(WXDIR)\src\makewat.env
+
+THISDIR = $(WXDIR)\contrib\src\mmedia
+OUTPUTDIR = $(THISDIR)\
+
+NAME = mmedia
+LNK = $(name).lnk
+
+LIBTARGET=$(WXDIR)\lib\mmedia_w.lib
 
 OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj &
   g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj &
   sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj &
   sndwav.obj sndwin.obj vidbase.obj vidwin.obj
 
-!include $(WXDIR)\src\makelib.wat
+all:     $(LIBTARGET) .SYMBOLIC
+    
+
+$(LIBTARGET): $(OBJECTS)
+	*wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS)
+
+clean:   .SYMBOLIC
+    -erase *.obj 
+    -erase *.bak
+    -erase *.err 
+    -erase *.pch 
+    -erase $(LIBTARGET) 
+    -erase *.lbc
 
 
diff --git a/contrib/src/ogl/makefile.wat b/contrib/src/ogl/makefile.wat
index 7c2cf13701..528c0ca263 100644
--- a/contrib/src/ogl/makefile.wat
+++ b/contrib/src/ogl/makefile.wat
@@ -1,13 +1,13 @@
 # Objects makefile
 
 WXDIR = ..\..\..
+EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO
 
 !include $(WXDIR)\src\makewat.env
 
-EXTRACPPFLAGS=/DPROLOGIO
-
-OGLLIB = $(WXDIR)\lib\ogl.lib
-THISDIR = $(WXDIR)\src\ogl
+OGLLIB = $(WXDIR)\lib\ogl_w.lib
+THISDIR = $(WXDIR)\contrib\src\ogl
+OUTPUTDIR = $(THISDIR)\
 
 NAME = ogl
 LNK = $(name).lnk
@@ -15,11 +15,16 @@ LNK = $(name).lnk
 OBJECTS =  basic.obj basic2.obj canvas.obj lines.obj divided.obj constrnt.obj &
     composit.obj drawn.obj bmpshape.obj mfutils.obj ogldiag.obj oglmisc.obj
 
-all: $(OGLLIB)
+all: $(OGLLIB) .SYMBOLIC
 
 $(OGLLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(OGLLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(OGLLIB) *.lbc
+    -erase *.obj 
+    -erase *.bak 
+    -erase *.err 
+    -erase *.pch 
+    -erase $(OGLLIB) 
+    -erase *.lbc
 
diff --git a/contrib/src/xrc/makefile.wat b/contrib/src/xrc/makefile.wat
index d4069fc0f6..364f55a256 100644
--- a/contrib/src/xrc/makefile.wat
+++ b/contrib/src/xrc/makefile.wat
@@ -2,12 +2,16 @@
 
 WXDIR = ..\..\..
 
-EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1
+#XMLDIR=
+!error modify makefile.wat to include the path to the XML library
+
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
 
 !include $(WXDIR)\src\makewat.env
 
-WXXMLLIB = $(WXDIR)\lib\wxxrc.lib
+WXXMLLIB = $(WXDIR)\lib\wxxrc_w.lib
 THISDIR = $(WXDIR)\contrib\src\xrc
+OUTPUTDIR = $(THISDIR)\
 
 NAME = wxxrc
 LNK = $(name).lnk
@@ -18,14 +22,19 @@ OBJECTS=xml.obj xmlres.obj xmlrsall.obj &
         xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj &
         xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj &
         xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj &
-        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj
+        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj xh_split.obj
 
 
-all: $(WXXMLLIB)
+all: $(WXXMLLIB) .SYMBOLIC
 
 $(WXXMLLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(WXXMLLIB) *.lbc
+    -erase *.obj 
+    -erase *.bak 
+    -erase *.err 
+    -erase *.pch
+    -erase $(WXXMLLIB) 
+    -erase *.lbc
 
diff --git a/src/xrc/makefile.wat b/src/xrc/makefile.wat
index d4069fc0f6..364f55a256 100644
--- a/src/xrc/makefile.wat
+++ b/src/xrc/makefile.wat
@@ -2,12 +2,16 @@
 
 WXDIR = ..\..\..
 
-EXTRACPPFLAGS=/Id:\libxml\libxml2-2.1.1
+#XMLDIR=
+!error modify makefile.wat to include the path to the XML library
+
+EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
 
 !include $(WXDIR)\src\makewat.env
 
-WXXMLLIB = $(WXDIR)\lib\wxxrc.lib
+WXXMLLIB = $(WXDIR)\lib\wxxrc_w.lib
 THISDIR = $(WXDIR)\contrib\src\xrc
+OUTPUTDIR = $(THISDIR)\
 
 NAME = wxxrc
 LNK = $(name).lnk
@@ -18,14 +22,19 @@ OBJECTS=xml.obj xmlres.obj xmlrsall.obj &
         xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj &
         xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj &
         xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj &
-        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj
+        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj xh_split.obj
 
 
-all: $(WXXMLLIB)
+all: $(WXXMLLIB) .SYMBOLIC
 
 $(WXXMLLIB): $(OBJECTS)
 	*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)
 
 clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch $(WXXMLLIB) *.lbc
+    -erase *.obj 
+    -erase *.bak 
+    -erase *.err 
+    -erase *.pch
+    -erase $(WXXMLLIB) 
+    -erase *.lbc