Index: /trunk/src/VBox/Additions/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/Makefile.kmk	(revision 42469)
+++ /trunk/src/VBox/Additions/solaris/Makefile.kmk	(revision 42470)
@@ -186,16 +186,4 @@
 
 SOLARIS_ADD_XORG_DRIVERS = \
-	vboxmouse_drv_13.so \
-	vboxmouse_drv_14.so \
-	vboxmouse_drv_15.so \
-	vboxmouse_drv_16.so \
-	vboxmouse_drv_17.so \
-	vboxmouse_drv_18.so \
-	vboxmouse_drv_19.so \
-	vboxmouse_drv_110.so \
-	vboxmouse_drv_111.so \
-	vboxmouse_drv_112.so \
-	vboxmouse_drv_70.so \
-	vboxmouse_drv_71.so \
 	vboxvideo_drv_13.so \
 	vboxvideo_drv_14.so \
Index: /trunk/src/VBox/Additions/x11/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/Makefile.kmk	(revision 42469)
+++ /trunk/src/VBox/Additions/x11/Makefile.kmk	(revision 42470)
@@ -22,5 +22,7 @@
  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
  include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
- include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+ ifneq ($(KBUILD_TARGET), solaris)
+  include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+ endif
  include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
 endif
Index: /trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	(revision 42469)
+++ /trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	(revision 42470)
@@ -68,7 +68,4 @@
 vboxmouse_drv_70_DEFS = \
 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
- vboxmouse_drv_70_DEFS += _XPG6 __EXTENSIONS__
-endif
 vboxmouse_drv_70_INCS := \
 	$(VBOX_PATH_X11_XORG_7_0) \
@@ -274,5 +271,5 @@
 ifdef VBOX_WITH_TESTCASES
 # ifndef VBOX_ONLY_ADDITIONS
-  if1of ($(KBUILD_TARGET),linux solaris)
+  ifeq ($(KBUILD_TARGET),linux)
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
     ifndef VBOX_ONLY_SDK
@@ -391,5 +388,5 @@
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
-  endif # 1of ($(KBUILD_TARGET),linux solaris)
+  endif # eq ($(KBUILD_TARGET),linux)
 # endif # ! VBOX_ONLY_ADDITIONS
 endif # VBOX_WITH_TESTCASES