diff --git a/basis/atk/ffi/ffi.factor b/basis/atk/ffi/ffi.factor
index 8a7be511c6..3f7ad28b91 100644
--- a/basis/atk/ffi/ffi.factor
+++ b/basis/atk/ffi/ffi.factor
@@ -13,7 +13,8 @@ LIBRARY: atk
 <<
 "atk" {
     { [ os windows? ] [ "libatk-1.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libatk-1.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libatk-1.0.so" cdecl add-library ] }
 } cond
 >>
 
diff --git a/basis/cairo/ffi/ffi.factor b/basis/cairo/ffi/ffi.factor
index 6f0001d5d8..d04564c8d5 100644
--- a/basis/cairo/ffi/ffi.factor
+++ b/basis/cairo/ffi/ffi.factor
@@ -8,10 +8,10 @@ IN: cairo.ffi
 
 ! Adapted from cairo.h, version 1.8.10
 
-<< {
-    { [ os windows? ] [ "cairo" "libcairo-2.dll" cdecl add-library ] }
-    { [ os macosx? ] [ "cairo" "libcairo.dylib" cdecl add-library ] }
-    { [ os unix? ] [ ] }
+<< "cairo" {
+    { [ os windows? ] [ "libcairo-2.dll" cdecl add-library ] }
+    { [ os macosx? ] [ "libcairo.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libcairo.so" cdecl add-library ] }
 } cond >>
 
 LIBRARY: cairo
diff --git a/basis/gdk/ffi/ffi.factor b/basis/gdk/ffi/ffi.factor
index 8a3f0da6d3..ad095ba66e 100644
--- a/basis/gdk/ffi/ffi.factor
+++ b/basis/gdk/ffi/ffi.factor
@@ -16,7 +16,8 @@ LIBRARY: gdk
 <<
 "gdk" {
     { [ os windows? ] [ "libgdk-win32-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libgdk-x11-2.0.so" cdecl add-library ] }
 } cond
 >>
 
diff --git a/basis/gdk/gl/ffi/ffi.factor b/basis/gdk/gl/ffi/ffi.factor
index 507550ff98..a1ff666c2e 100644
--- a/basis/gdk/gl/ffi/ffi.factor
+++ b/basis/gdk/gl/ffi/ffi.factor
@@ -10,4 +10,12 @@ IN: gdk.gl.ffi
 
 LIBRARY: gdk.gl
 
+<<
+"gdk.gl" {
+    { [ os windows? ] [ "libgdkglext-win32-1.0-0.dll" cdecl add-library ] }
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libgdkglext-x11-1.0.so" cdecl add-library ] }
+} cond
+>>
+
 GIR: vocab:gdk/gl/GdkGLExt-1.0.gir
diff --git a/basis/gdk/pixbuf/ffi/ffi.factor b/basis/gdk/pixbuf/ffi/ffi.factor
index f8a8c7db88..4f9fe23f59 100644
--- a/basis/gdk/pixbuf/ffi/ffi.factor
+++ b/basis/gdk/pixbuf/ffi/ffi.factor
@@ -15,7 +15,8 @@ LIBRARY: gdk.pixbuf
 <<
 "gdk.pixbuf" {
     { [ os windows? ] [ "libgdk_pixbuf-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libgdk_pixbuf-2.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libgdk_pixbuf-2.0.so" cdecl add-library ] }
 } cond
 >>
 
diff --git a/basis/gio/ffi/ffi.factor b/basis/gio/ffi/ffi.factor
index 96227b4679..e4df71e69b 100644
--- a/basis/gio/ffi/ffi.factor
+++ b/basis/gio/ffi/ffi.factor
@@ -13,7 +13,8 @@ LIBRARY: gio
 <<
 "gio" {
     { [ os windows? ] [ "libgio-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libgio-2.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libgio-2.0.so" cdecl add-library ] }
 } cond
 >>
 
diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index c7bca2e8be..eb96dd0133 100644
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -12,7 +12,7 @@ LIBRARY: glib
 "glib" {
     { [ os windows? ] [ "libglib-2.0-0.dll" cdecl add-library ] }
     { [ os macosx? ] [ "libglib-2.0.0.dylib" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os unix? ] [ "libglib-2.0.so" cdecl add-library ] }
 } cond
 >>
 
diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index 919f9daa0f..ccdf210a1e 100644
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -16,7 +16,8 @@ LIBRARY: gobject
 <<
 "gobject" {
     { [ os windows? ] [ "libobject-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libgobject-2.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libgobject-2.0.so" cdecl add-library ] }
 } cond
 >>
 
diff --git a/basis/gtk/ffi/ffi.factor b/basis/gtk/ffi/ffi.factor
index 18e5615c70..5e2a379f22 100644
--- a/basis/gtk/ffi/ffi.factor
+++ b/basis/gtk/ffi/ffi.factor
@@ -16,7 +16,8 @@ LIBRARY: gtk
 <<
 "gtk" {
     { [ os windows? ] [ "libgtk-win32-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libgtk-x11-2.0.so" cdecl add-library ] }
 } cond
 >>
 
diff --git a/basis/opengl/gl/gl.factor b/basis/opengl/gl/gl.factor
index ca4eec9dbd..32f7693424 100644
--- a/basis/opengl/gl/gl.factor
+++ b/basis/opengl/gl/gl.factor
@@ -3,8 +3,9 @@
 
 ! This file is based on the gl.h that comes with xorg-x11 6.8.2
 
-USING: alien alien.c-types alien.syntax combinators kernel parser
-sequences system words opengl.gl.extensions io.encodings.ascii ;
+USING: alien alien.c-types alien.libraries alien.syntax
+combinators kernel parser sequences system words
+opengl.gl.extensions io.encodings.ascii ;
 FROM: alien.c-types => short ;
 IN: opengl.gl
 
@@ -628,6 +629,13 @@ CONSTANT: GL_CLIENT_ALL_ATTRIB_BITS         0xFFFFFFFF
 
 LIBRARY: gl
 
+<<
+"gl" {
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libGL.so" cdecl add-library ] }
+} cond
+>>
+
 ! Miscellaneous
 
 FUNCTION: void glClearIndex ( GLfloat c ) ;
diff --git a/basis/pango/cairo/ffi/ffi.factor b/basis/pango/cairo/ffi/ffi.factor
index d9038090d1..6537d86c3a 100644
--- a/basis/pango/cairo/ffi/ffi.factor
+++ b/basis/pango/cairo/ffi/ffi.factor
@@ -14,7 +14,7 @@ LIBRARY: pango.cairo
 "pango.cairo" {
     { [ os windows? ] [ "libpangocairo-1.0-0.dll" cdecl add-library ] }
     { [ os macosx? ] [ drop ] }
-    { [ os unix? ] [ drop ] }
+    { [ os unix? ] [ "libpangocairo-1.0.so" cdecl add-library ] }
 } cond 
 >>
 
diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor
index 5c7d99dc5e..21ccfa41d2 100644
--- a/basis/pango/ffi/ffi.factor
+++ b/basis/pango/ffi/ffi.factor
@@ -14,8 +14,9 @@ LIBRARY: pango
 << 
 "pango" {
     { [ os windows? ] [ "libpango-1.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
-} cond 
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libpango-1.0.so" cdecl add-library ] }
+} cond
 >>
 
 IMPLEMENT-STRUCTS: PangoRectangle ;