Index: trunk/src/VBox/VMM/.scm-settings
===================================================================
--- trunk/src/VBox/VMM/.scm-settings	(revision 76553)
+++ trunk/src/VBox/VMM/.scm-settings	(revision 76561)
@@ -30,5 +30,7 @@
 /VMMAll/PGMAllGst.h: --no-fix-header-guards
 /VMMAll/PGMAllShw.h: --no-fix-header-guards
-
 /testcase/tstVMStruct.h: --no-fix-header-guards
 
+/*.h: --guard-relative-to-dir . --guard-prefix VMM_INCLUDED_SRC_
+/VMMR3/cpus/*.h: --guard-relative-to-dir VMMR3/cpus --guard-prefix VBOX_CPUDB_
+
Index: trunk/src/VBox/VMM/VMMR0/GMMR0Internal.h
===================================================================
--- trunk/src/VBox/VMM/VMMR0/GMMR0Internal.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR0/GMMR0Internal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___GMMR0Internal_h
-#define ___GMMR0Internal_h
+#ifndef VMM_INCLUDED_SRC_VMMR0_GMMR0Internal_h
+#define VMM_INCLUDED_SRC_VMMR0_GMMR0Internal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR0/GVMMR0Internal.h
===================================================================
--- trunk/src/VBox/VMM/VMMR0/GVMMR0Internal.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR0/GVMMR0Internal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___GVMMR0Internal_h
-#define ___GVMMR0Internal_h
+#ifndef VMM_INCLUDED_SRC_VMMR0_GVMMR0Internal_h
+#define VMM_INCLUDED_SRC_VMMR0_GVMMR0Internal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR0/HMSVMR0.h
===================================================================
--- trunk/src/VBox/VMM/VMMR0/HMSVMR0.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR0/HMSVMR0.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___HMSVMR0_h
-#define ___HMSVMR0_h
+#ifndef VMM_INCLUDED_SRC_VMMR0_HMSVMR0_h
+#define VMM_INCLUDED_SRC_VMMR0_HMSVMR0_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR0/HMVMXR0.h
===================================================================
--- trunk/src/VBox/VMM/VMMR0/HMVMXR0.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR0/HMVMXR0.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___HMVMXR0_h
-#define ___HMVMXR0_h
+#ifndef VMM_INCLUDED_SRC_VMMR0_HMVMXR0_h
+#define VMM_INCLUDED_SRC_VMMR0_HMVMXR0_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp	(revision 76561)
@@ -231,84 +231,84 @@
 static CPUMDBENTRY const * const g_apCpumDbEntries[] =
 {
-#ifdef VBOX_CPUDB_Intel_Core_i7_6700K
+#ifdef VBOX_CPUDB_Intel_Core_i7_6700K_h
     &g_Entry_Intel_Core_i7_6700K,
 #endif
-#ifdef VBOX_CPUDB_Intel_Core_i7_5600U
+#ifdef VBOX_CPUDB_Intel_Core_i7_5600U_h
     &g_Entry_Intel_Core_i7_5600U,
 #endif
-#ifdef VBOX_CPUDB_Intel_Core_i5_3570
+#ifdef VBOX_CPUDB_Intel_Core_i5_3570_h
     &g_Entry_Intel_Core_i5_3570,
 #endif
-#ifdef VBOX_CPUDB_Intel_Core_i7_3960X
+#ifdef VBOX_CPUDB_Intel_Core_i7_3960X_h
     &g_Entry_Intel_Core_i7_3960X,
 #endif
-#ifdef VBOX_CPUDB_Intel_Core_i7_2635QM
+#ifdef VBOX_CPUDB_Intel_Core_i7_2635QM_h
     &g_Entry_Intel_Core_i7_2635QM,
 #endif
-#ifdef VBOX_CPUDB_Intel_Pentium_N3530_2_16GHz
+#ifdef VBOX_CPUDB_Intel_Pentium_N3530_2_16GHz_h
     &g_Entry_Intel_Pentium_N3530_2_16GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Atom_330_1_60GHz
+#ifdef VBOX_CPUDB_Intel_Atom_330_1_60GHz_h
     &g_Entry_Intel_Atom_330_1_60GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Pentium_M_processor_2_00GHz
+#ifdef VBOX_CPUDB_Intel_Pentium_M_processor_2_00GHz_h
     &g_Entry_Intel_Pentium_M_processor_2_00GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Xeon_X5482_3_20GHz
+#ifdef VBOX_CPUDB_Intel_Xeon_X5482_3_20GHz_h
     &g_Entry_Intel_Xeon_X5482_3_20GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Core2_X6800_2_93GHz
+#ifdef VBOX_CPUDB_Intel_Core2_X6800_2_93GHz_h
     &g_Entry_Intel_Core2_X6800_2_93GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Core2_T7600_2_33GHz
+#ifdef VBOX_CPUDB_Intel_Core2_T7600_2_33GHz_h
     &g_Entry_Intel_Core2_T7600_2_33GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Core_Duo_T2600_2_16GHz
+#ifdef VBOX_CPUDB_Intel_Core_Duo_T2600_2_16GHz_h
     &g_Entry_Intel_Core_Duo_T2600_2_16GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Pentium_4_3_00GHz
+#ifdef VBOX_CPUDB_Intel_Pentium_4_3_00GHz_h
     &g_Entry_Intel_Pentium_4_3_00GHz,
 #endif
-#ifdef VBOX_CPUDB_Intel_Pentium_4_3_00GHz
+#ifdef VBOX_CPUDB_Intel_Pentium_4_3_00GHz_h
     &g_Entry_Intel_Pentium_4_3_00GHz,
 #endif
 /** @todo pentium, pentium mmx, pentium pro, pentium II, pentium III */
