Index: /trunk/src/VBox/Additions/darwin/VBoxClient/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/darwin/VBoxClient/Makefile.kmk	(revision 78161)
+++ /trunk/src/VBox/Additions/darwin/VBoxClient/Makefile.kmk	(revision 78162)
@@ -29,9 +29,15 @@
 
 VBoxClient_SOURCES  = \
-    VBoxClient.cpp \
-    VBoxClientClipboard.cpp \
-    VBoxClientClipboardHostToGuest.cpp \
-    VBoxClientClipboardGuestToHost.cpp \
-    $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
+    VBoxClient.cpp
+
+ifdef VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_DEFS   += \
+	VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_SOURCES += \
+	VBoxClientClipboard.cpp \
+	VBoxClientClipboardHostToGuest.cpp \
+	VBoxClientClipboardGuestToHost.cpp \
+	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
+endif
 
 VBoxClient_LDFLAGS  = -framework IOKit -framework ApplicationServices
Index: /trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClient.cpp
===================================================================
--- /trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClient.cpp	(revision 78161)
+++ /trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClient.cpp	(revision 78162)
@@ -45,5 +45,7 @@
 static VBOXCLIENTSERVICE    g_aServices[] =
 {
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
     g_ClipboardService
+#endif
 };
 
Index: /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 78161)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 78162)
@@ -33,7 +33,4 @@
 VBoxClient_SOURCES = \
 	main.cpp \
-  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
-  	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
-	clipboard.cpp \
 	display-svga.cpp \
 	display-svga-x11.cpp \
@@ -43,4 +40,14 @@
 	hostversion.cpp \
 	check3d.cpp
+
+ifdef VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_DEFS += \
+	VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_SOURCES += \
+	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
+	$(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
+	clipboard.cpp
+endif
+
 VBoxClient_SOURCES.linux = \
 	chk_stubs.c
Index: /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 78161)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 78162)
@@ -192,5 +192,8 @@
 static void vboxClientUsage(const char *pcszFileName)
 {
-    RTPrintf("Usage: %s --clipboard|"
+    RTPrintf("Usage: %s "
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+             "--clipboard|"
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
              "--draganddrop|"
@@ -205,5 +208,7 @@
     RTPrintf("Starts the VirtualBox DRM/X Window System guest services.\n\n");
     RTPrintf("Options:\n");
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
     RTPrintf("  --clipboard        starts the shared clipboard service\n");
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
     RTPrintf("  --draganddrop      starts the drag and drop service\n");
@@ -288,4 +293,5 @@
             fRespawn = false;
         }
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
         else if (!strcmp(argv[i], "--clipboard"))
         {
@@ -294,4 +300,5 @@
             g_pService = VBClGetClipboardService();
         }
+#endif
         else if (!strcmp(argv[i], "--display"))
         {