Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h
===================================================================
--- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h	(revision 80637)
+++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h	(revision 80638)
@@ -26,6 +26,7 @@
 #include <map>
 
+#include <iprt/cpp/list.h> /* For RTCList. */
 #include <iprt/list.h>
-#include <iprt/cpp/list.h> /* For RTCList. */
+#include <iprt/semaphore.h>
 
 #include <VBox/hgcmsvc.h>
@@ -34,8 +35,5 @@
 #include <VBox/HostServices/Service.h>
 #include <VBox/GuestHost/SharedClipboard.h>
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-# include <iprt/semaphore.h>
-# include <VBox/GuestHost/SharedClipboard-uri.h>
-#endif
+#include <VBox/GuestHost/SharedClipboard-uri.h>
 
 using namespace HGCM;
Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp
===================================================================
--- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp	(revision 80637)
+++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp	(revision 80638)
@@ -1865,4 +1865,5 @@
 }
 
+#ifndef UNIT_TEST
 static int svcLoadStateV0(uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM, uint32_t uVersion)
 {
@@ -1897,4 +1898,5 @@
     return VINF_SUCCESS;
 }
+#endif /* UNIT_TEST */
 
 static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM, uint32_t uVersion)