--- a/stx_libbasic.st	Wed Dec 28 22:58:47 2016 +0000
+++ b/stx_libbasic.st	Thu Jan 05 21:02:10 2017 +0000
@@ -248,6 +248,7 @@
         CompiledCode
         ControlInterrupt
         Date
+        EventSemaphore
         Exception
         ExternalFunction
         False
@@ -264,7 +265,6 @@
         NoHandlerError
         Notification
         OSHandle
-        (PCFilename win32)
         PeekableStream
         Process
         QuerySignal
@@ -277,7 +277,6 @@
         True
         UnixFilename
         WeakInterestConverter
-        (Win32Constants win32)
         ArrayedCollection
         Association
         Block
@@ -347,7 +346,6 @@
         UserConfirmation
         UserInterrupt
         UserNotification
-        (Win32Handle win32)
         YesToAllConfirmation
         #'stx_libbasic'
         AbortAllOperationRequest
@@ -397,6 +395,9 @@
         TerminateProcessRequest
         TimeDuration
         UninterpretedBytes
+        (UnixFileDescriptorHandle unix)
+        (UnixFileHandle unix)
+        (UnixOperatingSystem unix)
         UserInformation
         UtcTimestamp
         VMInternalError
@@ -405,7 +406,6 @@
         WeakArray
         WeakIdentitySet
         WeakValueDictionary
-        (Win32FILEHandle win32)
         WriteStream
         AbortOperationRequest
         AbstractNumberVector
@@ -431,6 +431,7 @@
         LargeInteger
         LongFloat
         OSSignalInterrupt
+        (OSXOperatingSystem unix)
         OsIllegalOperation
         OsInaccessibleError
         OsInvalidArgumentsError
@@ -499,7 +500,6 @@
         UnimplementedFunctionalityError
         UnprotectedExternalBytes
         WeakDependencyDictionary
-        (Win32OperatingSystem win32)
         WriteError
         AbstractClassInstantiationError
         BadLiteralsError
@@ -550,10 +550,11 @@
         UnderflowError
         ZeroDivide
         BadRomanNumberFormatError
-        (UnixFileDescriptorHandle unix)
-        (UnixFileHandle unix)
-        (UnixOperatingSystem unix)
-        (OSXOperatingSystem unix)
+        (PCFilename win32)
+        (Win32Constants win32)
+        (Win32Handle win32)
+        (Win32FILEHandle win32)
+        (Win32OperatingSystem win32)
         (OpenVMSFileHandle vms)
         (OpenVMSFilename vms)
         (OpenVMSOperatingSystem vms)