Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 22822)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 22823)
@@ -463,10 +463,4 @@
 Graphics/DevVGA.cpp_DEPS = $(PATH_VgaBiosBin)/vbetables.h
 
-# Reporting it to the guest.
-VMMDev/VMMDev.cpp_DEFS   = VBOX_SVN_REV=$(VBOX_SVN_REV)
-VMMDev/VMMDev.cpp_DEPS   = $(VBOX_SVN_REV_KMK)
-PC/DevPcBios.cpp_DEFS    = VBOX_SVN_REV=$(VBOX_SVN_REV)
-PC/DevPcBios.cpp_DEPS    = $(VBOX_SVN_REV_KMK)
-
 
 #
Index: /trunk/src/VBox/Devices/PC/DevPcBios.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DevPcBios.cpp	(revision 22822)
+++ /trunk/src/VBox/Devices/PC/DevPcBios.cpp	(revision 22823)
@@ -29,7 +29,7 @@
 
 #include <VBox/log.h>
-#include <VBox/version.h>
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
+#include <iprt/buildconfig.h>
 #include <iprt/file.h>
 #include <iprt/string.h>
@@ -1151,6 +1151,6 @@
     char* pszVBoxVer, *pszVBoxRev;
     RTStrAPrintf(&pszVBoxVer, "vboxVer_%d.%d.%d",
-                  VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR, VBOX_VERSION_BUILD);
-    RTStrAPrintf(&pszVBoxRev, "vboxRev_%ld", VBOX_SVN_REV);
+                  RTBldCfgVersionMajor(), RTBldCfgVersionMinor(), RTBldCfgVersionBuild());
+    RTStrAPrintf(&pszVBoxRev, "vboxRev_%ld", RTBldCfgRevision());
     READCFGSTR("DmiOEMVBoxVer", pszDmiOEMVBoxVer, pszVBoxVer);
     READCFGSTR("DmiOEMVBoxRev", pszDmiOEMVBoxRev, pszVBoxRev);
Index: /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
===================================================================
--- /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 22822)
+++ /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 22823)
@@ -35,7 +35,7 @@
 #include <VBox/err.h>
 #include <VBox/vm.h> /* for VM_IS_EMT */
-#include <VBox/version.h>
 
 #include <iprt/assert.h>
+#include <iprt/buildconfig.h>
 #include <iprt/string.h>
 #include <iprt/time.h>
@@ -1632,8 +1632,8 @@
                                pRequestHeader->rc = VERR_INVALID_PARAMETER);
             VMMDevReqHostVersion *pReqHostVer = (VMMDevReqHostVersion*)pRequestHeader;
-            pReqHostVer->major = VBOX_VERSION_MAJOR;
-            pReqHostVer->minor = VBOX_VERSION_MINOR;
-            pReqHostVer->build = VBOX_VERSION_BUILD;
-            pReqHostVer->revision = VBOX_SVN_REV;
+            pReqHostVer->major = RTBldCfgVersionMajor();
+            pReqHostVer->minor = RTBldCfgVersionMinor();
+            pReqHostVer->build = RTBldCfgVersionBuild();
+            pReqHostVer->revision = RTBldCfgRevision();
             pReqHostVer->features = VMMDEV_HVF_HGCM_PHYS_PAGE_LIST;
             pReqHostVer->header.rc = VINF_SUCCESS;
Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 22822)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 22823)
@@ -193,15 +193,8 @@
 endif
 
-VirtualBox_src/main.cpp_DEFS += VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\"
-VirtualBox_src/main.cpp_DEPS += $(VBOX_VERSION_MK)
-
 ifdef VBOX_BLEEDING_EDGE
 VirtualBox_src/VBoxConsoleWnd.cpp_DEFS += \
-    VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
-    VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
 VirtualBox_src/VBoxSelectorWnd.cpp_DEFS += \
-    VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
-    VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
 VirtualBox_src/VBoxAboutDlg.cpp_DEFS += \
@@ -209,6 +202,4 @@
 VirtualBox_src/main.cpp_DEFS += \
     VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
-VirtualBox_src/VBoxConsoleWnd.cpp_DEPS += $(VBOX_VERSION_MK) $(VBOX_SVN_REV_KMK)
-VirtualBox_src/VBoxSelectorWnd.cpp_DEPS += $(VBOX_VERSION_MK) $(VBOX_SVN_REV_KMK)
 endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp	(revision 22822)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp	(revision 22823)
@@ -72,4 +72,5 @@
 #endif
 
+#include <iprt/buildconfig.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
@@ -1647,5 +1648,9 @@
 
 #ifdef VBOX_BLEEDING_EDGE
-    caption_prefix += QString(" EXPERIMENTAL build "VBOX_VERSION_STRING" r"VBOX_SVN_REV" - "VBOX_BLEEDING_EDGE);
+    caption_prefix += QString(" EXPERIMENTAL build ")
+                   + QString(RTBldCfgVersion())
+                   + QString("r")
+                   + QString(RTBldCfgRevisionStr()) 
+                   + QString(" - "VBOX_BLEEDING_EDGE);
 #endif
     /*
Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp	(revision 22822)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp	(revision 22823)
@@ -49,4 +49,6 @@
 #include <QDesktopWidget>
 #include <QToolButton>
+
+#include <iprt/buildconfig.h>
 
 // VBoxVMDetailsView class
@@ -1292,5 +1294,9 @@
 
 #ifdef VBOX_BLEEDING_EDGE
-    title += QString(" EXPERIMENTAL build "VBOX_VERSION_STRING" r"VBOX_SVN_REV" - "VBOX_BLEEDING_EDGE);
+    title += QString(" EXPERIMENTAL build ")
+          +  QString(RTBldCfgVersion())
+          +  QString(" r")
+          +  QString(RTBldCfgRevisionStr())
+          +  QString(" - "VBOX_BLEEDING_EDGE);
 #endif
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 22822)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 22823)
@@ -50,4 +50,5 @@
 #endif
 
+#include <iprt/buildconfig.h>
 #include <iprt/err.h>
 #include <iprt/initterm.h>
@@ -241,5 +242,5 @@
 #endif
 
-    RTPrintf("Sun VirtualBox Graphical User Interface "VBOX_VERSION_STRING"\n"
+    RTPrintf("Sun VirtualBox Graphical User Interface %s\n"
             "(C) 2005-2009 Sun Microsystems, Inc.\n"
             "All rights reserved.\n"
@@ -263,4 +264,5 @@
 # endif
             "\n",
+            RTBldCfgVersion(),
             mode.toLatin1().constData(),
             dflt.toLatin1().constData());
Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 22822)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 22823)
@@ -514,8 +514,4 @@
 endif
 
-#
-# For vmmGetSvnRev.
-#
-VMMAll/VMMAll.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 
 include	$(KBUILD_PATH)/subfooter.kmk
Index: /trunk/src/VBox/VMM/VMMAll/VMMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/VMMAll.cpp	(revision 22822)
+++ /trunk/src/VBox/VMM/VMMAll/VMMAll.cpp	(revision 22823)
@@ -31,4 +31,5 @@
 #include <VBox/param.h>
 #include <VBox/hwaccm.h>
+#include <iprt/buildconfig.h>
 
 
@@ -139,5 +140,5 @@
 VMMDECL(uint32_t) VMMGetSvnRev(void)
 {
-    return VBOX_SVN_REV;
+    return RTBldCfgRevision();
 }