--- whitelist.h.orig	2010-01-01 19:03:09.000000000 +0100
+++ whitelist.h	2010-01-01 19:04:01.000000000 +0100
@@ -3,6 +3,9 @@
  * and all the workarounds
  */
 
+/* Item size */
+#define ITEMSZ	1024
+
 /* flags for the whitelist */
 #define S3_BIOS     0x01	/* machine needs acpi_sleep=s3_bios */
 #define S3_MODE     0x02	/* machine needs acpi_sleep=s3_mode */
@@ -23,5 +26,7 @@
 	unsigned int flags;
 };
 
+char bios_version[ITEMSZ], sys_vendor[ITEMSZ], sys_product[ITEMSZ], sys_version[ITEMSZ];
+
 extern char *whitelist_version;
 extern struct machine_entry whitelist[];
--- s2ram-x86.c.orig	2010-01-01 19:04:49.000000000 +0100
+++ s2ram-x86.c	2010-01-01 19:05:23.000000000 +0100
@@ -35,8 +35,6 @@
 static int force;
 static int fb_nosuspend;
 
-char bios_version[1024], sys_vendor[1024], sys_product[1024], sys_version[1024];
-
 /* return codes for s2ram_is_supported */
 #define S2RAM_OK	0
 #define S2RAM_FAIL	1
--- dmidecode.c.orig	2010-01-01 19:06:21.000000000 +0100
+++ dmidecode.c	2010-01-01 19:07:32.000000000 +0100
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/mman.h>
+#include <whitelist.h>
 
 typedef unsigned char u8;
 typedef unsigned short u16;
@@ -31,10 +32,8 @@
 };
 
 #ifdef S2RAM
-extern char bios_version[1024], sys_vendor[1024], sys_product[1024], sys_version[1024];
 #define PRINTF(a...)
 #else
-char bios_version[1024], sys_vendor[1024], sys_product[1024], sys_version[1024];
 #define PRINTF printf
 #endif