diff --git a/build/mac/build_scripts/MozBuildUtils.pm b/build/mac/build_scripts/MozBuildUtils.pm
index eb9c790f0ca3..096f38119ac8 100644
--- a/build/mac/build_scripts/MozBuildUtils.pm
+++ b/build/mac/build_scripts/MozBuildUtils.pm
@@ -17,6 +17,7 @@ use Mac::Events;
 use Mac::StandardFile;
 
 use Moz;
+use MozBuildFlags;
 
 use vars qw(@ISA @EXPORT);
 
diff --git a/build/mac/build_scripts/MozillaBuildCore.pm b/build/mac/build_scripts/MozillaBuildCore.pm
index 72b93e67cf43..9d0572c156e8 100644
--- a/build/mac/build_scripts/MozillaBuildCore.pm
+++ b/build/mac/build_scripts/MozillaBuildCore.pm
@@ -42,8 +42,6 @@ sub DoPrebuildCheck()
 #// Configure Build System
 #//--------------------------------------------------------------------------------------------------
 
-my($UNIVERSAL_INTERFACES_VERSION) = 0x0320;
-
 sub GenBuildSystemInfo()
 {
     # always rebuild the configuration program.
@@ -163,7 +161,7 @@ sub ConfigureBuildSystem()
     #// we'll assume that 3.3 or later is in use.
     my($universal_interfaces) = CodeWarriorLib::getCodeWarriorPath("MacOS Support:Universal:Interfaces:CIncludes:");
     if (-e ($universal_interfaces . "ControlDefinitions.h")) {
-        $UNIVERSAL_INTERFACES_VERSION = 0x0330;
+        $main::UNIVERSAL_INTERFACES_VERSION = 0x0330;
     }
 
     #// Rename IC SDK folder in the Mac OS Support folder
@@ -176,7 +174,7 @@ sub ConfigureBuildSystem()
         print "Mozilla no longer needs the Internet Config SDK to build:\n  Renaming the 'ICProgKit2.0.2' folder to '(ICProgKit2.0.2)'\n";
     }
 
-    printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $UNIVERSAL_INTERFACES_VERSION);
+    printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $main::UNIVERSAL_INTERFACES_VERSION);
 
     UpdateConfigHeader(":mozilla:config:mac:DefinesOptions.h");