diff --git a/AMBuildScript b/AMBuildScript
index 51cfe01d..72a2b667 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -304,30 +304,21 @@ class AMXXConfig(object):
     return self.AddVersioning(binary)
 
   def MetaPlugin(self, context, name):
-    binary = context.compiler.Library(name)
-    self.ConfigureForModule(context, binary.compiler)
-    
     if builder.target_platform == 'mac' or builder.target_platform == 'windows':
       name = name + '_mm'
     elif builder.target_platform == 'linux':
       name = name + '_mm_i386'
-
-    return self.AddVersioning(binary)
-
-  def Module(self, context, name):
     binary = context.compiler.Library(name)
     self.ConfigureForModule(context, binary.compiler)
     return self.AddVersioning(binary)
 
   def MetaModule(self, context, name):
-    binary = context.compiler.Library(name)
-    self.ConfigureForModule(context, binary.compiler)
-
     if builder.target_platform == 'mac' or builder.target_platform == 'windows':
       name = name + '_amxx'
     elif builder.target_platform == 'linux':
       name = name + '_amxx_i386'
-
+    binary = context.compiler.Library(name)
+    self.ConfigureForModule(context, binary.compiler)
     return self.AddVersioning(binary)
 
   def Program(self, context, name):
diff --git a/dlls/nvault/AMBuilder b/dlls/nvault/AMBuilder
index 52d3f012..0927ae74 100644
--- a/dlls/nvault/AMBuilder
+++ b/dlls/nvault/AMBuilder
@@ -1,7 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-binary = AMXX.Module(builder, 'nvault')
+binary = AMXX.MetaModule(builder, 'nvault')
 
 binary.compiler.defines += [
   'HAVE_STDINT_H',
diff --git a/dlls/regex/AMBuilder b/dlls/regex/AMBuilder
index 07a66fcf..6faa6e92 100644
--- a/dlls/regex/AMBuilder
+++ b/dlls/regex/AMBuilder
@@ -1,7 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-binary = AMXX.Module(builder, 'regex')
+binary = AMXX.MetaModule(builder, 'regex')
 
 if builder.target_platform == 'linux':
   binary.compiler.postlink += [binary.Dep('lib_linux/libpcre.a')]
diff --git a/dlls/sockets/AMBuilder b/dlls/sockets/AMBuilder
index 22a93d8d..f14c8512 100644
--- a/dlls/sockets/AMBuilder
+++ b/dlls/sockets/AMBuilder
@@ -1,7 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-binary = AMXX.Module(builder, 'sockets')
+binary = AMXX.MetaModule(builder, 'sockets')
 
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',