Index: /trunk/include/iprt/cdefs.h
===================================================================
--- /trunk/include/iprt/cdefs.h	(revision 26223)
+++ /trunk/include/iprt/cdefs.h	(revision 26224)
@@ -79,5 +79,5 @@
 #define IN_RC
 #define IN_RC
-#define IN_RT_GC
+#define IN_RT_RC
 #define IN_RT_R0
 #define IN_RT_R3
@@ -743,5 +743,5 @@
  * or not. The IPRT symbols will be declared as hidden (if
  * supported). Note that this define has no effect without setting
- * IN_RT_R0, IN_RT_R3 or IN_RT_GC indicators are set first.
+ * IN_RT_R0, IN_RT_R3 or IN_RT_RC indicators are set first.
  */
 
@@ -782,5 +782,5 @@
 #endif
 
-/** @def IN_RT_GC
+/** @def IN_RT_RC
  * Used to indicate whether we're inside the same link module as
  * the GC Runtime Library.
@@ -790,5 +790,5 @@
  * @param   type    The return type of the function declaration.
  */
-#ifdef IN_RT_GC
+#ifdef IN_RT_RC
 # ifdef IN_RT_STATIC
 #  define RTGCDECL(type)    DECLHIDDEN(type) RTCALL
@@ -805,5 +805,5 @@
  * @param   type    The return type of the function declaration.
  */
-#if defined(IN_RT_R3) || defined(IN_RT_GC) || defined(IN_RT_R0)
+#if defined(IN_RT_R3) || defined(IN_RT_RC) || defined(IN_RT_R0)
 # ifdef IN_RT_STATIC
 #  define RTDECL(type)      DECLHIDDEN(type) RTCALL
@@ -820,5 +820,5 @@
  * @param   type    The return type of the function declaration.
  */
-#if defined(IN_RT_R3) || defined(IN_RT_GC) || defined(IN_RT_R0)
+#if defined(IN_RT_R3) || defined(IN_RT_RC) || defined(IN_RT_R0)
 # ifdef IN_RT_STATIC
 #  define RTDATADECL(type)  DECLHIDDEN(type)
@@ -833,5 +833,5 @@
  * Declares an class living in the runtime.
  */
-#if defined(IN_RT_R3) || defined(IN_RT_GC) || defined(IN_RT_R0)
+#if defined(IN_RT_R3) || defined(IN_RT_RC) || defined(IN_RT_R0)
 # ifdef IN_RT_STATIC
 #  define RT_DECL_CLASS
Index: /trunk/src/VBox/Disassembler/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Disassembler/Makefile.kmk	(revision 26223)
+++ /trunk/src/VBox/Disassembler/Makefile.kmk	(revision 26224)
@@ -53,5 +53,5 @@
  LIBRARIES              += DisasmRC
  DisasmRC_TEMPLATE       = VBoxRc
- DisasmRC_DEFS           = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
+ DisasmRC_DEFS           = IN_DIS IN_RT_RC DIS_CORE_ONLY
  DisasmRC_SOURCES        = \
  	DisasmCore.cpp \
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 26223)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 26224)
@@ -1550,5 +1550,5 @@
  #
  RuntimeRC_TEMPLATE      = VBoxRc
- RuntimeRC_DEFS          = IN_RT_GC RT_WITH_VBOX
+ RuntimeRC_DEFS          = IN_RT_RC RT_WITH_VBOX
  RuntimeRC_INCS          = include
  RuntimeRC_SOURCES       = \
Index: /trunk/src/VBox/Runtime/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 26223)
+++ /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 26224)
@@ -233,5 +233,5 @@
  tstLdrObj_SYSSUFF = .gc
  tstLdrObj_SOURCES = tstLdrObj.cpp
- tstLdrObj_DEFS = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
+ tstLdrObj_DEFS = IN_DIS IN_RT_RC DIS_CORE_ONLY
  ifeq ($(VBOX_LDR_FMT32),elf)
  tstLdrObj_DEFS += VBOX_SOME_IMPORT_FUNCTION
Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 26223)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 26224)
@@ -328,5 +328,5 @@
  VMMGC_SYSSUFF   = .gc
 
- VMMGC_DEFS      = IN_VMM_RC IN_RT_GC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE
+ VMMGC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE
  ifdef VBOX_WITH_R0_LOGGING
   VMMGC_DEFS    += VBOX_WITH_R0_LOGGING
Index: /trunk/src/VBox/VMM/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/testcase/Makefile.kmk	(revision 26223)
+++ /trunk/src/VBox/VMM/testcase/Makefile.kmk	(revision 26224)
@@ -102,5 +102,5 @@
 ifdef VBOX_WITH_RAW_MODE
  tstVMStructRC_TEMPLATE  = VBoxRcExe
- tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC VBOX_WITH_RAW_MODE
+ tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE
  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
   tstVMStructRC_DEFS    += \
@@ -152,5 +152,5 @@
 ifdef VBOX_WITH_RAW_MODE
  tstAsmStructsRC_TEMPLATE= VBoxRcExe
- tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC VBOX_WITH_RAW_MODE
+ tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE
  ifdef VBOX_WITH_R0_LOGGING
   tstAsmStructsRC_DEFS  += VBOX_WITH_R0_LOGGING