Index: /trunk/include/VBox/cdefs.h
===================================================================
--- /trunk/include/VBox/cdefs.h	(revision 26226)
+++ /trunk/include/VBox/cdefs.h	(revision 26227)
@@ -67,5 +67,5 @@
 #define IN_SUP_R0
 #define IN_SUP_R3
-#define IN_SUP_GC
+#define IN_SUP_RC
 #define IN_SUP_STATIC
 #define IN_USBLIB
@@ -122,5 +122,5 @@
 
 /** @def IN_INTNET_R3
- * Used to indicate whether we're inside the same link module as the Ring 3
+ * Used to indicate whether we're inside the same link module as the Ring-3
  * Internal Networking Service.
  */
@@ -168,5 +168,6 @@
 
 /** @def IN_SUP_R3
- * Used to indicate whether we're inside the same link module as the Ring 3 Support Library or not.
+ * Used to indicate whether we're inside the same link module as the Ring-3
+ * Support Library or not.
  */
 /** @def SUPR3DECL(type)
@@ -181,5 +182,5 @@
 
 /** @def IN_SUP_R0
- * Used to indicate whether we're inside the same link module as the Ring 0
+ * Used to indicate whether we're inside the same link module as the Ring-0
  * Support Library or not.
  */
@@ -206,19 +207,21 @@
 #endif
 
-/** @def IN_SUP_GC
- * Used to indicate whether we're inside the same link module as the GC Support Library or not.
- */
-/** @def SUPGCDECL(type)
+/** @def IN_SUP_RC
+ * Used to indicate whether we're inside the same link module as the RC Support
+ * Library or not.
+ */
+/** @def SUPRCDECL(type)
  * Support library export or import declaration.
  * @param   type    The return type of the function declaration.
  */
-#ifdef IN_SUP_GC
-# define SUPGCDECL(type)    DECLEXPORT(type) VBOXCALL
-#else
-# define SUPGCDECL(type)    DECLIMPORT(type) VBOXCALL
+#ifdef IN_SUP_RC
+# define SUPRCDECL(type)    DECLEXPORT(type) VBOXCALL
+#else
+# define SUPRCDECL(type)    DECLIMPORT(type) VBOXCALL
 #endif
 
 /** @def IN_SUP_R0
- * Used to indicate whether we're inside the same link module as the Ring 0 Support Library or not.
+ * Used to indicate whether we're inside the same link module as the Ring-0
+ * Support Library or not.
  */
 /** @def SUPR0DECL(type)
@@ -226,5 +229,5 @@
  * @param   type    The return type of the function declaration.
  */
-#if defined(IN_SUP_R0) || defined(IN_SUP_R3) || defined(IN_SUP_GC)
+#if defined(IN_SUP_R0) || defined(IN_SUP_R3) || defined(IN_SUP_RC)
 # define SUPDECL(type)      DECLEXPORT(type) VBOXCALL
 #else
@@ -260,5 +263,5 @@
  */
 /** @def VMMR3DECL
- * Ring 3 VMM export or import declaration.
+ * Ring-3 VMM export or import declaration.
  * @param   type    The return type of the function declaration.
  */
@@ -280,9 +283,9 @@
 
 /** @def IN_VMM_R0
- * Used to indicate whether we're inside the same link module as the ring 0 part of the
- * virtual machine monitor or not.
+ * Used to indicate whether we're inside the same link module as the ring-0 part
+ * of the virtual machine monitor or not.
  */
 /** @def VMMR0DECL
- * Ring 0 VMM export or import declaration.
+ * Ring-0 VMM export or import declaration.
  * @param   type    The return type of the function declaration.
  */
Index: /trunk/include/VBox/sup.h
===================================================================
--- /trunk/include/VBox/sup.h	(revision 26226)
+++ /trunk/include/VBox/sup.h	(revision 26227)
@@ -217,5 +217,5 @@
  *          as volatile. Thus, there is no PCSUPGLOBALINFOPAGE type.
  */
-#if defined(IN_SUP_R0) || defined(IN_SUP_R3) || defined(IN_SUP_GC)
+#if defined(IN_SUP_R0) || defined(IN_SUP_R3) || defined(IN_SUP_RC)
 extern DECLEXPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
 
@@ -463,5 +463,5 @@
 #ifdef IN_RING3
 
-/** @defgroup   grp_sup_r3     SUP Host Context Ring 3 API
+/** @defgroup   grp_sup_r3     SUP Host Context Ring-3 API
  * @ingroup grp_sup
  * @{
@@ -966,5 +966,5 @@
 
 #ifdef IN_RING0
-/** @defgroup   grp_sup_r0     SUP Host Context Ring 0 API
+/** @defgroup   grp_sup_r0     SUP Host Context Ring-0 API
  * @ingroup grp_sup
  * @{
Index: /trunk/src/VBox/Runtime/common/time/timesupA.asm
===================================================================
--- /trunk/src/VBox/Runtime/common/time/timesupA.asm	(revision 26226)
+++ /trunk/src/VBox/Runtime/common/time/timesupA.asm	(revision 26227)
@@ -57,5 +57,5 @@
  %define IN_SUPLIB
 %endif
-%ifdef IN_SUP_GC
+%ifdef IN_SUP_RC
  %define IN_SUPLIB
 %endif