diff --git a/bochs/cpu/cpu.h b/bochs/cpu/cpu.h
index 982670114..e69b11228 100644
--- a/bochs/cpu/cpu.h
+++ b/bochs/cpu/cpu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.h,v 1.574 2009-02-18 22:24:56 sshwarts Exp $
+// $Id: cpu.h,v 1.575 2009-02-20 08:12:51 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -261,7 +261,7 @@
 
 #endif  // defined(NEED_CPU_REG_SHORTCUTS)
 
-struct ExceptionInfo {
+struct BxExceptionInfo {
   unsigned exception_type;
   unsigned exception_class;
   bx_bool push_error;
diff --git a/bochs/cpu/exception.cc b/bochs/cpu/exception.cc
index 5426c25d4..8fb914aa4 100644
--- a/bochs/cpu/exception.cc
+++ b/bochs/cpu/exception.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: exception.cc,v 1.137 2009-02-13 09:51:57 sshwarts Exp $
+// $Id: exception.cc,v 1.138 2009-02-20 08:12:51 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -838,7 +838,7 @@ void BX_CPU_C::interrupt(Bit8u vector, unsigned type, bx_bool push_error, Bit16u
 #endif
 }
 
-struct ExceptionInfo exceptions_info[BX_CPU_HANDLED_EXCEPTIONS+1] = {
+struct BxExceptionInfo exceptions_info[BX_CPU_HANDLED_EXCEPTIONS+1] = {
   /* DE */ { BX_ET_CONTRIBUTORY, BX_EXCEPTION_CLASS_FAULT, 0 },
   /* DB */ { BX_ET_BENIGN,       BX_EXCEPTION_CLASS_FAULT, 0 },
   /* -- */ { BX_ET_BENIGN,       BX_EXCEPTION_CLASS_FAULT, 0 }, // NMI
diff --git a/bochs/cpu/vmx.cc b/bochs/cpu/vmx.cc
index d2263b5b3..3b98707a9 100755
--- a/bochs/cpu/vmx.cc
+++ b/bochs/cpu/vmx.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: vmx.cc,v 1.8 2009-02-17 19:20:47 sshwarts Exp $
+// $Id: vmx.cc,v 1.9 2009-02-20 08:12:51 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //   Copyright (c) 2009 Stanislav Shwartsman
@@ -173,7 +173,7 @@ void BX_CPU_C::VMabort(VMX_vmabort_code error_code)
 // VMenter
 ////////////////////////////////////////////////////////////
 
-extern struct ExceptionInfo exceptions_info[];
+extern struct BxExceptionInfo exceptions_info[];
 
 #define VMENTRY_INJECTING_EVENT(vmentry_interr_info) (vmentry_interr_info & 0x80000000)