Index: /trunk/src/VBox/Additions/linux/export_modules
===================================================================
--- /trunk/src/VBox/Additions/linux/export_modules	(revision 54134)
+++ /trunk/src/VBox/Additions/linux/export_modules	(revision 54135)
@@ -48,11 +48,13 @@
 
 # Create auto-generated version file, needed by all modules
-echo "#ifndef __version_generated_h__" > $PATH_TMP/version-generated.h
-echo "#define __version_generated_h__" >> $PATH_TMP/version-generated.h
+echo "#ifndef ___version_generated_h___" > $PATH_TMP/version-generated.h
+echo "#define ___version_generated_h___" >> $PATH_TMP/version-generated.h
 echo "" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_MAJOR $VBOX_VERSION_MAJOR" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_MINOR $VBOX_VERSION_MINOR" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_BUILD $VBOX_VERSION_BUILD" >> $PATH_TMP/version-generated.h
+echo "#define VBOX_VERSION_STRING_RAW \"$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD\"" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_STRING \"$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD\"" >> $PATH_TMP/version-generated.h
+echo "#define VBOX_API_VERSION_STRING \"${VBOX_VERSION_MAJOR}_${VBOX_VERSION_MINOR}\"" >> $PATH_TMP/version-generated.h
 echo "" >> $PATH_TMP/version-generated.h
 echo "#endif" >> $PATH_TMP/version-generated.h
@@ -67,6 +69,6 @@
 
 # Create auto-generated product file, needed by all modules
-echo "#ifndef __product_generated_h__" > $PATH_TMP/product-generated.h
-echo "#define __product_generated_h__" >> $PATH_TMP/product-generated.h
+echo "#ifndef ___product_generated_h___" > $PATH_TMP/product-generated.h
+echo "#define ___product_generated_h___" >> $PATH_TMP/product-generated.h
 echo "" >> $PATH_TMP/product-generated.h
 echo "#define VBOX_VENDOR \"$VBOX_VENDOR\"" >> $PATH_TMP/product-generated.h
Index: /trunk/src/VBox/HostDrivers/linux/export_modules
===================================================================
--- /trunk/src/VBox/HostDrivers/linux/export_modules	(revision 54134)
+++ /trunk/src/VBox/HostDrivers/linux/export_modules	(revision 54135)
@@ -51,11 +51,13 @@
 
 # Create auto-generated version file, needed by all modules
-echo "#ifndef __version_generated_h__" > $PATH_TMP/version-generated.h
-echo "#define __version_generated_h__" >> $PATH_TMP/version-generated.h
+echo "#ifndef ___version_generated_h___" > $PATH_TMP/version-generated.h
+echo "#define ___version_generated_h___" >> $PATH_TMP/version-generated.h
 echo "" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_MAJOR $VBOX_VERSION_MAJOR" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_MINOR $VBOX_VERSION_MINOR" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_BUILD $VBOX_VERSION_BUILD" >> $PATH_TMP/version-generated.h
+echo "#define VBOX_VERSION_STRING_RAW \"$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD\"" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_STRING \"$VBOX_VERSION_STRING\"" >> $PATH_TMP/version-generated.h
+echo "#define VBOX_API_VERSION_STRING \"${VBOX_VERSION_MAJOR}_${VBOX_VERSION_MINOR}\"" >> $PATH_TMP/version-generated.h
 echo "" >> $PATH_TMP/version-generated.h
 echo "#endif" >> $PATH_TMP/version-generated.h
@@ -70,6 +72,6 @@
 
 # Create auto-generated product file, needed by all modules
-echo "#ifndef __product_generated_h__" > $PATH_TMP/product-generated.h
-echo "#define __product_generated_h__" >> $PATH_TMP/product-generated.h
+echo "#ifndef ___product_generated_h___" > $PATH_TMP/product-generated.h
+echo "#define ___product_generated_h___" >> $PATH_TMP/product-generated.h
 echo "" >> $PATH_TMP/product-generated.h
 echo "#define VBOX_VENDOR \"$VBOX_VENDOR\"" >> $PATH_TMP/product-generated.h