--- a/src/code/exports.lisp
+++ b/src/code/exports.lisp
@@ -658,7 +658,7 @@
 	   "W_OK"
 	   "X_OK"
 	   )
-  #-linux
+  #+linux
   (:export "UNIX-CURRENT-DIRECTORY"
 	   "UNIX-OPEN"
 	   "UNIX-READ"
@@ -773,6 +773,347 @@
 
 	   ;; Tests
 	   "UNIX-SYMLINK"
+
+	   ;; Other symbols
+	   "BLKCNT-T"
+	   "C-CC"
+	   "C-CFLAG"
+	   "CHECK"
+	   "C-IFLAG"
+	   "C-ISPEED"
+	   "C-LFLAG"
+	   "C-OFLAG"
+	   "C-OSPEED"
+	   "D-INO"
+	   "D-NAME"
+	   "D-OFF"
+	   "D-RECLEN"
+	   "E2BIG"
+	   "EACCES"
+	   "EADDRINUSE"
+	   "EADDRNOTAVAIL"
+	   "EADV"
+	   "EAFNOSUPPORT"
+	   "EAGAIN"
+	   "EALREADY"
+	   "EBADE"
+	   "EBADF"
+	   "EBADFD"
+	   "EBADMSG"
+	   "EBADR"
+	   "EBADRQC"
+	   "EBADSLT"
+	   "EBFONT"
+	   "EBUSY"
+	   "ECHILD"
+	   "ECHRNG"
+	   "ECOMM"
+	   "ECONNABORTED"
+	   "ECONNREFUSED"
+	   "ECONNRESET"
+	   "EDEADLK"
+	   "EDEADLOCK"
+	   "EDESTADDRREQ"
+	   "EDOM"
+	   "EDOTDOT"
+	   "EDQUOT"
+	   "EEXIST"
+	   "EFAULT"
+	   "EFBIG"
+	   "EHOSTDOWN"
+	   "EHOSTUNREACH"
+	   "EIDRM"
+	   "EILSEQ"
+	   "EINPROGRESS"
+	   "EINTR"
+	   "EINVAL"
+	   "EIO"
+	   "EISCONN"
+	   "EISDIR"
+	   "EISNAM"
+	   "EL2HLT"
+	   "EL2NSYNC"
+	   "EL3HLT"
+	   "EL3RST"
+	   "ELIBACC"
+	   "ELIBBAD"
+	   "ELIBEXEC"
+	   "ELIBMAX"
+	   "ELIBSCN"
+	   "ELNRNG"
+	   "ELOOP"
+	   "EMFILE"
+	   "EMLINK"
+	   "EMSGSIZE"
+	   "EMULTIHOP"
+	   "ENAMETOOLONG"
+	   "ENAVAIL"
+	   "ENETDOWN"
+	   "ENETRESET"
+	   "ENETUNREACH"
+	   "ENFILE"
+	   "ENOANO"
+	   "ENOBUFS"
+	   "ENOCSI"
+	   "ENODATA"
+	   "ENODEV"
+	   "ENOENT"
+	   "ENOEXEC"
+	   "ENOLCK"
+	   "ENOLINK"
+	   "ENOMEM"
+	   "ENOMSG"
+	   "ENONET"
+	   "ENOPKG"
+	   "ENOPROTOOPT"
+	   "ENOSPC"
+	   "ENOSR"
+	   "ENOSTR"
+	   "ENOSYS"
+	   "ENOTBLK"
+	   "ENOTCONN"
+	   "ENOTDIR"
+	   "ENOTEMPTY"
+	   "ENOTNAM"
+	   "ENOTSOCK"
+	   "ENOTTY"
+	   "ENOTUNIQ"
+	   "ENXIO"
+	   "EOPNOTSUPP"
+	   "EOVERFLOW"
+	   "EPERM"
+	   "EPFNOSUPPORT"
+	   "EPIPE"
+	   "EPROTO"
+	   "EPROTONOSUPPORT"
+	   "EPROTOTYPE"
+	   "ERANGE"
+	   "EREMCHG"
+	   "EREMOTE"
+	   "EREMOTEIO"
+	   "ERESTART"
+	   "EROFS"
+	   "ESHUTDOWN"
+	   "ESOCKTNOSUPPORT"
+	   "ESPIPE"
+	   "ESRCH"
+	   "ESRMNT"
+	   "ESTALE"
+	   "ESTRPIPE"
+	   "ESUCCESS"
+	   "ETIME"
+	   "ETIMEDOUT"
+	   "ETOOMANYREFS"
+	   "ETXTBSY"
+	   "EUCLEAN"
+	   "EUNATCH"
+	   "EUSERS"
+	   "EWOULDBLOCK"
+	   "EXDEV"
+	   "EXFULL"
+	   "FAPPEND"
+	   "FASYNC"
+	   "FD-SET"
+	   "FD-ZERO"
+	   "F-GETFL"
+	   "F-GETOWN"
+	   "FNDELAY"
+	   "F_OK"
+	   "F-SETFL"
+	   "F-SETOWN"
+	   "GID-T"
+	   "ITIMERVAL"
+	   "IT-INTERVAL"
+	   "IT-VALUE"
+	   "L_INCR"
+	   "L_SET"
+	   "L_XTND"
+	   "MAP_ANONYMOUS"
+	   "MAP_FIXED"
+	   "MAP_PRIVATE"
+	   "MAP_SHARED"
+	   "MS_ASYNC"
+	   "MS_INVALIDATE"
+	   "MS_SYNC"
+	   "O_APPEND"
+	   "O_CREAT"
+	   "O_EXCL"
+	   "O_NDELAY"
+	   "O_NOCTTY"
+	   "O_NONBLOCK"
+	   "O_RDONLY"
+	   "O_RDWR"
+	   "O_TRUNC"
+	   "O_WRONLY"
+	   "PROT_EXEC"
+	   "PROT_NONE"
+	   "PROT_WRITE"
+	   "R_OK"
+	   "RU-IDRSS"
+	   "RU-INBLOCK"
+	   "RU-ISRSS"
+	   "RU-IXRSS"
+	   "RU-MAJFLT"
+	   "RU-MAXRSS"
+	   "RU-MINFLT"
+	   "RU-MSGRCV"
+	   "RU-MSGSND"
+	   "RU-NIVCSW"
+	   "RU-NSIGNALS"
+	   "RU-NSWAP"
+	   "RU-NVCSW"
+	   "RU-OUBLOCK"
+	   "RUSAGE_CHILDREN"
+	   "RUSAGE_SELF"
+	   "RU-STIME"
+	   "RU-UTIME"
+	   "S-IFBLK"
+	   "S-IFCHR"
+	   "S-IFDIR"
+	   "S-IFLNK"
+	   "S-IFMT"
+	   "S-IFREG"
+	   "S-IFSOCK"
+	   "SIGABRT"
+	   "SIGALRM"
+	   "SIGBUS"
+	   "SIGCHLD"
+	   "SIGCONT"
+	   "SIGCONTEXT"
+	   "SIGFPE"
+	   "SIGHUP"
+	   "SIGILL"
+	   "SIGINT"
+	   "SIGIO"
+	   "SIGIOT"
+	   "SIGKILL"
+	   "SIGMASK"
+	   "SIGPIPE"
+	   "SIGPROF"
+	   "SIGQUIT"
+	   "SIGSEGV"
+	   "SIGSTKFLT"
+	   "SIGSTOP"
+	   "SIGTERM"
+	   "SIGTRAP"
+	   "SIGTSTP"
+	   "SIGTTIN"
+	   "SIGTTOU"
+	   "SIGURG"
+	   "SIGUSR1"
+	   "SIGUSR2"
+	   "SIGVTALRM"
+	   "SIGWINCH"
+	   "SIGXCPU"
+	   "SIGXFSZ"
+	   "STAT"
+	   "ST-ATIME"
+	   "ST-BLKSIZE"
+	   "ST-BLOCKS"
+	   "ST-CTIME"
+	   "ST-DEV"
+	   "ST-GID"
+	   "ST-MODE"
+	   "ST-MTIME"
+	   "ST-NLINK"
+	   "ST-RDEV"
+	   "ST-SIZE"
+	   "ST-UID"
+	   "TCSADRAIN"
+	   "TCSAFLUSH"
+	   "TCSANOW"
+	   "TIOCGPGRP"
+	   "TIOCGWINSZ"
+	   "TIOCNOTTY"
+	   "TIOCSPGRP"
+	   "TIOCSWINSZ"
+	   "TTY-BRKINT"
+	   "TTY-ECHO"
+	   "TTY-ECHOCTL"
+	   "TTY-ECHOE"
+	   "TTY-ECHOK"
+	   "TTY-ECHOKE"
+	   "TTY-ECHONL"
+	   "TTY-ECHOPRT"
+	   "TTY-FLUSHO"
+	   "TTY-ICANON"
+	   "TTY-ICRNL"
+	   "TTY-IEXTEN"
+	   "TTY-IGNBRK"
+	   "TTY-IGNCR"
+	   "TTY-IGNPAR"
+	   "TTY-IMAXBEL"
+	   "TTY-INLCR"
+	   "TTY-INPCK"
+	   "TTY-ISIG"
+	   "TTY-ISTRIP"
+	   "TTY-IUCLC"
+	   "TTY-IXANY"
+	   "TTY-IXOFF"
+	   "TTY-IXON"
+	   "TTY-NOFLSH"
+	   "TTY-OCRNL"
+	   "TTY-OFDEL"
+	   "TTY-OFILL"
+	   "TTY-OLCUC"
+	   "TTY-ONLCR"
+	   "TTY-ONLRET"
+	   "TTY-ONOCR"
+	   "TTY-OPOST"
+	   "TTY-PARMRK"
+	   "TTY-PENDIN"
+	   "TTY-TOSTOP"
+	   "TTY-XCASE"
+	   "TV-SEC"
+	   "TV-USEC"
+	   "TZ-DSTTIME"
+	   "TZ-MINUTESWEST"
+	   "UID-T"
+	   "UNIX-DUP2"
+	   "UNIX-FD"
+	   "UNIX-FILE-KIND"
+	   "UNIX-FILE-MODE"
+	   "UNIX-GETITIMER"
+	   "UNIX-GETUID"
+	   "UNIX-KILL"
+	   "UNIX-KILLPG"
+	   "UNIX-PATHNAME"
+	   "UNIX-PID"
+	   "UNIX-SIGBLOCK"
+	   "UNIX-SIGNAL-DESCRIPTION"
+	   "UNIX-SIGNAL-NAME"
+	   "UNIX-SIGNAL-NUMBER"
+	   "UNIX-SIGPAUSE"
+	   "UNIX-SIGSETMASK"
+	   "UNIX-UNAME"
+	   "USER-INFO"
+	   "USER-INFO-DIR"
+	   "USER-INFO-GECOS"
+	   "USER-INFO-GID"
+	   "USER-INFO-PASSWORD"
+	   "USER-INFO-SHELL"
+	   "USER-INFO-UID"
+	   "UTSNAME"
+	   "VDSUSP"
+	   "VEOF"
+	   "VEOL"
+	   "VEOL2"
+	   "VERASE"
+	   "VINTR"
+	   "VKILL"
+	   "VMIN"
+	   "VQUIT"
+	   "VSTART"
+	   "VSTOP"
+	   "VSUSP"
+	   "VTIME"
+	   "W_OK"
+	   "WRITEOWN"
+	   "WS-COL"
+	   "WS-ROW"
+	   "WS-XPIXEL"
+	   "WS-YPIXEL"
+	   "X_OK"
 	   ))
 
   

