diff --git a/bochs/cpu/cpu.cc b/bochs/cpu/cpu.cc
index a436f94a3..63f464f59 100644
--- a/bochs/cpu/cpu.cc
+++ b/bochs/cpu/cpu.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.cc,v 1.158 2006-06-03 12:59:14 sshwarts Exp $
+// $Id: cpu.cc,v 1.159 2006-06-06 16:46:07 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -36,6 +36,14 @@
 #include "extdb.h"
 #endif
 
+#if BX_PROVIDE_CPU_MEMORY
+#if BX_ADDRESS_SPACES==1
+BOCHSAPI BX_MEM_C bx_mem;
+#else
+BOCHSAPI BX_MEM_C bx_mem_array[BX_ADDRESS_SPACES];
+#endif
+#endif
+
 #if BX_SUPPORT_ICACHE
 
 bxPageWriteStampTable pageWriteStampTable;
diff --git a/bochs/memory/misc_mem.cc b/bochs/memory/misc_mem.cc
index 8850d797f..65be3c728 100644
--- a/bochs/memory/misc_mem.cc
+++ b/bochs/memory/misc_mem.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: misc_mem.cc,v 1.93 2006-06-03 12:59:14 sshwarts Exp $
+// $Id: misc_mem.cc,v 1.94 2006-06-06 16:46:08 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -33,12 +33,6 @@
 
 #if BX_PROVIDE_CPU_MEMORY
 
-#if BX_ADDRESS_SPACES==1
-BOCHSAPI BX_MEM_C bx_mem;
-#else
-BOCHSAPI BX_MEM_C bx_mem_array[BX_ADDRESS_SPACES];
-#endif
-
 Bit32u BX_MEM_C::get_memory_in_k(void)
 {
   return(BX_MEM_THIS megabytes * 1024);
@@ -105,7 +99,7 @@ void BX_MEM_C::init_memory(int memsize)
 {
   unsigned idx;
 
-  BX_DEBUG(("Init $Id: misc_mem.cc,v 1.93 2006-06-03 12:59:14 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: misc_mem.cc,v 1.94 2006-06-06 16:46:08 sshwarts Exp $"));
   // you can pass 0 if memory has been allocated already through
   // the constructor, or the desired size of memory if it hasn't