Index: /trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboard.cpp
===================================================================
--- /trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboard.cpp	(revision 80626)
+++ /trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboard.cpp	(revision 80627)
@@ -117,5 +117,5 @@
 
                 /* The host has announced available clipboard formats */
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
+                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
                     VBoxClientVerbose(2, "host requested guest's clipboard write\n");
                     rc = vbclClipboardForwardToGuest(g_u32ClientId, g_PasteboardRef, fFormats);
Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp
===================================================================
--- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp	(revision 80626)
+++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp	(revision 80627)
@@ -1773,4 +1773,5 @@
 }
 
+#ifndef UNIT_TEST
 /**
  * SSM descriptor table for the VBOXCLIPBOARDCLIENTSTATEOLD structure.
@@ -1786,4 +1787,5 @@
     SSMFIELD_ENTRY_TERM()
 };
+#endif
 
 static DECLCALLBACK(int) svcSaveState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM)