Index: /trunk/src/VBox/VMM/VMMAll/GIMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/GIMAll.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMAll/GIMAll.cpp	(revision 61632)
@@ -21,9 +21,11 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
+#include <VBox/vmm/em.h>    /* For EMInterpretDisasCurrent */
 #include "GIMInternal.h"
+#include <VBox/vmm/vm.h>
+
+#include <VBox/dis.h>       /* For DISCPUSTATE */
 #include <VBox/err.h>
-#include <VBox/dis.h>       /* For DISCPUSTATE */
-#include <VBox/vmm/em.h>    /* For EMInterpretDisasCurrent */
-#include <VBox/vmm/vm.h>
 
 /* Include all the providers. */
Index: /trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp	(revision 61632)
@@ -21,8 +21,11 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
 #include <VBox/vmm/em.h>
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/tm.h>
 #include <VBox/vmm/dbgf.h>
+#include <VBox/vmm/pdmdev.h>
+#include <VBox/vmm/pdmapi.h>
 #include <VBox/vmm/pgm.h>
 #include "GIMHvInternal.h"
@@ -30,6 +33,4 @@
 #include <VBox/vmm/vm.h>
 
-#include <VBox/vmm/pdmdev.h>
-#include <VBox/vmm/pdmapi.h>
 #include <VBox/err.h>
 
Index: /trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp	(revision 61632)
@@ -21,16 +21,17 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
-#include "GIMKvmInternal.h"
-#include "GIMInternal.h"
-
-#include <VBox/err.h>
-#include <VBox/dis.h>
+#include <VBox/vmm/gim.h>
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/em.h>
 #include <VBox/vmm/tm.h>
-#include <VBox/vmm/vm.h>
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/pdmapi.h>
+#include "GIMKvmInternal.h"
+#include "GIMInternal.h"
+#include <VBox/vmm/vm.h>
+
+#include <VBox/dis.h>
+#include <VBox/err.h>
 #include <VBox/sup.h>
 
Index: /trunk/src/VBox/VMM/VMMR0/GIMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/GIMR0.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMR0/GIMR0.cpp	(revision 61632)
@@ -21,9 +21,10 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
 #include "GIMInternal.h"
 #include "GIMHvInternal.h"
+#include <VBox/vmm/vm.h>
 
 #include <VBox/err.h>
-#include <VBox/vmm/vm.h>
 
 
Index: /trunk/src/VBox/VMM/VMMR0/GIMR0Hv.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/GIMR0Hv.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMR0/GIMR0Hv.cpp	(revision 61632)
@@ -21,11 +21,11 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
+#include <VBox/vmm/tm.h>
 #include "GIMInternal.h"
 #include "GIMHvInternal.h"
+#include <VBox/vmm/vm.h>
 
 #include <VBox/err.h>
-#include <VBox/vmm/gim.h>
-#include <VBox/vmm/tm.h>
-#include <VBox/vmm/vm.h>
 
 #include <iprt/spinlock.h>
Index: /trunk/src/VBox/VMM/VMMR0/GIMR0Kvm.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/GIMR0Kvm.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMR0/GIMR0Kvm.cpp	(revision 61632)
@@ -21,11 +21,11 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
+#include <VBox/vmm/tm.h>
 #include "GIMInternal.h"
 #include "GIMKvmInternal.h"
+#include <VBox/vmm/vm.h>
 
 #include <VBox/err.h>
-#include <VBox/vmm/gim.h>
-#include <VBox/vmm/tm.h>
-#include <VBox/vmm/vm.h>
 
 #include <iprt/spinlock.h>
Index: /trunk/src/VBox/VMM/VMMR3/GIM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/GIM.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMR3/GIM.cpp	(revision 61632)
@@ -51,10 +51,12 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
-#include <VBox/log.h>
-#include "GIMInternal.h"
-#include <VBox/vmm/vm.h>
+#include <VBox/vmm/gim.h>
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/ssm.h>
 #include <VBox/vmm/pdmdev.h>
+#include "GIMInternal.h"
+#include <VBox/vmm/vm.h>
+
+#include <VBox/log.h>
 
 #include <iprt/err.h>
Index: /trunk/src/VBox/VMM/VMMR3/GIMHv.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/GIMHv.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMR3/GIMHv.cpp	(revision 61632)
@@ -21,5 +21,14 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
+#include <VBox/vmm/cpum.h>
+#include <VBox/vmm/mm.h>
+#include <VBox/vmm/ssm.h>
+#include <VBox/vmm/hm.h>
+#include <VBox/vmm/pdmapi.h>
 #include "GIMInternal.h"
+#include <VBox/vmm/vm.h>
+
+#include <VBox/version.h>
 
 #include <iprt/assert.h>
@@ -29,12 +38,4 @@
 #include <iprt/semaphore.h>
 #include <iprt/spinlock.h>
-
-#include <VBox/vmm/cpum.h>
-#include <VBox/vmm/mm.h>
-#include <VBox/vmm/ssm.h>
-#include <VBox/vmm/vm.h>
-#include <VBox/vmm/hm.h>
-#include <VBox/vmm/pdmapi.h>
-#include <VBox/version.h>
 #ifdef DEBUG_ramshankar
 # include <iprt/udp.h>
Index: /trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp	(revision 61632)
@@ -21,5 +21,14 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
+#include <VBox/vmm/cpum.h>
+#include <VBox/vmm/hm.h>
+#include <VBox/vmm/pdmapi.h>
+#include <VBox/vmm/ssm.h>
 #include "GIMInternal.h"
+#include <VBox/vmm/vm.h>
+
+#include <VBox/disopcode.h>
+#include <VBox/version.h>
 
 #include <iprt/asm-math.h>
@@ -30,11 +39,4 @@
 #include <iprt/spinlock.h>
 
-#include <VBox/vmm/cpum.h>
-#include <VBox/disopcode.h>
-#include <VBox/vmm/ssm.h>
-#include <VBox/vmm/vm.h>
-#include <VBox/vmm/hm.h>
-#include <VBox/vmm/pdmapi.h>
-#include <VBox/version.h>
 
 
Index: /trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp	(revision 61631)
+++ /trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp	(revision 61632)
@@ -21,5 +21,10 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
+#include <VBox/vmm/gim.h>
+#include <VBox/vmm/cpum.h>
+#include <VBox/vmm/tm.h>
+#include <VBox/vmm/pdmapi.h>
 #include "GIMInternal.h"
+#include <VBox/vmm/vm.h>
 
 #include <iprt/assert.h>
@@ -27,9 +32,4 @@
 #include <iprt/asm-amd64-x86.h>
 #include <iprt/string.h>
-
-#include <VBox/vmm/cpum.h>
-#include <VBox/vmm/vm.h>
-#include <VBox/vmm/tm.h>
-#include <VBox/vmm/pdmapi.h>