diff --git a/AMBuildScript b/AMBuildScript
index 82fae37..70c6792 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -178,7 +178,6 @@ class MMSConfig(object):
         '_CRT_SECURE_NO_DEPRECATE',
         '_CRT_SECURE_NO_WARNINGS',
         '_CRT_NONSTDC_NO_DEPRECATE',
-        '_ALLOW_KEYWORD_MACROS',
       ]
       cxx.cflags += [
         '/W3',
diff --git a/core/AMBuilder b/core/AMBuilder
index 97ee60f..112bcdd 100644
--- a/core/AMBuilder
+++ b/core/AMBuilder
@@ -37,6 +37,7 @@ for sdk_target in MMS.sdk_targets:
       'provider/source/provider_source_console.cpp',
       'vsp_bridge.cpp'
       ]
+    binary.compiler.defines += ['_ALLOW_KEYWORD_MACROS']
 
   if cxx.target.arch == 'x86':
     binary.sources += ['sourcehook/sourcehook_hookmangen_x86.cpp']
diff --git a/core/metamod_convar.h b/core/metamod_convar.h
index 44ab0ca..0a67996 100644
--- a/core/metamod_convar.h
+++ b/core/metamod_convar.h
@@ -27,8 +27,14 @@
 
 #pragma once
 
+#ifndef META_IS_SOURCE2
 #define protected public
 #define private public
+#endif
+
 #include <convar.h>
+
+#ifndef META_IS_SOURCE2
 #undef protected
 #undef private
+#endif