Index: branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c	(revision 397)
+++ branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c	(revision 398)
@@ -94,7 +94,6 @@
 	static char	dirSpecDSDT[128] = "";
 	const char *override_pathname = NULL; // full path to a file.
 	int			len = 0, fd = 0;
-	extern char gMacOSVersion;
 	
 	// Take in account user overriding if it's DSDT only
 	if (strstr(filename, "DSDT") &&
Index: branches/azimutz/CleanCut/i386/libsaio/stringTable.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/stringTable.c	(revision 397)
+++ branches/azimutz/CleanCut/i386/libsaio/stringTable.c	(revision 398)
@@ -654,7 +654,6 @@
 	const char	*override_pathname = NULL;
 	const char	*filename = "com.apple.Boot.plist";
 	int			 count, ret, fd, len = 0;
-	extern char  gMacOSVersion;
 	
 	// Take in account user overriding the override :P
 	if (getValueForKey(kTestConfigKey, &override_pathname, &len, &bootInfo->bootConfig))
Index: branches/azimutz/CleanCut/i386/libsaio/fake_efi.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/fake_efi.c	(revision 397)
+++ branches/azimutz/CleanCut/i386/libsaio/fake_efi.c	(revision 398)
@@ -629,7 +629,6 @@
 	char		dirSpecSMBIOS[128] = "";
 	const char *override_pathname = NULL;
 	int			len = 0, fd = 0;
-	extern char gMacOSVersion;
 	extern void scan_mem();
 	
 	// Take in account user overriding
Index: branches/azimutz/CleanCut/i386/boot2/boot.c
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/boot.c	(revision 397)
+++ branches/azimutz/CleanCut/i386/boot2/boot.c	(revision 398)
@@ -348,9 +348,6 @@
         bool tryresumedefault;
         bool forceresume;
 
-        config_file_t    systemVersion;	// system.plist of booting partition
-		char			 osxVersion[8]; // replaces gMacOSVersion here, for now.
-
         // additional variable for testing alternate kernel image locations on boot helper partitions.
         char     bootFileSpec[512];
 		
@@ -398,19 +395,6 @@
         }
 		
         // Other status (e.g. 0) means that we should proceed with boot.
-        // Found and loaded a config file. Proceed with boot.
-		
-		//Azi: still calling this here. The call on processBootOptions() gets hidden from verbose and
-		// for some reason gMacOSVersion doesn't get initialized on boot.c like on the others. Later...
-		// Find out which version mac os we're booting.
-		if (!loadConfigFile("System/Library/CoreServices/SystemVersion.plist", &systemVersion)) {
-			if (getValueForKey(kProductVersion, &val, &len, &systemVersion)) {	
-				// getValueForKey uses const char for val
-				// so copy it and trim
-				strncpy(osxVersion, val, MIN(len, 4));
-				osxVersion[MIN(len, 4)] = '\0';
-			}
-		}
 
 		// If cpu doesn't handle 64 bit instructions,...
 		if (!platformCPUFeature(CPU_FEATURE_EM64T) ||
@@ -497,7 +481,7 @@
                     (gMKextName[0] == '\0') &&
                     (gBootKernelCacheFile[0] != '\0'));
 
-		verbose("Loading Darwin %s\n", osxVersion);
+		verbose("Loading Darwin %s\n", gMacOSVersion);
 		
         if (trycache) do {
       
Index: branches/azimutz/CleanCut/i386/boot2/boot.h
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/boot.h	(revision 397)
+++ branches/azimutz/CleanCut/i386/boot2/boot.h	(revision 398)
@@ -125,6 +125,7 @@
 extern bool gOverrideKernel;
 //extern char *gPlatformName; disabled
 extern char gMKextName[];
+extern char gMacOSVersion[];
 extern char gRootDevice[];
 extern bool gEnableCDROMRescan;
 extern bool gScanSingleDrive;
Index: branches/azimutz/CleanCut/i386/boot2/drivers.c
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/drivers.c	(revision 397)
+++ branches/azimutz/CleanCut/i386/boot2/drivers.c	(revision 398)
@@ -160,10 +160,9 @@
 
 long LoadDrivers( char * dirSpec )
 {
-	char dirSpecExtra[128];
+	char		dirSpecExtra[128];
 	const char *override_pathfolder = NULL; // full path to a folder.
 	int			fd = 0, len = 0;
-	extern char gMacOSVersion;
 	
 	if ( InitDriverSupport() != 0 )
 		return 0;