Index: /trunk/src/libs/xpcom18a4/Makefile.kmk
===================================================================
--- /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 12387)
+++ /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 12388)
@@ -1351,4 +1351,5 @@
 VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API \
                   VBOX_PYXPCOM VBOX_WITH_XPCOM
+VBoxPython_DEFS.darwin = VBOX_PYXPCOM_VERSIONED
 VBoxPython_NAME.darwin = VBoxPython2_3
 ifeq ($(KBUILD_TARGET),darwin)
@@ -1396,5 +1397,4 @@
 VBoxPython2_5_TEMPLATE = XPCOMOSX105
 VBoxPython2_5_NAME.darwin = VBoxPython2_5
-VBoxPython2_5_DEFS = VBOX_PYXPCOM_VERSIONED $(VBoxPython_DEFS)
 VBoxPython2_5_INCS = \
 	python/src \
Index: /trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp
===================================================================
--- /trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp	(revision 12387)
+++ /trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp	(revision 12388)
@@ -73,5 +73,5 @@
 #ifdef VBOX_PYXPCOM
 # ifdef VBOX_PYXPCOM_VERSIONED
-#  if PY_VERSION_HEX >= 0x02080000
+#  if   PY_VERSION_HEX >= 0x02080000
 #   define MODULE_NAME "VBoxPython2_8"
 #  elif PY_VERSION_HEX >= 0x02070000
@@ -611,5 +611,5 @@
 void
 # ifdef VBOX_PYXPCOM_VERSIONED
-#  if PY_VERSION_HEX >= 0x02080000
+#  if   PY_VERSION_HEX >= 0x02080000
 initVBoxPython2_8() {
 #  elif PY_VERSION_HEX >= 0x02070000
@@ -620,9 +620,7 @@
 initVBoxPython2_5() {
 #  elif PY_VERSION_HEX >= 0x02040000
-#   error "you must test VBOX_PYXPCOM_VERSIONED on 2.4"
-initVBoxPython() {
+initVBoxPython2_4() {
 #  elif PY_VERSION_HEX >= 0x02030000
-#   error "you must test VBOX_PYXPCOM_VERSIONED on 2.3"
-initVBoxPython() {
+initVBoxPython2_3() {
 #  else
 #   error "Fix module versioning.