--- a/src/code/unix-glibc2.lisp
+++ b/src/code/unix-glibc2.lisp
@@ -67,142 +67,6 @@
 ;; Must be set to NIL initially to enable building Lisp!
 (defvar *filename-encoding* nil)
 
-(export '(
-	  daddr-t caddr-t ino-t swblk-t size-t time-t dev-t off-t uid-t gid-t
-          blkcnt-t fsblkcnt-t fsfilcnt-t
-	  unix-lockf f_ulock f_lock f_tlock f_test
-	  timeval tv-sec tv-usec timezone tz-minuteswest tz-dsttime
-	  itimerval it-interval it-value tchars t-intrc t-quitc t-startc
-	  t-stopc t-eofc t-brkc ltchars t-suspc t-dsuspc t-rprntc t-flushc
-	  t-werasc t-lnextc sgttyb sg-ispeed sg-ospeed sg-erase sg-kill
-	  sg-flags winsize ws-row ws-col ws-xpixel ws-ypixel
-	  direct d-off d-ino d-reclen  d-name
-	  stat st-dev st-mode st-nlink st-uid st-gid st-rdev st-size
-	  st-atime st-mtime st-ctime st-blksize st-blocks
-	  s-ifmt s-ifdir s-ifchr s-ifblk s-ifreg s-iflnk s-ifsock
-	  s-isuid s-isgid s-isvtx s-iread s-iwrite s-iexec
-	  ruseage ru-utime ru-stime ru-maxrss ru-ixrss ru-idrss
-	  ru-isrss ru-minflt ru-majflt ru-nswap ru-inblock ru-oublock
-	  ru-msgsnd ru-msgrcv ru-nsignals ru-nvcsw ru-nivcsw
-	  rlimit rlim-cur rlim-max sc-onstack sc-mask sc-pc
-	  unix-errno get-unix-error-msg
-	  prot_read prot_write prot_exec prot_none
-	  map_shared map_private map_fixed map_anonymous
-	  ms_async ms_sync ms_invalidate
-	  unix-mmap unix-munmap unix-msync unix-mprotect
-	  unix-pathname unix-file-mode unix-fd unix-pid unix-uid unix-gid
-	  unix-setitimer unix-getitimer
-	  unix-access r_ok w_ok x_ok f_ok unix-chdir unix-chmod setuidexec
-	  setgidexec savetext readown writeown execown readgrp writegrp
-	  execgrp readoth writeoth execoth unix-fchmod unix-chown unix-fchown
-	  unix-getdtablesize unix-close unix-creat unix-dup unix-dup2
-	  unix-fcntl f-dupfd f-getfd f-setfd f-getfl f-setfl f-getown f-setown
-	  fndelay fappend fasync fcreat ftrunc fexcl unix-link unix-lseek
-	  l_set l_incr l_xtnd unix-mkdir unix-open o_rdonly o_wronly o_rdwr
-	  o_ndelay
-	  o_noctty
-	  o_append o_creat o_trunc o_excl unix-pipe unix-read unix-readlink
-	  unix-rename unix-rmdir unix-fast-select fd-setsize fd-set fd-clr
-	  fd-isset fd-zero unix-select unix-sync unix-fsync unix-truncate
-	  unix-ftruncate unix-symlink unix-unlink unix-write unix-ioctl
-	  unix-uname utsname
-	  tcsetpgrp tcgetpgrp tty-process-group
-	  terminal-speeds tty-raw tty-crmod tty-echo tty-lcase
-	  tty-cbreak
-	   termios
-           c-lflag
-	   c-iflag
-           c-oflag
-	   tty-icrnl
-           tty-ocrnl
-	   veof
-	   vintr
-           vquit
-           vstart
-	   vstop
-           vsusp
-	   c-cflag
-	   c-cc
-           tty-icanon
-	   vmin
-           vtime
-	   tty-ixon
-           tcsanow
-           tcsadrain
-           tciflush
-           tcoflush
-           tcioflush
-	   tcsaflush
-           unix-tcgetattr
-           unix-tcsetattr
-           tty-ignbrk
-           tty-brkint
-           tty-ignpar
-           tty-parmrk
-           tty-inpck
-           tty-istrip
-           tty-inlcr
-           tty-igncr
-           tty-iuclc
-           tty-ixany
-           tty-ixoff
-	  tty-imaxbel
-           tty-opost
-           tty-olcuc
-           tty-onlcr
-           tty-onocr
-           tty-onlret
-           tty-ofill
-           tty-ofdel
-           tty-isig
-           tty-xcase
-           tty-echoe
-           tty-echok
-           tty-echonl
-           tty-noflsh
-           tty-iexten
-           tty-tostop
-           tty-echoctl
-           tty-echoprt
-           tty-echoke
-           tty-pendin
-           tty-cstopb
-           tty-cread
-           tty-parenb
-           tty-parodd
-           tty-hupcl
-           tty-clocal
-           vintr
-           verase
-           vkill
-           veol
-           veol2
-	  TIOCGETP TIOCSETP TIOCFLUSH TIOCSETC TIOCGETC TIOCSLTC
-	  TIOCGLTC TIOCNOTTY TIOCSPGRP TIOCGPGRP TIOCGWINSZ TIOCSWINSZ
-	  TIOCSIGSEND
-
-	  KBDCGET KBDCSET KBDCRESET KBDCRST KBDCSSTD KBDSGET KBDGCLICK
-	  KBDSCLICK FIONREAD	  unix-exit unix-stat unix-lstat unix-fstat
-	  unix-getrusage unix-fast-getrusage rusage_self rusage_children
-	  unix-gettimeofday
-	  unix-utimes unix-sched-yield unix-setreuid
-	  unix-setregid
-	  unix-getpid unix-getppid
-	  unix-getgid unix-getegid unix-getpgrp unix-setpgrp unix-getuid
-	  unix-getpagesize unix-gethostname unix-gethostid unix-fork
-	  unix-getenv unix-setenv unix-putenv unix-unsetenv
-	  unix-current-directory unix-isatty unix-ttyname unix-execve
-	  unix-socket unix-connect unix-bind unix-listen unix-accept
-	  unix-recv unix-send unix-getpeername unix-getsockname
-	  unix-getsockopt unix-setsockopt unix-openpty
-
-	  unix-recvfrom unix-sendto unix-shutdown
-
-          unix-getpwnam unix-getpwuid unix-getgrnam unix-getgrgid
-          user-info user-info-name user-info-password user-info-uid
-          user-info-gid user-info-gecos user-info-dir user-info-shell
-          group-info group-info-name group-info-gid group-info-members))
-
 (pushnew :unix *features*)
 (pushnew :glibc2 *features*)