--- a/Make.spec	Fri Sep 14 18:22:45 2018 +0200
+++ b/Make.spec	Fri Sep 14 18:29:06 2018 +0200
@@ -50,6 +50,18 @@
 # STCWARNINGS=-warnEOLComments
 STCWARNINGS=-warnNonStandard -warnUnused
 
+VMS_CLASSES= \
+	OpenVMSFileHandle \
+	OpenVMSFilename \
+	OpenVMSOperatingSystem \
+
+WIN32_CLASSES= \
+	PCFilename \
+	Win32Constants \
+	Win32Handle \
+	Win32FILEHandle \
+	Win32OperatingSystem \
+
 COMMON_CLASSES= \
 	Autoload \
 	Object \
@@ -186,6 +198,7 @@
 	ReadOnlySequenceableCollection \
 	RecursiveStoreError \
 	SHA1Stream \
+	SmallDictionary \
 	Time \
 	TimeoutNotification \
 	Timestamp \
@@ -424,13 +437,6 @@
 	ZeroDivide \
 	BadRomanNumberFormatError \
 
-WIN32_CLASSES= \
-	PCFilename \
-	Win32Constants \
-	Win32Handle \
-	Win32FILEHandle \
-	Win32OperatingSystem \
-
 UNIX_CLASSES= \
 	UnixSyslogInterface \
 	UnixFileDescriptorHandle \
@@ -438,13 +444,20 @@
 	UnixOperatingSystem \
 	OSXOperatingSystem \
 
-VMS_CLASSES= \
-	OpenVMSFileHandle \
-	OpenVMSFilename \
-	OpenVMSOperatingSystem \
 
 
 
+VMS_OBJS= \
+    $(OUTDIR)OpenVMSFileHandle.$(O) \
+    $(OUTDIR)OpenVMSFilename.$(O) \
+    $(OUTDIR)OpenVMSOperatingSystem.$(O) \
+
+WIN32_OBJS= \
+    $(OUTDIR)PCFilename.$(O) \
+    $(OUTDIR)Win32Constants.$(O) \
+    $(OUTDIR)Win32Handle.$(O) \
+    $(OUTDIR)Win32FILEHandle.$(O) \
+    $(OUTDIR)Win32OperatingSystem.$(O) \
 
 COMMON_OBJS= \
     $(OUTDIR)Autoload.$(O) \
@@ -582,6 +595,7 @@
     $(OUTDIR)ReadOnlySequenceableCollection.$(O) \
     $(OUTDIR)RecursiveStoreError.$(O) \
     $(OUTDIR)SHA1Stream.$(O) \
+    $(OUTDIR)SmallDictionary.$(O) \
     $(OUTDIR)Time.$(O) \
     $(OUTDIR)TimeoutNotification.$(O) \
     $(OUTDIR)Timestamp.$(O) \
@@ -820,13 +834,6 @@
     $(OUTDIR)ZeroDivide.$(O) \
     $(OUTDIR)BadRomanNumberFormatError.$(O) \
 
-WIN32_OBJS= \
-    $(OUTDIR)PCFilename.$(O) \
-    $(OUTDIR)Win32Constants.$(O) \
-    $(OUTDIR)Win32Handle.$(O) \
-    $(OUTDIR)Win32FILEHandle.$(O) \
-    $(OUTDIR)Win32OperatingSystem.$(O) \
-
 UNIX_OBJS= \
     $(OUTDIR)UnixSyslogInterface.$(O) \
     $(OUTDIR)UnixFileDescriptorHandle.$(O) \
@@ -834,10 +841,5 @@
     $(OUTDIR)UnixOperatingSystem.$(O) \
     $(OUTDIR)OSXOperatingSystem.$(O) \
 
-VMS_OBJS= \
-    $(OUTDIR)OpenVMSFileHandle.$(O) \
-    $(OUTDIR)OpenVMSFilename.$(O) \
-    $(OUTDIR)OpenVMSOperatingSystem.$(O) \
 
 
-