--- a/Make.spec	Thu Dec 20 17:01:02 2018 +0100
+++ b/Make.spec	Thu Dec 20 17:01:39 2018 +0100
@@ -50,18 +50,18 @@
 # STCWARNINGS=-warnEOLComments
 STCWARNINGS=-warnNonStandard -warnUnused
 
+UNIX_CLASSES= \
+	UnixSyslogInterface \
+	UnixFileDescriptorHandle \
+	UnixFileHandle \
+	UnixOperatingSystem \
+	OSXOperatingSystem \
+
 VMS_CLASSES= \
 	OpenVMSFileHandle \
 	OpenVMSFilename \
 	OpenVMSOperatingSystem \
 
-WIN32_CLASSES= \
-	PCFilename \
-	Win32Constants \
-	Win32Handle \
-	Win32FILEHandle \
-	Win32OperatingSystem \
-
 COMMON_CLASSES= \
 	Autoload \
 	Object \
@@ -81,6 +81,7 @@
 	Context \
 	Continuation \
 	Delay \
+	EOFObject \
 	ExecutableFunction \
 	ExternalAddress \
 	ExternalLibrary \
@@ -437,28 +438,28 @@
 	ZeroDivide \
 	BadRomanNumberFormatError \
 
-UNIX_CLASSES= \
-	UnixSyslogInterface \
-	UnixFileDescriptorHandle \
-	UnixFileHandle \
-	UnixOperatingSystem \
-	OSXOperatingSystem \
+WIN32_CLASSES= \
+	PCFilename \
+	Win32Constants \
+	Win32Handle \
+	Win32FILEHandle \
+	Win32OperatingSystem \
 
 
 
 
+UNIX_OBJS= \
+    $(OUTDIR)UnixSyslogInterface.$(O) \
+    $(OUTDIR)UnixFileDescriptorHandle.$(O) \
+    $(OUTDIR)UnixFileHandle.$(O) \
+    $(OUTDIR)UnixOperatingSystem.$(O) \
+    $(OUTDIR)OSXOperatingSystem.$(O) \
+
 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) \
     $(OUTDIR)Object.$(O) \
@@ -478,6 +479,7 @@
     $(OUTDIR)Context.$(O) \
     $(OUTDIR)Continuation.$(O) \
     $(OUTDIR)Delay.$(O) \
+    $(OUTDIR)EOFObject.$(O) \
     $(OUTDIR)ExecutableFunction.$(O) \
     $(OUTDIR)ExternalAddress.$(O) \
     $(OUTDIR)ExternalLibrary.$(O) \
@@ -834,12 +836,12 @@
     $(OUTDIR)ZeroDivide.$(O) \
     $(OUTDIR)BadRomanNumberFormatError.$(O) \
 
-UNIX_OBJS= \
-    $(OUTDIR)UnixSyslogInterface.$(O) \
-    $(OUTDIR)UnixFileDescriptorHandle.$(O) \
-    $(OUTDIR)UnixFileHandle.$(O) \
-    $(OUTDIR)UnixOperatingSystem.$(O) \
-    $(OUTDIR)OSXOperatingSystem.$(O) \
+WIN32_OBJS= \
+    $(OUTDIR)PCFilename.$(O) \
+    $(OUTDIR)Win32Constants.$(O) \
+    $(OUTDIR)Win32Handle.$(O) \
+    $(OUTDIR)Win32FILEHandle.$(O) \
+    $(OUTDIR)Win32OperatingSystem.$(O) \