diff --git a/bochs/bochs.h b/bochs/bochs.h
index 5452689cf..9454baadc 100644
--- a/bochs/bochs.h
+++ b/bochs/bochs.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: bochs.h,v 1.253 2010-04-13 17:56:50 sshwarts Exp $
+// $Id: bochs.h,v 1.254 2010-05-15 09:23:50 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001-2009  The Bochs Project
@@ -445,6 +445,9 @@ void CDECL bx_signal_handler(int signum);
 int bx_atexit(void);
 BOCHSAPI extern bx_debug_t bx_dbg;
 
+// determinted by XAPIC option
+BOCHSAPI extern Bit32u apic_id_mask;
+
 // memory access type (read/write/execute/rw)
 #define BX_READ         0
 #define BX_WRITE        1
diff --git a/bochs/cpu/apic.cc b/bochs/cpu/apic.cc
index aa678caf2..df702ba4a 100644
--- a/bochs/cpu/apic.cc
+++ b/bochs/cpu/apic.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: apic.cc,v 1.143 2010-04-08 15:50:39 sshwarts Exp $
+// $Id: apic.cc,v 1.144 2010-05-15 09:23:50 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (c) 2002-2009 Zwane Mwaikambo, Stanislav Shwartsman
@@ -27,7 +27,6 @@
 
 #if BX_SUPPORT_APIC
 
-extern Bit32u apic_id_mask;
 extern bx_bool simulate_xapic;
 
 #define LOG_THIS this->
diff --git a/bochs/iodev/ioapic.cc b/bochs/iodev/ioapic.cc
index 45ec94f41..053e5af65 100644
--- a/bochs/iodev/ioapic.cc
+++ b/bochs/iodev/ioapic.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ioapic.cc,v 1.52 2010-05-14 12:10:00 sshwarts Exp $
+// $Id: ioapic.cc,v 1.53 2010-05-15 09:23:50 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002-2009  The Bochs Project
@@ -34,8 +34,6 @@
 
 bx_ioapic_c *theIOAPIC = NULL;
 
-extern Bit32u apic_id_mask;
-
 int libioapic_LTX_plugin_init(plugin_t *plugin, plugintype_t type, int argc, char *argv[])
 {
   theIOAPIC = new bx_ioapic_c();