Index: /trunk/include/VBox/version.h
===================================================================
--- /trunk/include/VBox/version.h	(revision 55772)
+++ /trunk/include/VBox/version.h	(revision 55773)
@@ -27,9 +27,11 @@
 #define ___VBox_version_h
 
+#include <iprt/cdefs.h> /* For RT_XSTR. */
+
 /* Product info. */
 #include <product-generated.h>
+#include <version-generated.h>
 
 #ifndef RC_INVOKED
-# include <version-generated.h>
 
 /** Combined version number. */
@@ -93,18 +95,14 @@
 
 /** @name Prefined strings for Windows resource files
- *
- * @remarks The VBOX_VERSION_*_NR define are integer numbers while
- *          VBOX_VERSION_* are strings when using the resource compile.
- *          Kind of confusing...
- *
  * @{ */
 #define VBOX_RC_COMPANY_NAME            VBOX_VENDOR
 #define VBOX_RC_LEGAL_COPYRIGHT         "Copyright (C) 2009-" VBOX_C_YEAR " Oracle Corporation\0"
-#define VBOX_RC_PRODUCT_VERSION         VBOX_VERSION_MAJOR_NR , VBOX_VERSION_MINOR_NR , 0 , 0
-#define VBOX_RC_FILE_VERSION            VBOX_VERSION_MAJOR_NR , VBOX_VERSION_MINOR_NR , 0 , 0
+#define VBOX_RC_PRODUCT_VERSION         VBOX_VERSION_MAJOR , VBOX_VERSION_MINOR , VBOX_VERSION_BUILD , 0
+#define VBOX_RC_PRODUCT_VERSION_STR     RT_XSTR(VBOX_VERSION_MAJOR) "." RT_XSTR(VBOX_VERSION_MINOR) "." RT_XSTR(VBOX_VERSION_BUILD) ".r" RT_XSTR(VBOX_SVN_REV) "\0"
+#define VBOX_RC_FILE_VERSION            VBOX_VERSION_MAJOR , VBOX_VERSION_MINOR , VBOX_VERSION_BUILD , 0
+#define VBOX_RC_FILE_VERSION_STR        RT_XSTR(VBOX_VERSION_MAJOR) "." RT_XSTR(VBOX_VERSION_MINOR) "." RT_XSTR(VBOX_VERSION_BUILD) "." RT_XSTR(VBOX_SVN_REV) "\0"
+#define VBOX_RC_PRODUCT_NAME_STR        VBOX_PRODUCT_NAME "\0"
+#define VBOX_RC_PRODUCT_NAME_GA_STR     VBOX_PRODUCT_NAME " Guest Additions\0"
 /** @} */
-
-/** @todo Clean up the resource compiler mess where we cannot include
- *        version-generated.h and requires two files. */
 
 #endif