Index: branches/meklort/i386/libsaio/smbios_patcher.c
===================================================================
--- branches/meklort/i386/libsaio/smbios_patcher.c	(revision 536)
+++ branches/meklort/i386/libsaio/smbios_patcher.c	(revision 537)
@@ -493,7 +493,7 @@
                 COMPARE_DWORD(smbios->dmi.anchor, DMITAG) &&
                 smbios->dmi.anchor[4]==DMITAG[4] &&
                 checksum8(smbios, sizeof(struct SMBEntryPoint)) == 0)
-	    {
+	    {			
                 return smbios;
 	    }
             smbios = (struct SMBEntryPoint*) ( ((char*) smbios) + 16 );
Index: branches/meklort/i386/libsaio/fake_efi.c
===================================================================
--- branches/meklort/i386/libsaio/fake_efi.c	(revision 536)
+++ branches/meklort/i386/libsaio/fake_efi.c	(revision 537)
@@ -18,6 +18,10 @@
 #include "sl.h"
 #include "modules.h"
 
+#ifdef static
+#undef static
+#endif
+
 extern struct SMBEntryPoint * getSmbios(int which); // now cached
 extern void setup_pci_devs(pci_dt_t *pci_dt);
 
@@ -462,10 +466,9 @@
 /*
  * Get the SystemID from the bios dmi info
  */
-
+static EFI_CHAR8		 uuid[UUID_LEN];
 static	EFI_CHAR8* getSmbiosUUID()
 {
-	static EFI_CHAR8		 uuid[UUID_LEN];
 	int						 i, isZero, isOnes;
 	struct SMBEntryPoint	*smbios;
 	SMBByte					*p;
@@ -654,7 +657,7 @@
 	{
 		verbose("No SMBIOS replacement found.\n");
 	}
-
+	
 	// get a chance to scan mem dynamically if user asks for it while having the config options loaded as well,
 	// as opposed to when it was in scan_platform(); also load the orig. smbios so that we can access dmi info without
 	// patching the smbios yet
Index: branches/meklort/i386/boot2/modules.h
===================================================================
--- branches/meklort/i386/boot2/modules.h	(revision 536)
+++ branches/meklort/i386/boot2/modules.h	(revision 537)
@@ -11,7 +11,7 @@
 // There is a bug with the module system / rebasing / binding
 // that causes static variables to be incorrectly rebased or bound
 // Disable static variables for the moment
-#define static
+// #define static
 
 #ifndef __BOOT_MODULES_H
 #define __BOOT_MODULES_H
Index: branches/meklort/i386/modules/ACPIPatcher/ACPIPatcher.c
===================================================================
--- branches/meklort/i386/modules/ACPIPatcher/ACPIPatcher.c	(revision 536)
+++ branches/meklort/i386/modules/ACPIPatcher/ACPIPatcher.c	(revision 537)
@@ -20,7 +20,7 @@
 
 void ACPIPatcher_start()
 {
-	replace_function("getPciRootUID", &ACPIPatcher_getPciRootUID);
+	replace_function("_getPciRootUID", &ACPIPatcher_getPciRootUID);
 	register_hook_callback("setupEfiConfigurationTable", &ACPIPatcher_setupEfiConfigurationTable_hook);
 }
 
Index: branches/meklort/i386/modules/GUI/gui.h
===================================================================
--- branches/meklort/i386/modules/GUI/gui.h	(revision 536)
+++ branches/meklort/i386/modules/GUI/gui.h	(revision 537)
@@ -18,6 +18,7 @@
 #ifndef __BOOT2_GUI_H
 #define __BOOT2_GUI_H
 
+void showTextBuffer(char *buf, int size);
 int GUI_initGraphicsMode ();
 int GUI_countdown( const char * msg, int row, int timeout );
 #define CHARACTERS_COUNT	223