--- a/Make.proto	Fri Sep 19 19:45:45 2014 +0200
+++ b/Make.proto	Fri Sep 19 19:45:47 2014 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.157 2014-01-14 12:11:21 stefan Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.158 2014-09-19 17:45:47 cg Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=$(JPEG_INCLUDE) -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview
+LOCALINCLUDES=$(JPEG_INCLUDE) -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libui -I$(INCLUDE_TOP)/stx/libview
 
 
 # if you need any additional defines for embedded C code,
@@ -117,6 +117,15 @@
 
 
 
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+	$(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init
+	$(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
+
 # add more install actions here
 install::
 
@@ -153,10 +162,10 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)ActiveHelpView.$(O) ActiveHelpView.$(H): ActiveHelpView.st $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ApplicationSubView.$(O) ApplicationSubView.$(H): ApplicationSubView.st $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ApplicationWindow.$(O) ApplicationWindow.$(H): ApplicationWindow.st $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ColorValue.$(O) ColorValue.$(H): ColorValue.st $(INCLUDE_TOP)/stx/libview/Color.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)ActiveHelpView.$(O) ActiveHelpView.$(H): ActiveHelpView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
+$(OUTDIR)ApplicationSubView.$(O) ApplicationSubView.$(H): ApplicationSubView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
+$(OUTDIR)ApplicationWindow.$(O) ApplicationWindow.$(H): ApplicationWindow.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
+$(OUTDIR)ColorValue.$(O) ColorValue.$(H): ColorValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/Color.$(H) $(STCHDR)
 $(OUTDIR)DisplayObject.$(O) DisplayObject.$(H): DisplayObject.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DragAndDropManager.$(O) DragAndDropManager.$(H): DragAndDropManager.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DragHandler.$(O) DragHandler.$(H): DragHandler.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -166,70 +175,70 @@
 $(OUTDIR)DropSource.$(O) DropSource.$(H): DropSource.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DropTarget.$(O) DropTarget.$(H): DropTarget.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)EventListener.$(O) EventListener.$(H): EventListener.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ExternalTopView.$(O) ExternalTopView.$(H): ExternalTopView.st $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)GIFReader.$(O) GIFReader.$(H): GIFReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)ExternalTopView.$(O) ExternalTopView.$(H): ExternalTopView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
+$(OUTDIR)GIFReader.$(O) GIFReader.$(H): GIFReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
 $(OUTDIR)Icon.$(O) Icon.$(H): Icon.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ImageFrame.$(O) ImageFrame.$(H): ImageFrame.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ImageSequence.$(O) ImageSequence.$(H): ImageSequence.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)InputView.$(O) InputView.$(H): InputView.st $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JPEGReader.$(O) JPEGReader.$(H): JPEGReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)ImageSequence.$(O) ImageSequence.$(H): ImageSequence.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(STCHDR)
+$(OUTDIR)InputView.$(O) InputView.$(H): InputView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(STCHDR)
+$(OUTDIR)JPEGReader.$(O) JPEGReader.$(H): JPEGReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
 $(OUTDIR)KeyboardProcessor.$(O) KeyboardProcessor.$(H): KeyboardProcessor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Layout.$(O) Layout.$(H): Layout.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)MIMETypeIconLibrary.$(O) MIMETypeIconLibrary.$(H): MIMETypeIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)MIMETypes.$(O) MIMETypes.$(H): MIMETypes.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
-$(OUTDIR)MacOSXIconReader.$(O) MacOSXIconReader.$(H): MacOSXIconReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)MIMETypes.$(O) MIMETypes.$(H): MIMETypes.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/ImmutableString.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR)
+$(OUTDIR)MacOSXIconReader.$(O) MacOSXIconReader.$(H): MacOSXIconReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
 $(OUTDIR)MenuItem.$(O) MenuItem.$(H): MenuItem.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Model.$(O) Model.$(H): Model.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)MultiImage.$(O) MultiImage.$(H): MultiImage.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PNGReader.$(O) PNGReader.$(H): PNGReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PopUpBanner.$(O) PopUpBanner.$(H): PopUpBanner.st $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PNGReader.$(O) PNGReader.$(H): PNGReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
+$(OUTDIR)PopUpBanner.$(O) PopUpBanner.$(H): PopUpBanner.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
 $(OUTDIR)PrintConverter.$(O) PrintConverter.$(H): PrintConverter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PrinterContext.$(O) PrinterContext.$(H): PrinterContext.st $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PropertyListDictionary.$(O) PropertyListDictionary.$(H): PropertyListDictionary.st $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PrinterContext.$(O) PrinterContext.$(H): PrinterContext.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(STCHDR)
