--- a/Make.spec	Fri Apr 01 13:53:55 2016 +0200
+++ b/Make.spec	Fri Apr 01 13:56:13 2016 +0200
@@ -50,6 +50,25 @@
 # STCWARNINGS=-warnEOLComments
 STCWARNINGS=-warnNonStandard -warnUnused
 
+UNIX_CLASSES= \
+	UnixFileDescriptorHandle \
+	UnixFileHandle \
+	UnixOperatingSystem \
+	OSXOperatingSystem \
+
+WIN32_CLASSES= \
+	Win32Process \
+	PCFilename \
+	Win32Constants \
+	Win32Handle \
+	Win32FILEHandle \
+	Win32OperatingSystem \
+
+VMS_CLASSES= \
+	OpenVMSFileHandle \
+	OpenVMSFilename \
+	OpenVMSOperatingSystem \
+
 COMMON_CLASSES= \
 	Autoload \
 	Object \
@@ -147,6 +166,7 @@
 	Set \
 	SmalltalkChunkFileSourceReader \
 	SmalltalkLanguage \
+	StandaloneStartupHeadless \
 	True \
 	UnixFilename \
 	WeakInterestConverter \
@@ -402,27 +422,27 @@
 	PipeStream \
 	RomanNumberFormatError \
 
-WIN32_CLASSES= \
-	PCFilename \
-	Win32Constants \
-	Win32FILEHandle \
-	Win32Handle \
-	Win32OperatingSystem \
-	Win32Process \
-
-UNIX_CLASSES= \
-	UnixFileDescriptorHandle \
-	UnixFileHandle \
-	UnixOperatingSystem \
-	OSXOperatingSystem \
-
-VMS_CLASSES= \
-	OpenVMSFileHandle \
-	OpenVMSFilename \
-	OpenVMSOperatingSystem \
 
 
 
+UNIX_OBJS= \
+    $(OUTDIR_SLASH)UnixFileDescriptorHandle.$(O) \
+    $(OUTDIR_SLASH)UnixFileHandle.$(O) \
+    $(OUTDIR_SLASH)UnixOperatingSystem.$(O) \
+    $(OUTDIR_SLASH)OSXOperatingSystem.$(O) \
+
+WIN32_OBJS= \
+    $(OUTDIR_SLASH)Win32Process.$(O) \
+    $(OUTDIR_SLASH)PCFilename.$(O) \
+    $(OUTDIR_SLASH)Win32Constants.$(O) \
+    $(OUTDIR_SLASH)Win32Handle.$(O) \
+    $(OUTDIR_SLASH)Win32FILEHandle.$(O) \
+    $(OUTDIR_SLASH)Win32OperatingSystem.$(O) \
+
+VMS_OBJS= \
+    $(OUTDIR_SLASH)OpenVMSFileHandle.$(O) \
+    $(OUTDIR_SLASH)OpenVMSFilename.$(O) \
+    $(OUTDIR_SLASH)OpenVMSOperatingSystem.$(O) \
 
 COMMON_OBJS= \
     $(OUTDIR_SLASH)Autoload.$(O) \
@@ -521,6 +541,7 @@
     $(OUTDIR_SLASH)Set.$(O) \
     $(OUTDIR_SLASH)SmalltalkChunkFileSourceReader.$(O) \
     $(OUTDIR_SLASH)SmalltalkLanguage.$(O) \
+    $(OUTDIR_SLASH)StandaloneStartupHeadless.$(O) \
     $(OUTDIR_SLASH)True.$(O) \
     $(OUTDIR_SLASH)UnixFilename.$(O) \
     $(OUTDIR_SLASH)WeakInterestConverter.$(O) \
@@ -776,24 +797,5 @@
     $(OUTDIR_SLASH)PipeStream.$(O) \
     $(OUTDIR_SLASH)RomanNumberFormatError.$(O) \
 
-WIN32_OBJS= \
-    $(OUTDIR_SLASH)PCFilename.$(O) \
-    $(OUTDIR_SLASH)Win32Constants.$(O) \
-    $(OUTDIR_SLASH)Win32FILEHandle.$(O) \
-    $(OUTDIR_SLASH)Win32Handle.$(O) \
-    $(OUTDIR_SLASH)Win32OperatingSystem.$(O) \
-    $(OUTDIR_SLASH)Win32Process.$(O) \
-
-UNIX_OBJS= \
-    $(OUTDIR_SLASH)UnixFileDescriptorHandle.$(O) \
-    $(OUTDIR_SLASH)UnixFileHandle.$(O) \
-    $(OUTDIR_SLASH)UnixOperatingSystem.$(O) \
-    $(OUTDIR_SLASH)OSXOperatingSystem.$(O) \
-
-VMS_OBJS= \
-    $(OUTDIR_SLASH)OpenVMSFileHandle.$(O) \
-    $(OUTDIR_SLASH)OpenVMSFilename.$(O) \
-    $(OUTDIR_SLASH)OpenVMSOperatingSystem.$(O) \
 
 
-