Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp	(revision 31383)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp	(revision 31384)
@@ -48,4 +48,36 @@
 # undef memchr
 # define memchr xf86memchr
+
+# undef RTSTrEnd
+# define RTStrEnd xf86RTStrEnd
+
+DECLINLINE(char const *) RTStrEnd(char const *pszString, size_t cchMax)
+{
+    /* Avoid potential issues with memchr seen in glibc. */
+    if (cchMax > RTSTR_MEMCHR_MAX)
+    {
+        char const *pszRet = (char const *)memchr(pszString, '\0', RTSTR_MEMCHR_MAX);
+        if (RT_LIKELY(pszRet))
+            return pszRet;
+        pszString += RTSTR_MEMCHR_MAX;
+        cchMax    -= RTSTR_MEMCHR_MAX;
+    }
+    return (char const *)memchr(pszString, '\0', cchMax);
+}
+
+DECLINLINE(char *) RTStrEnd(char *pszString, size_t cchMax)
+{
+    /* Avoid potential issues with memchr seen in glibc. */
+    if (cchMax > RTSTR_MEMCHR_MAX)
+    {
+        char *pszRet = (char *)memchr(pszString, '\0', RTSTR_MEMCHR_MAX);
+        if (RT_LIKELY(pszRet))
+            return pszRet;
+        pszString += RTSTR_MEMCHR_MAX;
+        cchMax    -= RTSTR_MEMCHR_MAX;
+    }
+    return (char *)memchr(pszString, '\0', cchMax);
+}
+
 #endif /* VBOX_VBGLR3_XFREE86 */
 
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp	(revision 31383)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp	(revision 31384)
@@ -37,4 +37,11 @@
 #include "VBGLR3Internal.h"
 
+#ifdef VBOX_VBGLR3_XFREE86
+/* Rather than try to resolve all the header file conflicts, I will just
+   prototype what we need here. */
+extern "C" void* xf86memcpy(void*,const void*,xf86size_t);
+# undef memcpy
+# define memcpy xf86memcpy
+#endif /* VBOX_VBGLR3_XFREE86 */
 
 /**
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp	(revision 31383)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp	(revision 31384)
@@ -36,4 +36,12 @@
 
 #include "VBGLR3Internal.h"
+
+#ifdef VBOX_VBGLR3_XFREE86
+/* Rather than try to resolve all the header file conflicts, I will just
+   prototype what we need here. */
+extern "C" void* xf86memcpy(void*,const void*,xf86size_t);
+# undef memcpy
+# define memcpy xf86memcpy
+#endif /* VBOX_VBGLR3_XFREE86 */
 
 #define VIDEO_PROP_PREFIX "/VirtualBox/GuestAdd/Vbgl/Video/"
Index: /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 31383)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 31384)
@@ -276,5 +276,5 @@
 $$(PATH_vboxvideo_drv)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
 	$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-	    $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_70 --static
+	    $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_68 --static
 	$(QUIET)$(APPEND) -t "$@" "done"
      endif
Index: /trunk/src/VBox/Additions/x11/vboxvideo/undefined_68
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/undefined_68	(revision 31383)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/undefined_68	(revision 31384)
@@ -1,7 +1,9 @@
 DGAInit
+ErrorF
 LoaderRefSymLists
 PixmapWidthPaddingInfo
 SetTimeSinceLastInputEvent
 ShadowFBInit2
+VBEExtendedInit
 VBEGetVBEMode
 VBEInit
@@ -10,7 +12,9 @@
 VBESetGetPaletteData
 VBESetVBEMode
+VErrorF
 XNFalloc
 XNFcalloc
 XNFrealloc
+XNFstrdup
 Xalloc
 Xcalloc
@@ -34,4 +38,14 @@
 sigdelset
 sigfillset
+vgaHWDPMSSet
+vgaHWFreeHWRec
+vgaHWGetHWRec
+vgaHWGetIndex
+vgaHWHandleColormaps
+vgaHWMapMem
+vgaHWRestoreFonts
+vgaHWSaveFonts
+vgaHWSaveScreen
+vgaHWUnmapMem
 xf86AddDriver
 xf86CollectOptions
@@ -39,4 +53,5 @@
 xf86CreateCursorInfoRec
 xf86DPMSInit
+xf86DestroyCursorInfoRec
 xf86DrvMsg
 xf86GetEntityInfo
@@ -53,4 +68,5 @@
 xf86MatchDevice
 xf86MatchPciInstances
+xf86Msg
 xf86PrintChipsets
 xf86PrintDepthBpp
@@ -73,8 +89,16 @@
 xf86errno
 xf86ioctl
+xf86isspace
+xf86memchr
 xf86memcpy
 xf86memset
 xf86open
+xf86sprintf
 xf86sscanf
+xf86strcmp
+xf86strcpy
 xf86strdup
 xf86strerror
+xf86strlen
+xf86strtoul
+xf86vsnprintf