+$(OUTDIR)PropertyListDictionary.$(O) PropertyListDictionary.$(H): PropertyListDictionary.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(STCHDR)
 $(OUTDIR)ResourceRetriever.$(O) ResourceRetriever.$(H): ResourceRetriever.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)StandardSystemController.$(O) StandardSystemController.$(H): StandardSystemController.st $(INCLUDE_TOP)/stx/libview/Controller.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)TIFFReader.$(O) TIFFReader.$(H): TIFFReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)TransparentBox.$(O) TransparentBox.$(H): TransparentBox.st $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VisualRegion.$(O) VisualRegion.$(H): VisualRegion.st $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)StandardSystemController.$(O) StandardSystemController.$(H): StandardSystemController.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/Controller.$(H) $(STCHDR)
+$(OUTDIR)TIFFReader.$(O) TIFFReader.$(H): TIFFReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
+$(OUTDIR)TransparentBox.$(O) TransparentBox.$(H): TransparentBox.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
+$(OUTDIR)VisualRegion.$(O) VisualRegion.$(H): VisualRegion.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(STCHDR)
 $(OUTDIR)WindowBuilder.$(O) WindowBuilder.$(H): WindowBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)WindowsIconReader.$(O) WindowsIconReader.$(H): WindowsIconReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)XBMReader.$(O) XBMReader.$(H): XBMReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)XPMReader.$(O) XPMReader.$(H): XPMReader.st $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libview2.$(O) stx_libview2.$(H): stx_libview2.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ActiveHelp.$(O) ActiveHelp.$(H): ActiveHelp.st $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ApplicationModel.$(O) ApplicationModel.$(H): ApplicationModel.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)LayoutOrigin.$(O) LayoutOrigin.$(H): LayoutOrigin.st $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Menu.$(O) Menu.$(H): Menu.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Plug.$(O) Plug.$(H): Plug.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)UIBuilder.$(O) UIBuilder.$(H): UIBuilder.st $(INCLUDE_TOP)/stx/libview2/WindowBuilder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ValueModel.$(O) ValueModel.$(H): ValueModel.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VisualComponent.$(O) VisualComponent.$(H): VisualComponent.st $(INCLUDE_TOP)/stx/libview2/DisplayObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)AlignmentOrigin.$(O) AlignmentOrigin.$(H): AlignmentOrigin.st $(INCLUDE_TOP)/stx/libview2/LayoutOrigin.$(H) $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ApplicationWithFileHistory.$(O) ApplicationWithFileHistory.$(H): ApplicationWithFileHistory.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)BlockValue.$(O) BlockValue.$(H): BlockValue.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)FlyByHelp.$(O) FlyByHelp.$(H): FlyByHelp.st $(INCLUDE_TOP)/stx/libview2/ActiveHelp.$(H) $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)IndirectValue.$(O) IndirectValue.$(H): IndirectValue.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)LayoutFrame.$(O) LayoutFrame.$(H): LayoutFrame.st $(INCLUDE_TOP)/stx/libview2/LayoutOrigin.$(H) $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PluggableAdaptor.$(O) PluggableAdaptor.$(H): PluggableAdaptor.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ProtocolAdaptor.$(O) ProtocolAdaptor.$(H): ProtocolAdaptor.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SimpleDialog.$(O) SimpleDialog.$(H): SimpleDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ToolApplicationModel.$(O) ToolApplicationModel.$(H): ToolApplicationModel.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ValueHolder.$(O) ValueHolder.$(H): ValueHolder.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VisualPart.$(O) VisualPart.$(H): VisualPart.st $(INCLUDE_TOP)/stx/libview2/VisualComponent.$(H) $(INCLUDE_TOP)/stx/libview2/DisplayObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)AspectAdaptor.$(O) AspectAdaptor.$(H): AspectAdaptor.st $(INCLUDE_TOP)/stx/libview2/ProtocolAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)BooleanBlockValue.$(O) BooleanBlockValue.$(H): BooleanBlockValue.st $(INCLUDE_TOP)/stx/libview2/BlockValue.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)BooleanValueHolder.$(O) BooleanValueHolder.$(H): BooleanValueHolder.st $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)BufferedValueHolder.$(O) BufferedValueHolder.$(H): BufferedValueHolder.st $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)DictionaryAdaptor.$(O) DictionaryAdaptor.$(H): DictionaryAdaptor.st $(INCLUDE_TOP)/stx/libview2/ProtocolAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)RangeAdaptor.$(O) RangeAdaptor.$(H): RangeAdaptor.st $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ResourceSpecEditor.$(O) ResourceSpecEditor.$(H): ResourceSpecEditor.st $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)TriggerValue.$(O) TriggerValue.$(H): TriggerValue.st $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)TypeConverter.$(O) TypeConverter.$(H): TypeConverter.st $(INCLUDE_TOP)/stx/libview2/PluggableAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ValueHolderWithRememberedPreviousValue.$(O) ValueHolderWithRememberedPreviousValue.$(H): ValueHolderWithRememberedPreviousValue.st $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ValueHolderWithWeakDependents.$(O) ValueHolderWithWeakDependents.$(H): ValueHolderWithWeakDependents.st $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)AspectAdaptorWithDefault.$(O) AspectAdaptorWithDefault.$(H): AspectAdaptorWithDefault.st $(INCLUDE_TOP)/stx/libview2/AspectAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ProtocolAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ScreenLock.$(O) ScreenLock.$(H): ScreenLock.st $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)WindowsIconReader.$(O) WindowsIconReader.$(H): WindowsIconReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