-#ifdef VBOX_CPUDB_Intel_80486
+#ifdef VBOX_CPUDB_Intel_80486_h
     &g_Entry_Intel_80486,
 #endif
-#ifdef VBOX_CPUDB_Intel_80386
+#ifdef VBOX_CPUDB_Intel_80386_h
     &g_Entry_Intel_80386,
 #endif
-#ifdef VBOX_CPUDB_Intel_80286
+#ifdef VBOX_CPUDB_Intel_80286_h
     &g_Entry_Intel_80286,
 #endif
-#ifdef VBOX_CPUDB_Intel_80186
+#ifdef VBOX_CPUDB_Intel_80186_h
     &g_Entry_Intel_80186,
 #endif
-#ifdef VBOX_CPUDB_Intel_8086
+#ifdef VBOX_CPUDB_Intel_8086_h
     &g_Entry_Intel_8086,
 #endif
 
-#ifdef VBOX_CPUDB_AMD_FX_8150_Eight_Core
+#ifdef VBOX_CPUDB_AMD_FX_8150_Eight_Core_h
     &g_Entry_AMD_FX_8150_Eight_Core,
 #endif
-#ifdef VBOX_CPUDB_AMD_Phenom_II_X6_1100T
+#ifdef VBOX_CPUDB_AMD_Phenom_II_X6_1100T_h
     &g_Entry_AMD_Phenom_II_X6_1100T,
 #endif
-#ifdef VBOX_CPUDB_Quad_Core_AMD_Opteron_2384
+#ifdef VBOX_CPUDB_Quad_Core_AMD_Opteron_2384_h
     &g_Entry_Quad_Core_AMD_Opteron_2384,
 #endif
-#ifdef VBOX_CPUDB_AMD_Athlon_64_X2_Dual_Core_4200
+#ifdef VBOX_CPUDB_AMD_Athlon_64_X2_Dual_Core_4200_h
     &g_Entry_AMD_Athlon_64_X2_Dual_Core_4200,
 #endif
-#ifdef VBOX_CPUDB_AMD_Athlon_64_3200
+#ifdef VBOX_CPUDB_AMD_Athlon_64_3200_h
     &g_Entry_AMD_Athlon_64_3200,
 #endif
 
-#ifdef VBOX_CPUDB_VIA_QuadCore_L4700_1_2_GHz
+#ifdef VBOX_CPUDB_VIA_QuadCore_L4700_1_2_GHz_h
     &g_Entry_VIA_QuadCore_L4700_1_2_GHz,
 #endif
 
