--- a/Make.spec	Wed Mar 07 17:06:01 2018 +0100
+++ b/Make.spec	Wed Mar 07 17:08:19 2018 +0100
@@ -115,6 +115,7 @@
 	BuiltinLookup \
 	Character \
 	CharacterEncoderImplementations::FixedBytesEncoder \
+	CharacterEncoderImplementations::ISO10646_1 \
 	CharacterEncoderImplementations::VariableBytesEncoder \
 	CompiledCode \
 	ControlInterrupt \
@@ -153,10 +154,11 @@
 	Association \
 	Block \
 	CascadingNotification \
-	CharacterEncoderImplementations::TwoByteEncoder \
 	CharacterEncoderImplementations::ISO10646_to_UTF16BE \
 	CharacterEncoderImplementations::ISO10646_to_UTF8 \
+	CharacterEncoderImplementations::MS_Ansi \
 	CharacterEncoderImplementations::SingleByteEncoder \
+	CharacterEncoderImplementations::TwoByteEncoder \
 	ClassDescription \
 	Complex \
 	ControlRequest \
@@ -223,16 +225,15 @@
 	CharacterEncoderImplementations::ISO8859_8 \
 	CharacterEncoderImplementations::KOI8_R \
 	CharacterEncoderImplementations::MAC_Roman \
-	CharacterEncoderImplementations::MS_Ansi \
 	CharacterEncoderImplementations::MS_Arabic \
 	CharacterEncoderImplementations::MS_Baltic \
+	CharacterEncoderImplementations::MS_CP1252 \
 	CharacterEncoderImplementations::MS_Cyrillic \
 	CharacterEncoderImplementations::MS_EastEuropean \
 	CharacterEncoderImplementations::MS_Greek \
 	CharacterEncoderImplementations::MS_Hebrew \
 	CharacterEncoderImplementations::MS_Symbol \
 	CharacterEncoderImplementations::MS_Turkish \
-	CharacterEncoderImplementations::ISO10646_1 \
 	CheapBlock \
 	CmdLineOptionError \
 	Fraction \
@@ -509,6 +510,7 @@
     $(OUTDIR)BuiltinLookup.$(O) \
     $(OUTDIR)Character.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__FixedBytesEncoder.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO10646_1.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__VariableBytesEncoder.$(O) \
     $(OUTDIR)CompiledCode.$(O) \
     $(OUTDIR)ControlInterrupt.$(O) \
@@ -547,10 +549,11 @@
     $(OUTDIR)Association.$(O) \
     $(OUTDIR)Block.$(O) \
     $(OUTDIR)CascadingNotification.$(O) \
-    $(OUTDIR)CharacterEncoderImplementations__TwoByteEncoder.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF16BE.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF8.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Ansi.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__SingleByteEncoder.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__TwoByteEncoder.$(O) \
     $(OUTDIR)ClassDescription.$(O) \
     $(OUTDIR)Complex.$(O) \
     $(OUTDIR)ControlRequest.$(O) \
@@ -617,16 +620,15 @@
     $(OUTDIR)CharacterEncoderImplementations__ISO8859_8.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__KOI8_R.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MAC_Roman.$(O) \
-    $(OUTDIR)CharacterEncoderImplementations__MS_Ansi.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_Arabic.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_Baltic.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_CP1252.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_Cyrillic.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_EastEuropean.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_Greek.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_Hebrew.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_Symbol.$(O) \
     $(OUTDIR)CharacterEncoderImplementations__MS_Turkish.$(O) \
-    $(OUTDIR)CharacterEncoderImplementations__ISO10646_1.$(O) \
     $(OUTDIR)CheapBlock.$(O) \
     $(OUTDIR)CmdLineOptionError.$(O) \
     $(OUTDIR)Fraction.$(O) \