diff --git a/AMBuildScript b/AMBuildScript
index 7faa029..92e17a1 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -324,6 +324,10 @@ class MMSConfig(object):
 
     if sdk['source2']:
       cxx.defines += ['META_IS_SOURCE2']
+      binary.sources += [
+        os.path.join(sdk['path'], 'public', 'tier0', 'memoverride.cpp'),
+        os.path.join(sdk['path'], 'tier1', 'convar.cpp'),
+      ]
 
     SdkHelpers.configureCxx(context, binary, sdk)
 
diff --git a/core/AMBuilder b/core/AMBuilder
index a439113..5f84432 100644
--- a/core/AMBuilder
+++ b/core/AMBuilder
@@ -23,8 +23,6 @@ for sdk, cxx in MMS.sdk_targets:
   if sdk.get('source2', False):
     binary.sources += [
       'provider/source2/provider_source2.cpp',
-      os.path.join(sdk['path'], 'tier1', 'convar.cpp'),
-      os.path.join(sdk['path'], 'public', 'tier0', 'memoverride.cpp')
     ]
   else:
     binary.sources += [
diff --git a/samples/s2_sample_mm/AMBuildScript b/samples/s2_sample_mm/AMBuildScript
index 1b14ef9..3f52857 100644
--- a/samples/s2_sample_mm/AMBuildScript
+++ b/samples/s2_sample_mm/AMBuildScript
@@ -275,6 +275,10 @@ class MMSPluginConfig(object):
 
     if sdk['source2']:
       cxx.defines += ['META_IS_SOURCE2']
+      binary.sources += [
+        os.path.join(sdk['path'], 'tier0_perproject', 'memoverride.cpp'),
+        os.path.join(sdk['path'], 'tier1', 'convar.cpp'),
+      ]
 
     SdkHelpers.configureCxx(context, binary, sdk)
 
diff --git a/samples/s2_sample_mm/AMBuilder b/samples/s2_sample_mm/AMBuilder
index ee01a5d..3b8f535 100644
--- a/samples/s2_sample_mm/AMBuilder
+++ b/samples/s2_sample_mm/AMBuilder
@@ -16,10 +16,6 @@ for sdk_target in MMSPlugin.sdk_targets:
     'sample_mm.cpp',
   ]
 
-  binary.sources += [
-    os.path.join(sdk['path'], 'tier1', 'convar.cpp'),
-    os.path.join(sdk['path'], 'public', 'tier0', 'memoverride.cpp')
-  ]
   binary.custom = [builder.tools.Protoc(protoc = sdk_target.protoc, sources = [
     os.path.join(sdk['path'], 'common', 'network_connection.proto'),
   ])]