diff --git a/plugins/input/csv/build.py b/plugins/input/csv/build.py
index fa1b5cb68..f21c93f0a 100644
--- a/plugins/input/csv/build.py
+++ b/plugins/input/csv/build.py
@@ -48,13 +48,13 @@ else:
 
     # Link Library to Dependencies
     libraries = []
-    libraries.append('boost_system%s' % env['BOOST_APPEND'])
-    libraries.append(env['ICU_LIB_NAME'])
     libraries.append('mapnik-json')
     libraries.append('mapnik-wkt')
 
     if env['PLUGIN_LINKING'] == 'shared':
-        libraries.append(env['MAPNIK_NAME'])
+        libraries.append('boost_system%s' % env['BOOST_APPEND'])
+        libraries.insert(0,env['MAPNIK_NAME'])
+        libraries.append(env['ICU_LIB_NAME'])
 
         TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                           SHLIBPREFIX='',
diff --git a/plugins/input/gdal/build.py b/plugins/input/gdal/build.py
index 6c80de24b..0db10c208 100644
--- a/plugins/input/gdal/build.py
+++ b/plugins/input/gdal/build.py
@@ -45,9 +45,9 @@ if env['RUNTIME_LINK'] == 'static':
 libraries = copy(plugin_env['LIBS'])
 
 if env['PLUGIN_LINKING'] == 'shared':
+    libraries.append('boost_system%s' % env['BOOST_APPEND'])
     libraries.insert(0,env['MAPNIK_NAME'])
     libraries.append(env['ICU_LIB_NAME'])
-    libraries.append('boost_system%s' % env['BOOST_APPEND'])
 
     TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                       SHLIBPREFIX='',
diff --git a/plugins/input/geojson/build.py b/plugins/input/geojson/build.py
index 7435be5fa..90013601b 100644
--- a/plugins/input/geojson/build.py
+++ b/plugins/input/geojson/build.py
@@ -48,12 +48,12 @@ else:
 
     # Link Library to Dependencies
     libraries = []
-    libraries.append(env['ICU_LIB_NAME'])
-    libraries.append('boost_system%s' % env['BOOST_APPEND'])
     libraries.append('mapnik-json')
 
     if env['PLUGIN_LINKING'] == 'shared':
-        libraries.append(env['MAPNIK_NAME'])
+        libraries.append('boost_system%s' % env['BOOST_APPEND'])
+        libraries.insert(0,env['MAPNIK_NAME'])
+        libraries.append(env['ICU_LIB_NAME'])
 
         TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                           SHLIBPREFIX='',
diff --git a/plugins/input/ogr/build.py b/plugins/input/ogr/build.py
index 908cf1940..143289d69 100644
--- a/plugins/input/ogr/build.py
+++ b/plugins/input/ogr/build.py
@@ -51,9 +51,9 @@ libraries = copy(plugin_env['LIBS'])
 plugin_env.Append(CXXFLAGS=cxxflags)
 
 if env['PLUGIN_LINKING'] == 'shared':
+    libraries.append('boost_system%s' % env['BOOST_APPEND'])
     libraries.insert(0,env['MAPNIK_NAME'])
     libraries.append(env['ICU_LIB_NAME'])
-    libraries.append('boost_system%s' % env['BOOST_APPEND'])
 
     TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                       SHLIBPREFIX='',
diff --git a/plugins/input/pgraster/build.py b/plugins/input/pgraster/build.py
index 9d2666588..7b859ee5b 100644
--- a/plugins/input/pgraster/build.py
+++ b/plugins/input/pgraster/build.py
@@ -51,13 +51,10 @@ else:
 # Link Library to Dependencies
 libraries = copy(plugin_env['LIBS'])
 
-if env['THREADING'] == 'multi':
-    libraries.append('boost_thread%s' % env['BOOST_APPEND'])
-
 if env['PLUGIN_LINKING'] == 'shared':
+    libraries.append('boost_system%s' % env['BOOST_APPEND'])
     libraries.insert(0,env['MAPNIK_NAME'])
     libraries.append(env['ICU_LIB_NAME'])
-    libraries.append('boost_system%s' % env['BOOST_APPEND'])
 
     TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                       SHLIBPREFIX='',
diff --git a/plugins/input/postgis/build.py b/plugins/input/postgis/build.py
index 9b8ecd9a9..157952f45 100644
--- a/plugins/input/postgis/build.py
+++ b/plugins/input/postgis/build.py
@@ -51,10 +51,10 @@ else:
 libraries = copy(plugin_env['LIBS'])
 
 if env['PLUGIN_LINKING'] == 'shared':
