--- a/Make.spec	Tue Aug 15 08:26:26 2017 +0100
+++ b/Make.spec	Tue Aug 15 13:46:01 2017 +0100
@@ -60,6 +60,7 @@
 	DeviceHandle \
 	DisplayTransform \
 	Event \
+	FillStyle \
 	FontDescription \
 	GraphicsContext \
 	GraphicsDevice \
@@ -73,6 +74,7 @@
 	WindowSensor \
 	stx_libview \
 	BeveledBorder \
+	BitmapFillStyle \
 	BitmapFont \
 	Border \
 	ColorPalette \
@@ -91,14 +93,20 @@
 	Font \
 	Form \
 	GradientBackground \
+	GradientFillStyle \
 	HostGraphicsDevice \
 	ImageBackground \
 	MacButtonBorder \
 	NoBackground \
+	OrientedFillStyle \
+	RoundButtonBorder \
 	ScaleTransform \
 	SimpleBorder \
 	SolidBackground \
+	SolidFillStyle \
 	SynchronousWindowSensor \
+	TranslationTransform \
+	TranslucentColor \
 	ViewStyle \
 	WindowEvent \
 	DeviceWorkstation \
@@ -111,7 +119,6 @@
 	SimpleView \
 	WidgetEvent \
 	WindowingTransformation \
-	XGraphicsContext \
 	FixedPaletteWithAlpha \
 	MonoMappedPalette \
 	ShadowView \
@@ -121,6 +128,9 @@
 	StandardSystemView \
 	ModalBox \
 
+WIN32_CLASSES= \
+	WinWorkstation \
+
 UNIX_CLASSES= \
 	FcConstants \
 	FcPattern \
@@ -142,6 +152,7 @@
     $(OUTDIR)DeviceHandle.$(O) \
     $(OUTDIR)DisplayTransform.$(O) \
     $(OUTDIR)Event.$(O) \
+    $(OUTDIR)FillStyle.$(O) \
     $(OUTDIR)FontDescription.$(O) \
     $(OUTDIR)GraphicsContext.$(O) \
     $(OUTDIR)GraphicsDevice.$(O) \
@@ -155,6 +166,7 @@
     $(OUTDIR)WindowSensor.$(O) \
     $(OUTDIR)stx_libview.$(O) \
     $(OUTDIR)BeveledBorder.$(O) \
+    $(OUTDIR)BitmapFillStyle.$(O) \
     $(OUTDIR)BitmapFont.$(O) \
     $(OUTDIR)Border.$(O) \
     $(OUTDIR)ColorPalette.$(O) \
@@ -173,14 +185,20 @@
     $(OUTDIR)Font.$(O) \
     $(OUTDIR)Form.$(O) \
     $(OUTDIR)GradientBackground.$(O) \
+    $(OUTDIR)GradientFillStyle.$(O) \
     $(OUTDIR)HostGraphicsDevice.$(O) \
     $(OUTDIR)ImageBackground.$(O) \
     $(OUTDIR)MacButtonBorder.$(O) \
     $(OUTDIR)NoBackground.$(O) \
+    $(OUTDIR)OrientedFillStyle.$(O) \
+    $(OUTDIR)RoundButtonBorder.$(O) \
     $(OUTDIR)ScaleTransform.$(O) \
     $(OUTDIR)SimpleBorder.$(O) \
     $(OUTDIR)SolidBackground.$(O) \
+    $(OUTDIR)SolidFillStyle.$(O) \
     $(OUTDIR)SynchronousWindowSensor.$(O) \
+    $(OUTDIR)TranslationTransform.$(O) \
+    $(OUTDIR)TranslucentColor.$(O) \
     $(OUTDIR)ViewStyle.$(O) \
     $(OUTDIR)WindowEvent.$(O) \
     $(OUTDIR)DeviceWorkstation.$(O) \
@@ -204,6 +222,9 @@
     $(OUTDIR)ModalBox.$(O) \
     $(OUTDIR)extensions.$(O) \
 
+WIN32_OBJS= \
+    $(OUTDIR)WinWorkstation.$(O) \
+
 UNIX_OBJS= \
     $(OUTDIR)FcConstants.$(O) \
     $(OUTDIR)FcPattern.$(O) \