+$(OUTDIR)XBMReader.$(O) XBMReader.$(H): XBMReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
+$(OUTDIR)XPMReader.$(O) XPMReader.$(H): XPMReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/ImageReader.$(H) $(STCHDR)
+$(OUTDIR)stx_libview2.$(O) stx_libview2.$(H): stx_libview2.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)ActiveHelp.$(O) ActiveHelp.$(H): ActiveHelp.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(STCHDR)
+$(OUTDIR)ApplicationModel.$(O) ApplicationModel.$(H): ApplicationModel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)LayoutOrigin.$(O) LayoutOrigin.$(H): LayoutOrigin.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(STCHDR)
+$(OUTDIR)Menu.$(O) Menu.$(H): Menu.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)Plug.$(O) Plug.$(H): Plug.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)PluggableEventListener.$(O) PluggableEventListener.$(H): PluggableEventListener.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(STCHDR)
+$(OUTDIR)UIBuilder.$(O) UIBuilder.$(H): UIBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/WindowBuilder.$(H) $(STCHDR)
+$(OUTDIR)ValueModel.$(O) ValueModel.$(H): ValueModel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VisualComponent.$(O) VisualComponent.$(H): VisualComponent.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/DisplayObject.$(H) $(STCHDR)
+$(OUTDIR)AlignmentOrigin.$(O) AlignmentOrigin.$(H): AlignmentOrigin.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(INCLUDE_TOP)/stx/libview2/LayoutOrigin.$(H) $(STCHDR)
+$(OUTDIR)ApplicationWithFileHistory.$(O) ApplicationWithFileHistory.$(H): ApplicationWithFileHistory.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)BlockValue.$(O) BlockValue.$(H): BlockValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)FlyByHelp.$(O) FlyByHelp.$(H): FlyByHelp.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ActiveHelp.$(H) $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(STCHDR)
+$(OUTDIR)IndirectValue.$(O) IndirectValue.$(H): IndirectValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)LayoutFrame.$(O) LayoutFrame.$(H): LayoutFrame.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(INCLUDE_TOP)/stx/libview2/LayoutOrigin.$(H) $(STCHDR)
+$(OUTDIR)PluggableAdaptor.$(O) PluggableAdaptor.$(H): PluggableAdaptor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)ProtocolAdaptor.$(O) ProtocolAdaptor.$(H): ProtocolAdaptor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)SimpleDialog.$(O) SimpleDialog.$(H): SimpleDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)ToolApplicationModel.$(O) ToolApplicationModel.$(H): ToolApplicationModel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)ValueHolder.$(O) ValueHolder.$(H): ValueHolder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)VisualPart.$(O) VisualPart.$(H): VisualPart.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/DisplayObject.$(H) $(INCLUDE_TOP)/stx/libview2/VisualComponent.$(H) $(STCHDR)
+$(OUTDIR)AspectAdaptor.$(O) AspectAdaptor.$(H): AspectAdaptor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ProtocolAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)BooleanBlockValue.$(O) BooleanBlockValue.$(H): BooleanBlockValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/BlockValue.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)BooleanValueHolder.$(O) BooleanValueHolder.$(H): BooleanValueHolder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)BufferedValueHolder.$(O) BufferedValueHolder.$(H): BufferedValueHolder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)DictionaryAdaptor.$(O) DictionaryAdaptor.$(H): DictionaryAdaptor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ProtocolAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)RangeAdaptor.$(O) RangeAdaptor.$(H): RangeAdaptor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)ResourceSpecEditor.$(O) ResourceSpecEditor.$(H): ResourceSpecEditor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(STCHDR)
+$(OUTDIR)TriggerValue.$(O) TriggerValue.$(H): TriggerValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)TypeConverter.$(O) TypeConverter.$(H): TypeConverter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/PluggableAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)ValueHolderWithRememberedPreviousValue.$(O) ValueHolderWithRememberedPreviousValue.$(H): ValueHolderWithRememberedPreviousValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)ValueHolderWithWeakDependents.$(O) ValueHolderWithWeakDependents.$(H): ValueHolderWithWeakDependents.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ValueHolder.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)AspectAdaptorWithDefault.$(O) AspectAdaptorWithDefault.$(H): AspectAdaptorWithDefault.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/AspectAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ProtocolAdaptor.$(H) $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line