remove graphics.layout, remove qualified as

src/libraries/OS-Independent/Graphics/Layout.dcl

-definition module Graphics.Layout
-
-:: GridDimension = Rows !Int | Columns !Int
-:: GridLayout  :== (!GridMajor, !GridXLayout, !GridYLayout)
-:: GridMajor     = ColumnMajor | RowMajor
-:: GridXLayout   = LeftToRight | RightToLeft
-:: GridYLayout   = TopToBottom | BottomToTop
-
-:: XAlign
-  = AtLeft
-  | AtMiddleX
-  | AtRight
-
-:: YAlign
-  = AtTop
-  | AtMiddleY
-  | AtBottom
-
-:: XYAlign :== (!XAlign, !YAlign)
-
-class Layout thing ~size ~offset ~host where
-  collage :: [offset] [thing m] (host m) -> thing m
-  overlay ::                                        [XYAlign]
-             [offset] [thing m] (host m) -> thing m
-  beside  ::                          [size]        [YAlign]
-             [offset] [thing m] (host m) -> thing m
-  above   ::                                 [size] [XAlign]
-             [offset] [thing m] (host m) -> thing m
-  grid    :: GridDimension GridLayout [size] [size] [XYAlign]
-             [offset] [thing m] (host m) -> thing m
-
-class Fit thing ~dim where
-  fitXY   :: dim dim (thing m) -> thing m
-  fitX    ::     dim (thing m) -> thing m
-  fitY    ::     dim (thing m) -> thing m
-
-class DimRef tag ~unit where
-  xdim    :: tag -> unit
-  ydim    :: tag -> unit

src/libraries/OS-Independent/Graphics/Layout.icl

-implementation module Graphics.Layout

src/libraries/OS-Independent/System/Socket.dcl

@@ -2,7 +2,7 @@ definition module System.Socket
 
 from StdOverloaded import class toInt
 from Data.Error import :: MaybeError, :: MaybeErrorString
-from System._Pointer import :: Pointer(..)
+from System._Pointer import :: Pointer
 from System._Socket import :: Socket
 from System.OSError import :: MaybeOSError, :: OSError, :: OSErrorMessage, :: OSErrorCode
 

src/libraries/OS-Independent/System/Socket.icl

 implementation module System.Socket
 
 import StdEnv
-import System._Socket => qualified socket, bind, listen, accept, close, connect, send, recv, hostToNetworkByteOrderLong, hostToNetworkByteOrderShort, networkToHostByteOrderShort, networkToHostByteOrderLong
+import qualified System._Socket
+from System._Socket import :: Socket, SOCK_STREAM, SOCK_DGRAM, MSG_DONTROUTE, MSG_OOB, MSG_WAITALL, MSG_PEEK
 import System.OSError
 
 instance toInt SocketType where

src/libraries/OS-Posix/System/_Socket.icl

@@ -5,7 +5,8 @@ import Data.Error
 import System.OSError
 import System._Pointer
 import System._Posix
-import System.Socket => qualified socket, bind, listen, accept, close, connect, send, recv, networkToHostByteOrderLong, networkToHostByteOrderShort, hostToNetworkByteOrderLong, hostToNetworkByteOrderShort
+import qualified System.Socket
+from System.Socket import :: SocketType(..), class SocketAddress(..), :: SendFlag, :: RecvFlag, instance toInt SendFlag, instance toInt RecvFlag, instance toInt SocketType
 
 :: *Socket a :== Int
 

src/libraries/OS-Windows/System/_Socket.icl

@@ -3,7 +3,8 @@ implementation module System._Socket
 import Data.Error
 import StdEnv
 import System.OSError
-import System.Socket => qualified socket, bind, listen, accept, close, connect, send, recv, networkToHostByteOrderLong, networkToHostByteOrderShort, hostToNetworkByteOrderLong, hostToNetworkByteOrderShort
+import qualified System.Socket
+from System.Socket import :: SocketType(..), class SocketAddress(..), :: SendFlag, :: RecvFlag, instance toInt SendFlag, instance toInt RecvFlag, instance toInt SocketType
 import System._Pointer
 import System._WinBase
 

tests/linux64/test.icl

@@ -154,7 +154,6 @@ import qualified Database.SQL._MySQL
 import qualified Database.SQL._SQLite
 import qualified Debug.Performance
 import qualified Debug.Trace
-//import qualified Graphics.Layout
 import qualified Graphics.Scalable.Extensions
 import qualified Graphics.Scalable.Image
 import qualified Graphics.Scalable.Internal.Image`