Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	(revision 31408)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	(revision 31409)
@@ -152,4 +152,6 @@
 	RTMEM_NO_WRAP_TO_EF_APIS \
 	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
+VBoxGuestR3LibXFree86_CXXFLAGS.linux = \
+    $(VBOX_GCC_fno-stack-protector) -ffreestanding
 VBoxGuestR3LibXFree86_SOURCES  = \
 	VBoxGuestR3Lib.cpp \
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp	(revision 31408)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp	(revision 31409)
@@ -30,7 +30,8 @@
 *******************************************************************************/
 #include <iprt/string.h>
-#include <iprt/mem.h>
+#ifndef VBOX_VBGLR3_XFREE86
+# include <iprt/mem.h>
+#endif
 #include <iprt/assert.h>
-#include <iprt/cpp/autores.h>
 #include <iprt/stdarg.h>
 #include <VBox/log.h>
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp	(revision 31408)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp	(revision 31409)
@@ -30,5 +30,7 @@
 *******************************************************************************/
 #include <iprt/assert.h>
-#include <iprt/mem.h>
+#ifndef VBOX_VBGLR3_XFREE86
+# include <iprt/mem.h>
+#endif
 #include <iprt/string.h>
 #include <VBox/log.h>
@@ -43,4 +45,7 @@
 # undef memcpy
 # define memcpy xf86memcpy
+extern "C" void* xf86memset(const void*,int,xf86size_t);
+# undef memset
+# define memset xf86memset
 #endif /* VBOX_VBGLR3_XFREE86 */
 
Index: /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 31408)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 31409)
@@ -39,5 +39,6 @@
  	IN_MODULE XFree86Module
  vboxvideo_drv_CFLAGS.linux := \
- 	-Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros)
+ 	-Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) \
+ 	$(VBOX_GCC_fno-stack-protector) -ffreestanding
  vboxvideo_drv_INCS = \
 	$(VBOX_PATH_X11_XFREE_4_3)/include \
Index: /trunk/src/VBox/Additions/x11/vboxvideo/undefined_68
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/undefined_68	(revision 31408)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/undefined_68	(revision 31409)
@@ -1,4 +1,5 @@
 DGAInit
 ErrorF
+FatalError
 LoaderRefSymLists
 PixmapWidthPaddingInfo