-    libraries.insert(0,env['MAPNIK_NAME'])
-    libraries.append(env['ICU_LIB_NAME'])
     libraries.append('boost_system%s' % env['BOOST_APPEND'])
     libraries.append('boost_regex%s' % env['BOOST_APPEND'])
+    libraries.insert(0,env['MAPNIK_NAME'])
+    libraries.append(env['ICU_LIB_NAME'])
 
     TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                       SHLIBPREFIX='',
diff --git a/plugins/input/raster/build.py b/plugins/input/raster/build.py
index 324a2a908..2ca3c2e53 100644
--- a/plugins/input/raster/build.py
+++ b/plugins/input/raster/build.py
@@ -36,11 +36,11 @@ plugin_sources = Split(
 
 # Link Library to Dependencies
 libraries = []
-libraries.append(env['ICU_LIB_NAME'])
-libraries.append('boost_system%s' % env['BOOST_APPEND'])
 
 if env['PLUGIN_LINKING'] == 'shared':
-    libraries.append(env['MAPNIK_NAME'])
+    libraries.append('boost_system%s' % env['BOOST_APPEND'])
+    libraries.insert(0,env['MAPNIK_NAME'])
+    libraries.append(env['ICU_LIB_NAME'])
 
     TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                       SHLIBPREFIX='',
diff --git a/plugins/input/shape/build.py b/plugins/input/shape/build.py
index 097d602e6..3f397d02e 100644
--- a/plugins/input/shape/build.py
+++ b/plugins/input/shape/build.py
@@ -39,8 +39,6 @@ plugin_sources = Split(
 
 # Link Library to Dependencies
 libraries = []
-libraries.append(env['ICU_LIB_NAME'])
-libraries.append('boost_system%s' % env['BOOST_APPEND'])
 
 cppdefines = []
 cxxflags = []
@@ -49,7 +47,9 @@ plugin_env.Append(CXXFLAGS=cxxflags)
 plugin_env.Append(CPPDEFINES=cppdefines)
 
 if env['PLUGIN_LINKING'] == 'shared':
-    libraries.append(env['MAPNIK_NAME'])
+    libraries.append('boost_system%s' % env['BOOST_APPEND'])
+    libraries.insert(0,env['MAPNIK_NAME'])
+    libraries.append(env['ICU_LIB_NAME'])
 
     TARGET = plugin_env.SharedLibrary('../shape',
                                       SHLIBSUFFIX='.input',
diff --git a/plugins/input/sqlite/build.py b/plugins/input/sqlite/build.py
index b3a4a3e8b..53dfd8b37 100644
--- a/plugins/input/sqlite/build.py
+++ b/plugins/input/sqlite/build.py
@@ -35,8 +35,6 @@ plugin_sources = Split(
 
 # Link Library to Dependencies
 libraries = [ 'sqlite3' ]
-libraries.append(env['ICU_LIB_NAME'])
-libraries.append('boost_system%s' % env['BOOST_APPEND'])
 
 linkflags = []
 if env['SQLITE_LINKFLAGS']:
@@ -44,7 +42,9 @@ if env['SQLITE_LINKFLAGS']:
     plugin_env.Append(LINKFLAGS=linkflags)
 
 if env['PLUGIN_LINKING'] == 'shared':
-    libraries.append(env['MAPNIK_NAME'])
+    libraries.append('boost_system%s' % env['BOOST_APPEND'])
+    libraries.insert(0,env['MAPNIK_NAME'])
+    libraries.append(env['ICU_LIB_NAME'])
 
     TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                        SHLIBPREFIX='',
diff --git a/plugins/input/topojson/build.py b/plugins/input/topojson/build.py
index 9f7b95529..3a4932009 100644
--- a/plugins/input/topojson/build.py
+++ b/plugins/input/topojson/build.py
@@ -46,12 +46,12 @@ else:
 
     # Link Library to Dependencies
     libraries = []
-    libraries.append(env['ICU_LIB_NAME'])
-    libraries.append('boost_system%s' % env['BOOST_APPEND'])
     libraries.append('mapnik-json')
 
     if env['PLUGIN_LINKING'] == 'shared':
-        libraries.append(env['MAPNIK_NAME'])
+        libraries.append('boost_system%s' % env['BOOST_APPEND'])
+        libraries.insert(0,env['MAPNIK_NAME'])
+        libraries.append(env['ICU_LIB_NAME'])
 
         TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
                                           SHLIBPREFIX='',