diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 1bb1f31d04..d69f8b5232 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -641,7 +641,7 @@ def build(bld):
         ]
     obj.install_path = bld.env['DLLDIR']
     obj.linkflags    = ''
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
 
     if sys.platform == 'darwin':
         obj.uselib += ' AUDIOUNITS OSX '
diff --git a/headless/wscript b/headless/wscript
index 0aea4751c2..30e118ac81 100644
--- a/headless/wscript
+++ b/headless/wscript
@@ -58,10 +58,12 @@ def build(bld):
         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         ]
     obj.install_path = bld.env['LIBDIR']
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
-    obj.uselib       += ' FFTW3F'
-    obj.uselib       += ' AUDIOUNITS OSX LO '
-    obj.uselib       += ' TAGLIB '
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
+    obj.uselib       += ' AUDIOUNITS OSX'
+    obj.uselib       += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
+
+    if bld.is_defined('HAVE_SUIL'):
+        obj.uselib += ' SUIL'
 
     if sys.platform == 'darwin':
         obj.uselib += ' AUDIOUNITS OSX'
diff --git a/libs/fst/wscript b/libs/fst/wscript
index 0ef6cfe396..4a1e4908f7 100644
--- a/libs/fst/wscript
+++ b/libs/fst/wscript
@@ -75,7 +75,7 @@ def build(bld):
             obj.linkflags = ['-mwindows']
             obj.use = [ 'libpbd', 'vstwin' ]
         else:
-            obj.uselib = ['GIOMM', 'DL', 'OSX']
+            obj.uselib = ['GIOMM', 'DL', 'OSX', 'XML', 'ARCHIVE', 'CURL']
             obj.use = [ 'libpbd' ]
 
     obj.includes  = [ '../pbd/', '../ardour/', '.' ]
diff --git a/session_utils/wscript b/session_utils/wscript
index 8e5dc449be..753b8ea8ab 100644
--- a/session_utils/wscript
+++ b/session_utils/wscript
@@ -55,10 +55,12 @@ def build_ardour_util(bld, util):
         'PACKAGE="'    + "ARDOURUTILS" + '"',
         ]
     obj.install_path = bld.env['LIBDIR'] + '/utils'
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
-    obj.uselib       += ' FFTW3F'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' AUDIOUNITS OSX LO '
-    obj.uselib       += ' TAGLIB '
+    obj.uselib       += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
+
+    if bld.is_defined('HAVE_SUIL'):
+        obj.uselib += ' SUIL'
 
     if sys.platform == 'darwin':
         obj.uselib += ' AUDIOUNITS OSX'
diff --git a/tools/luadevel/wscript b/tools/luadevel/wscript
index f076e72f56..7cf7803889 100755
--- a/tools/luadevel/wscript
+++ b/tools/luadevel/wscript
@@ -74,11 +74,13 @@ def build(bld):
         'PACKAGE="'    + "ARDOURUTILS" + '"',
         ]
 
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
-    obj.uselib       += ' FFTW3F'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' AUDIOUNITS OSX LO '
-    obj.uselib       += ' TAGLIB '
     obj.uselib       += ' READLINE '
+    obj.uselib       += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
+
+    if bld.is_defined('HAVE_SUIL'):
+        obj.uselib += ' SUIL'
 
     if sys.platform == 'darwin':
         obj.uselib += ' AUDIOUNITS OSX'