-#ifdef VBOX_CPUDB_NEC_V20
+#ifdef VBOX_CPUDB_NEC_V20_h
     &g_Entry_NEC_V20,
 #endif
Index: trunk/src/VBox/VMM/VMMR3/PATMPatch.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/PATMPatch.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/PATMPatch.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PATMPATCH_H
-#define ___PATMPATCH_H
+#ifndef VMM_INCLUDED_SRC_VMMR3_PATMPatch_h
+#define VMM_INCLUDED_SRC_VMMR3_PATMPatch_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_3200.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_3200.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_3200.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_AMD_Athlon_64_3200
-#define VBOX_CPUDB_AMD_Athlon_64_3200
+#ifndef VBOX_CPUDB_AMD_Athlon_64_3200_h
+#define VBOX_CPUDB_AMD_Athlon_64_3200_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_X2_Dual_Core_4200.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_X2_Dual_Core_4200.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_X2_Dual_Core_4200.h	(revision 76561)
@@ -22,6 +22,6 @@
  */
 
-#ifndef VBOX_CPUDB_AMD_Athlon_64_X2_Dual_Core_4200
-#define VBOX_CPUDB_AMD_Athlon_64_X2_Dual_Core_4200
+#ifndef VBOX_CPUDB_AMD_Athlon_64_X2_Dual_Core_4200_h
+#define VBOX_CPUDB_AMD_Athlon_64_X2_Dual_Core_4200_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/AMD_FX_8150_Eight_Core.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/AMD_FX_8150_Eight_Core.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/AMD_FX_8150_Eight_Core.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_AMD_FX_8150_Eight_Core
-#define VBOX_CPUDB_AMD_FX_8150_Eight_Core
+#ifndef VBOX_CPUDB_AMD_FX_8150_Eight_Core_h
+#define VBOX_CPUDB_AMD_FX_8150_Eight_Core_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/AMD_Phenom_II_X6_1100T.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/AMD_Phenom_II_X6_1100T.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/AMD_Phenom_II_X6_1100T.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_AMD_Phenom_II_X6_1100T
-#define VBOX_CPUDB_AMD_Phenom_II_X6_1100T
+#ifndef VBOX_CPUDB_AMD_Phenom_II_X6_1100T_h
+#define VBOX_CPUDB_AMD_Phenom_II_X6_1100T_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_80186.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_80186.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_80186.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_80186
-#define VBOX_CPUDB_Intel_80186
+#ifndef VBOX_CPUDB_Intel_80186_h
+#define VBOX_CPUDB_Intel_80186_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_80286.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_80286.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_80286.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_80286
-#define VBOX_CPUDB_Intel_80286
+#ifndef VBOX_CPUDB_Intel_80286_h
+#define VBOX_CPUDB_Intel_80286_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_80386.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_80386.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_80386.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_80386
-#define VBOX_CPUDB_Intel_80386
+#ifndef VBOX_CPUDB_Intel_80386_h
+#define VBOX_CPUDB_Intel_80386_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_80486.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_80486.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_80486.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_80486
-#define VBOX_CPUDB_Intel_80486
+#ifndef VBOX_CPUDB_Intel_80486_h
+#define VBOX_CPUDB_Intel_80486_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_8086.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_8086.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_8086.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_8086
-#define VBOX_CPUDB_Intel_8086
+#ifndef VBOX_CPUDB_Intel_8086_h
+#define VBOX_CPUDB_Intel_8086_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Atom_330_1_60GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Atom_330_1_60GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Atom_330_1_60GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Atom_330_1_60GHz
-#define VBOX_CPUDB_Intel_Atom_330_1_60GHz
+#ifndef VBOX_CPUDB_Intel_Atom_330_1_60GHz_h
+#define VBOX_CPUDB_Intel_Atom_330_1_60GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core2_T7600_2_33GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core2_T7600_2_33GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core2_T7600_2_33GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core2_T7600_2_33GHz
-#define VBOX_CPUDB_Intel_Core2_T7600_2_33GHz
+#ifndef VBOX_CPUDB_Intel_Core2_T7600_2_33GHz_h
+#define VBOX_CPUDB_Intel_Core2_T7600_2_33GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core2_X6800_2_93GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core2_X6800_2_93GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core2_X6800_2_93GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core2_X6800_2_93GHz
-#define VBOX_CPUDB_Intel_Core2_X6800_2_93GHz
+#ifndef VBOX_CPUDB_Intel_Core2_X6800_2_93GHz_h
+#define VBOX_CPUDB_Intel_Core2_X6800_2_93GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_Duo_T2600_2_16GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_Duo_T2600_2_16GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_Duo_T2600_2_16GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core_Duo_T2600_2_16GHz
-#define VBOX_CPUDB_Intel_Core_Duo_T2600_2_16GHz
+#ifndef VBOX_CPUDB_Intel_Core_Duo_T2600_2_16GHz_h
+#define VBOX_CPUDB_Intel_Core_Duo_T2600_2_16GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core_i5_3570
-#define VBOX_CPUDB_Intel_Core_i5_3570
+#ifndef VBOX_CPUDB_Intel_Core_i5_3570_h
+#define VBOX_CPUDB_Intel_Core_i5_3570_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_2635QM.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_2635QM.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_2635QM.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core_i7_2635QM
-#define VBOX_CPUDB_Intel_Core_i7_2635QM
+#ifndef VBOX_CPUDB_Intel_Core_i7_2635QM_h
+#define VBOX_CPUDB_Intel_Core_i7_2635QM_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core_i7_3820QM
-#define VBOX_CPUDB_Intel_Core_i7_3820QM
+#ifndef VBOX_CPUDB_Intel_Core_i7_3820QM_h
+#define VBOX_CPUDB_Intel_Core_i7_3820QM_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core_i7_3960X
-#define VBOX_CPUDB_Intel_Core_i7_3960X
+#ifndef VBOX_CPUDB_Intel_Core_i7_3960X_h
+#define VBOX_CPUDB_Intel_Core_i7_3960X_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_5600U.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_5600U.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_5600U.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core_i7_5600U
-#define VBOX_CPUDB_Intel_Core_i7_5600U
+#ifndef VBOX_CPUDB_Intel_Core_i7_5600U_h
+#define VBOX_CPUDB_Intel_Core_i7_5600U_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_6700K.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_6700K.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_6700K.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Core_i7_6700K
-#define VBOX_CPUDB_Intel_Core_i7_6700K
+#ifndef VBOX_CPUDB_Intel_Core_i7_6700K_h
+#define VBOX_CPUDB_Intel_Core_i7_6700K_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_4_3_00GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_4_3_00GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_4_3_00GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Pentium_4_3_00GHz
-#define VBOX_CPUDB_Intel_Pentium_4_3_00GHz
+#ifndef VBOX_CPUDB_Intel_Pentium_4_3_00GHz_h
+#define VBOX_CPUDB_Intel_Pentium_4_3_00GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_M_processor_2_00GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_M_processor_2_00GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_M_processor_2_00GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Pentium_M_processor_2_00GHz
-#define VBOX_CPUDB_Intel_Pentium_M_processor_2_00GHz
+#ifndef VBOX_CPUDB_Intel_Pentium_M_processor_2_00GHz_h
+#define VBOX_CPUDB_Intel_Pentium_M_processor_2_00GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_N3530_2_16GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_N3530_2_16GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_N3530_2_16GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Pentium_N3530_2_16GHz
-#define VBOX_CPUDB_Intel_Pentium_N3530_2_16GHz
+#ifndef VBOX_CPUDB_Intel_Pentium_N3530_2_16GHz_h
+#define VBOX_CPUDB_Intel_Pentium_N3530_2_16GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Intel_Xeon_X5482_3_20GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Intel_Xeon_X5482_3_20GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Intel_Xeon_X5482_3_20GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Intel_Xeon_X5482_3_20GHz
-#define VBOX_CPUDB_Intel_Xeon_X5482_3_20GHz
+#ifndef VBOX_CPUDB_Intel_Xeon_X5482_3_20GHz_h
+#define VBOX_CPUDB_Intel_Xeon_X5482_3_20GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/Quad_Core_AMD_Opteron_2384.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/Quad_Core_AMD_Opteron_2384.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/Quad_Core_AMD_Opteron_2384.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_Quad_Core_AMD_Opteron_2384
-#define VBOX_CPUDB_Quad_Core_AMD_Opteron_2384
+#ifndef VBOX_CPUDB_Quad_Core_AMD_Opteron_2384_h
+#define VBOX_CPUDB_Quad_Core_AMD_Opteron_2384_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/VMMR3/cpus/VIA_QuadCore_L4700_1_2_GHz.h
===================================================================
--- trunk/src/VBox/VMM/VMMR3/cpus/VIA_QuadCore_L4700_1_2_GHz.h	(revision 76553)
+++ trunk/src/VBox/VMM/VMMR3/cpus/VIA_QuadCore_L4700_1_2_GHz.h	(revision 76561)
@@ -17,6 +17,6 @@
  */
 
