--- a/bc.mak	Thu Oct 08 18:02:45 2015 +0200
+++ b/bc.mak	Thu Oct 08 18:02:47 2015 +0200
@@ -43,14 +43,11 @@
 ! ifdef USEVC
 # X11_LIBS=..\libvc\X11.lib ..\libvc\Xext.lib
 ! else
-!  ifdef USEMINGW32
-#X11_LIBS=..\lib\bc\X11OMF.lib ..\lib\bc\XextOMF.lib
-!  endif
 ! endif
 !endif
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic $(OPTIONAL_SUPPORT_XLIB_INCLUDE)
+LOCALINCLUDES=$(OPTIONAL_SUPPORT_XLIB_INCLUDE) -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
@@ -72,19 +69,6 @@
 
 #
 
-..\lib\bc\X11OMF.lib: ..\support\win32\borland\X11OMF.lib
-	copy ..\support\win32\borland\X11OMF.lib ..\lib\bc
-
-..\lib\bc\XextOMF.lib: ..\support\win32\borland\XextOMF.lib
-	copy ..\support\win32\borland\XextOMF.lib ..\lib\bc
-
-..\lib\vc\X11.lib: ..\support\win32\msc\X11.lib
-	copy ..\support\win32\msc\X11.lib ..\lib\vc
-
-..\lib\vc\Xext.lib: ..\support\win32\msc\Xext.lib
-	copy ..\support\win32\msc\Xext.lib ..\lib\vc
-
-#obsolete:
 ..\libbc\X11OMF.lib: ..\support\win32\borland\X11OMF.lib
 	copy ..\support\win32\borland\X11OMF.lib ..\libbc
 
@@ -104,7 +88,7 @@
 test: $(TOP)\goodies\builder\reports\NUL
 	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
-
+        
 clean::
 	del *.$(CSUFFIX)
 
@@ -166,6 +150,7 @@
 $(OUTDIR)GraphicsMedium.$(O) GraphicsMedium.$(H): GraphicsMedium.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(STCHDR)
 $(OUTDIR)ImageMask.$(O) ImageMask.$(H): ImageMask.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\Depth1Image.$(H) $(INCLUDE_TOP)\stx\libview\Image.$(H) $(STCHDR)
 $(OUTDIR)MappedPalette.$(O) MappedPalette.$(H): MappedPalette.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libview\ColorPalette.$(H) $(INCLUDE_TOP)\stx\libview\Colormap.$(H) $(STCHDR)
+$(OUTDIR)RoundedBorder.$(O) RoundedBorder.$(H): RoundedBorder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\AbstractBorder.$(H) $(INCLUDE_TOP)\stx\libview\SimpleBorder.$(H) $(STCHDR)
 $(OUTDIR)WidgetEvent.$(O) WidgetEvent.$(H): WidgetEvent.st $(INCLUDE_TOP)\stx\libbasic\Message.$(H) $(INCLUDE_TOP)\stx\libbasic\MessageSend.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\Event.$(H) $(INCLUDE_TOP)\stx\libview\WindowEvent.$(H) $(STCHDR)
 $(OUTDIR)WindowingTransformation.$(O) WindowingTransformation.$(H): WindowingTransformation.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplayTransform.$(H) $(INCLUDE_TOP)\stx\libview\ScaleTransform.$(H) $(STCHDR)
 $(OUTDIR)DisplaySurface.$(O) DisplaySurface.$(H): DisplaySurface.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DeviceHandle.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(STCHDR)