-#ifndef VBOX_CPUDB_VIA_QuadCore_L4700_1_2_GHz
-#define VBOX_CPUDB_VIA_QuadCore_L4700_1_2_GHz
+#ifndef VBOX_CPUDB_VIA_QuadCore_L4700_1_2_GHz_h
+#define VBOX_CPUDB_VIA_QuadCore_L4700_1_2_GHz_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/APICInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/APICInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/APICInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___APICInternal_h
-#define ___APICInternal_h
+#ifndef VMM_INCLUDED_SRC_include_APICInternal_h
+#define VMM_INCLUDED_SRC_include_APICInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/CFGMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/CFGMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/CFGMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___CFGMInternal_h
-#define ___CFGMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_CFGMInternal_h
+#define VMM_INCLUDED_SRC_include_CFGMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/CPUMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/CPUMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/CPUMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___CPUMInternal_h
-#define ___CPUMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_CPUMInternal_h
+#define VMM_INCLUDED_SRC_include_CPUMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/CSAMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/CSAMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/CSAMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___CSAMInternal_h
-#define ___CSAMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_CSAMInternal_h
+#define VMM_INCLUDED_SRC_include_CSAMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/DBGFInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/DBGFInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/DBGFInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___DBGFInternal_h
-#define ___DBGFInternal_h
+#ifndef VMM_INCLUDED_SRC_include_DBGFInternal_h
+#define VMM_INCLUDED_SRC_include_DBGFInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/EMHandleRCTmpl.h
===================================================================
--- trunk/src/VBox/VMM/include/EMHandleRCTmpl.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/EMHandleRCTmpl.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___EMHandleRCTmpl_h
-#define ___EMHandleRCTmpl_h
+#ifndef VMM_INCLUDED_SRC_include_EMHandleRCTmpl_h
+#define VMM_INCLUDED_SRC_include_EMHandleRCTmpl_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/EMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/EMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/EMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___EMInternal_h
-#define ___EMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_EMInternal_h
+#define VMM_INCLUDED_SRC_include_EMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/FTMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/FTMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/FTMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___FTMInternal_h
-#define ___FTMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_FTMInternal_h
+#define VMM_INCLUDED_SRC_include_FTMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/GIMHvInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/GIMHvInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/GIMHvInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___GIMHvInternal_h
-#define ___GIMHvInternal_h
+#ifndef VMM_INCLUDED_SRC_include_GIMHvInternal_h
+#define VMM_INCLUDED_SRC_include_GIMHvInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/GIMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/GIMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/GIMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___GIMInternal_h
-#define ___GIMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_GIMInternal_h
+#define VMM_INCLUDED_SRC_include_GIMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/GIMKvmInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/GIMKvmInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/GIMKvmInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___GIMKvmInternal_h
-#define ___GIMKvmInternal_h
+#ifndef VMM_INCLUDED_SRC_include_GIMKvmInternal_h
+#define VMM_INCLUDED_SRC_include_GIMKvmInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/GIMMinimalInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/GIMMinimalInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/GIMMinimalInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___GIMMinimalInternal_h
-#define ___GIMMinimalInternal_h
+#ifndef VMM_INCLUDED_SRC_include_GIMMinimalInternal_h
+#define VMM_INCLUDED_SRC_include_GIMMinimalInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/HMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/HMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/HMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___HMInternal_h
-#define ___HMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_HMInternal_h
+#define VMM_INCLUDED_SRC_include_HMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/IEMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/IEMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/IEMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___IEMInternal_h
-#define ___IEMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_IEMInternal_h
+#define VMM_INCLUDED_SRC_include_IEMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/IOMInline.h
===================================================================
--- trunk/src/VBox/VMM/include/IOMInline.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/IOMInline.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___IOMInline_h
-#define ___IOMInline_h
+#ifndef VMM_INCLUDED_SRC_include_IOMInline_h
+#define VMM_INCLUDED_SRC_include_IOMInline_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/IOMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/IOMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/IOMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___IOMInternal_h
-#define ___IOMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_IOMInternal_h
+#define VMM_INCLUDED_SRC_include_IOMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/MMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/MMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/MMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___MMInternal_h
-#define ___MMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_MMInternal_h
+#define VMM_INCLUDED_SRC_include_MMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/NEMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/NEMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/NEMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___NEMInternal_h
-#define ___NEMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_NEMInternal_h
+#define VMM_INCLUDED_SRC_include_NEMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PATMA.h
===================================================================
--- trunk/src/VBox/VMM/include/PATMA.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PATMA.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PATMA_H
-#define ___PATMA_H
+#ifndef VMM_INCLUDED_SRC_include_PATMA_h
+#define VMM_INCLUDED_SRC_include_PATMA_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PATMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/PATMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PATMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PATMInternal_h
-#define ___PATMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_PATMInternal_h
+#define VMM_INCLUDED_SRC_include_PATMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PDMAsyncCompletionFileInternal_h
-#define ___PDMAsyncCompletionFileInternal_h
+#ifndef VMM_INCLUDED_SRC_include_PDMAsyncCompletionFileInternal_h
+#define VMM_INCLUDED_SRC_include_PDMAsyncCompletionFileInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PDMAsyncCompletionInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/PDMAsyncCompletionInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PDMAsyncCompletionInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PDMAsyncCompletionInternal_h
-#define ___PDMAsyncCompletionInternal_h
+#ifndef VMM_INCLUDED_SRC_include_PDMAsyncCompletionInternal_h
+#define VMM_INCLUDED_SRC_include_PDMAsyncCompletionInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PDMBlkCacheInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/PDMBlkCacheInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PDMBlkCacheInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PDMBlkCacheInternal_h
-#define ___PDMBlkCacheInternal_h
+#ifndef VMM_INCLUDED_SRC_include_PDMBlkCacheInternal_h
+#define VMM_INCLUDED_SRC_include_PDMBlkCacheInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PDMInline.h
===================================================================
--- trunk/src/VBox/VMM/include/PDMInline.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PDMInline.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef VBOX_INCLUDED_PDMInline_h
-#define VBOX_INCLUDED_PDMInline_h
+#ifndef VMM_INCLUDED_SRC_include_PDMInline_h
+#define VMM_INCLUDED_SRC_include_PDMInline_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PDMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/PDMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PDMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PDMInternal_h
-#define ___PDMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_PDMInternal_h
+#define VMM_INCLUDED_SRC_include_PDMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PDMNetShaperInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/PDMNetShaperInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PDMNetShaperInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef VBOX_INCLUDED_PDMNetShaperInternal_h
-#define VBOX_INCLUDED_PDMNetShaperInternal_h
+#ifndef VMM_INCLUDED_SRC_include_PDMNetShaperInternal_h
+#define VMM_INCLUDED_SRC_include_PDMNetShaperInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PGMInline.h
===================================================================
--- trunk/src/VBox/VMM/include/PGMInline.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PGMInline.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PGMInline_h
-#define ___PGMInline_h
+#ifndef VMM_INCLUDED_SRC_include_PGMInline_h
+#define VMM_INCLUDED_SRC_include_PGMInline_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/PGMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/PGMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/PGMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___PGMInternal_h
-#define ___PGMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_PGMInternal_h
+#define VMM_INCLUDED_SRC_include_PGMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/REMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/REMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/REMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___REMInternal_h
-#define ___REMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_REMInternal_h
+#define VMM_INCLUDED_SRC_include_REMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/SELMInline.h
===================================================================
--- trunk/src/VBox/VMM/include/SELMInline.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/SELMInline.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___SELMInline_h
-#define ___SELMInline_h
+#ifndef VMM_INCLUDED_SRC_include_SELMInline_h
+#define VMM_INCLUDED_SRC_include_SELMInline_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/SELMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/SELMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/SELMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___SELMInternal_h
-#define ___SELMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_SELMInternal_h
+#define VMM_INCLUDED_SRC_include_SELMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/SSMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/SSMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/SSMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___SSMInternal_h
-#define ___SSMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_SSMInternal_h
+#define VMM_INCLUDED_SRC_include_SSMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/STAMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/STAMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/STAMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___STAMInternal_h
-#define ___STAMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_STAMInternal_h
+#define VMM_INCLUDED_SRC_include_STAMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/TMInline.h
===================================================================
--- trunk/src/VBox/VMM/include/TMInline.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/TMInline.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___TMInline_h
-#define ___TMInline_h
+#ifndef VMM_INCLUDED_SRC_include_TMInline_h
+#define VMM_INCLUDED_SRC_include_TMInline_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/TMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/TMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/TMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___TMInternal_h
-#define ___TMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_TMInternal_h
+#define VMM_INCLUDED_SRC_include_TMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/TRPMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/TRPMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/TRPMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___TRPMInternal_h
-#define ___TRPMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_TRPMInternal_h
+#define VMM_INCLUDED_SRC_include_TRPMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/VMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/VMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/VMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___VMInternal_h
-#define ___VMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_VMInternal_h
+#define VMM_INCLUDED_SRC_include_VMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/VMMInternal.h
===================================================================
--- trunk/src/VBox/VMM/include/VMMInternal.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/VMMInternal.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___VMMInternal_h
-#define ___VMMInternal_h
+#ifndef VMM_INCLUDED_SRC_include_VMMInternal_h
+#define VMM_INCLUDED_SRC_include_VMMInternal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/VMMSwitcher.h
===================================================================
--- trunk/src/VBox/VMM/include/VMMSwitcher.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/VMMSwitcher.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___VMMSwitcher_h
-#define ___VMMSwitcher_h
+#ifndef VMM_INCLUDED_SRC_include_VMMSwitcher_h
+#define VMM_INCLUDED_SRC_include_VMMSwitcher_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/include/VMMTracing.h
===================================================================
--- trunk/src/VBox/VMM/include/VMMTracing.h	(revision 76553)
+++ trunk/src/VBox/VMM/include/VMMTracing.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___VMMTracing_h___
-#define ___VMMTracing_h___
+#ifndef VMM_INCLUDED_SRC_include_VMMTracing_h
+#define VMM_INCLUDED_SRC_include_VMMTracing_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/testcase/tstHelp.h
===================================================================
--- trunk/src/VBox/VMM/testcase/tstHelp.h	(revision 76553)
+++ trunk/src/VBox/VMM/testcase/tstHelp.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___tstHelp_h
-#define ___tstHelp_h
+#ifndef VMM_INCLUDED_SRC_testcase_tstHelp_h
+#define VMM_INCLUDED_SRC_testcase_tstHelp_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/testcase/tstMicro.h
===================================================================
--- trunk/src/VBox/VMM/testcase/tstMicro.h	(revision 76553)
+++ trunk/src/VBox/VMM/testcase/tstMicro.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___tstMicro_h
-#define ___tstMicro_h
+#ifndef VMM_INCLUDED_SRC_testcase_tstMicro_h
+#define VMM_INCLUDED_SRC_testcase_tstMicro_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
Index: trunk/src/VBox/VMM/tools/VBoxCpuReport.h
===================================================================
--- trunk/src/VBox/VMM/tools/VBoxCpuReport.h	(revision 76553)
+++ trunk/src/VBox/VMM/tools/VBoxCpuReport.h	(revision 76561)
@@ -16,6 +16,6 @@
  */
 
-#ifndef ___VBoxCpuReport_h___
-#define ___VBoxCpuReport_h___
+#ifndef VMM_INCLUDED_SRC_tools_VBoxCpuReport_h
+#define VMM_INCLUDED_SRC_tools_VBoxCpuReport_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
