diff --git a/VirtualBox-4.3.10-patched.tar.bz2 b/VirtualBox-4.3.10-patched.tar.bz2
new file mode 100644
index 0000000..a973ae9
--- /dev/null
+++ b/VirtualBox-4.3.10-patched.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d04a3f1c11da844f18bc8f005594199877da232e5af9b20f9c619d6dc53b521
+size 62652920
diff --git a/VirtualBox-4.3.8-patched.tar.bz2 b/VirtualBox-4.3.8-patched.tar.bz2
deleted file mode 100644
index da617ed..0000000
--- a/VirtualBox-4.3.8-patched.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41d03d6964931c648e3df8b14241f069d51194013e661aff7624ee264fa0995d
-size 62556286
diff --git a/virtualbox-4.3.10-UserManual.pdf b/virtualbox-4.3.10-UserManual.pdf
new file mode 100644
index 0000000..e54998c
--- /dev/null
+++ b/virtualbox-4.3.10-UserManual.pdf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0796a0043cb8a965695df75f0a245ff7645596c22c5832e06daa5cd1ba538461
+size 6270746
diff --git a/virtualbox-4.3.8-UserManual.pdf b/virtualbox-4.3.8-UserManual.pdf
deleted file mode 100644
index 63bb319..0000000
--- a/virtualbox-4.3.8-UserManual.pdf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53005af22226dcd5ae8b68326602184918b5b7f8554141ae5f12f2e97dd4a62d
-size 6256829
diff --git a/Virtualbox-xserver-1.16.patch b/virtualbox-xserver-116.patch
similarity index 96%
rename from Virtualbox-xserver-1.16.patch
rename to virtualbox-xserver-116.patch
index 5256d9c..6aa63ae 100644
--- a/Virtualbox-xserver-1.16.patch
+++ b/virtualbox-xserver-116.patch
@@ -1,7 +1,8 @@
 Index: src/VBox/Additions/x11/vboxvideo/Makefile.kmk
 ===================================================================
---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 50790)
-+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(working copy)
+diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(revision 51191)
++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	(working copy)
 @@ -362,6 +362,20 @@
  vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_17_SOURCES)
  
@@ -34,8 +35,10 @@ Index: src/VBox/Additions/x11/vboxvideo/Makefile.kmk
     endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/BT.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/BT.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/BT.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/BT.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/BT.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/BT.h	(working copy)
 @@ -0,0 +1,37 @@
 +
 +#include "xf86RamDac.h"
@@ -76,8 +79,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/BT.h
 +#define BT_CURS_Y_HIGH		0x0F
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/IBM.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/IBM.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/IBM.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/IBM.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/IBM.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/IBM.h	(working copy)
 @@ -0,0 +1,418 @@
 +
 +#include <xf86RamDac.h>
@@ -499,8 +504,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/IBM.h
 +#define RGB640_CURS_COL3		0x4803
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/TI.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/TI.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/TI.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/TI.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/TI.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/TI.h	(working copy)
 @@ -0,0 +1,106 @@
 +
 +#include <xf86RamDac.h>
@@ -610,8 +617,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/TI.h
 +#define TIDAC_TVP_3030_ID       0x30
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/XIstubs.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/XIstubs.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/XIstubs.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/XIstubs.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/XIstubs.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/XIstubs.h	(working copy)
 @@ -0,0 +1,46 @@
 +/************************************************************
 +
@@ -661,8 +670,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/XIstubs.h
 +#endif                          /* XI_STUBS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/Xprintf.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/Xprintf.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/Xprintf.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/Xprintf.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/Xprintf.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/Xprintf.h	(working copy)
 @@ -0,0 +1,81 @@
 +/*
 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
@@ -747,8 +758,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/Xprintf.h
 +#endif                          /* XPRINTF_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/bt829.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/bt829.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/bt829.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/bt829.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/bt829.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/bt829.h	(working copy)
 @@ -0,0 +1,103 @@
 +#ifndef __BT829_H__
 +#define __BT829_H__
@@ -855,8 +868,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/bt829.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/callback.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/callback.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/callback.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/callback.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/callback.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/callback.h	(working copy)
 @@ -0,0 +1,91 @@
 +/***********************************************************
 +
@@ -951,8 +966,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/callback.h
 +#endif                          /* CALLBACK_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/client.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/client.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/client.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/client.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/client.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/client.h	(working copy)
 @@ -0,0 +1,60 @@
 +/*
 + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). All
@@ -1016,8 +1033,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/client.h
 +#endif                          /* CLIENT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closestr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closestr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closestr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closestr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closestr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closestr.h	(working copy)
 @@ -0,0 +1,126 @@
 +/*
 +
@@ -1147,8 +1166,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closestr.h
 +#endif                          /* CLOSESTR_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closure.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closure.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closure.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closure.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closure.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closure.h	(working copy)
 @@ -0,0 +1,56 @@
 +/***********************************************************
 +
@@ -1208,8 +1229,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/closure.h
 +#endif                          /* CLOSURE_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormap.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormap.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormap.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormap.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormap.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormap.h	(working copy)
 @@ -0,0 +1,170 @@
 +/*
 +
@@ -1383,8 +1406,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormap.h
 +#endif                          /* CMAP_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormapst.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormapst.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormapst.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormapst.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormapst.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormapst.h	(working copy)
 @@ -0,0 +1,111 @@
 +/*
 +
@@ -1499,8 +1524,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/colormapst.h
 +#endif                          /* COLORMAP_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compiler.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compiler.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compiler.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compiler.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compiler.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compiler.h	(working copy)
 @@ -0,0 +1,1745 @@
 +/*
 + * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
@@ -3249,9 +3276,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compiler.h
 +#endif                          /* _COMPILER_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compositeext.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compositeext.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compositeext.h	(working copy)
-@@ -0,0 +1,40 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compositeext.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compositeext.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compositeext.h	(working copy)
+@@ -0,0 +1,44 @@
 +/*
 + * Copyright © 2009 NVIDIA Corporation
 + *
@@ -3289,13 +3318,19 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/compositeext.h
 +                                                        VisualID * vids,
 +                                                        int nVisuals);
 +
++extern _X_EXPORT Bool CompositeRegisterImplicitRedirectionException(ScreenPtr pScreen,
++                                                                    VisualID parentVisual,
++                                                                    VisualID winVisual);
++
 +extern _X_EXPORT RESTYPE CompositeClientWindowType;
 +
 +#endif                          /* _COMPOSITEEXT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursor.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursor.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursor.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursor.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursor.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursor.h	(working copy)
 @@ -0,0 +1,136 @@
 +/***********************************************************
 +
@@ -3435,8 +3470,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursor.h
 +#endif                          /* CURSOR_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursorstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursorstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursorstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursorstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursorstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursorstr.h	(working copy)
 @@ -0,0 +1,96 @@
 +/***********************************************************
 +
@@ -3536,8 +3573,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/cursorstr.h
 +#endif                          /* CURSORSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damage.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damage.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damage.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damage.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damage.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damage.h	(working copy)
 @@ -0,0 +1,115 @@
 +/*
 + * Copyright © 2003 Keith Packard
@@ -3656,8 +3695,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damage.h
 +#endif                          /* _DAMAGE_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damagestr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damagestr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damagestr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damagestr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damagestr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damagestr.h	(working copy)
 @@ -0,0 +1,111 @@
 +/*
 + * Copyright © 2003 Keith Packard
@@ -3772,8 +3813,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/damagestr.h
 +#endif                          /* _DAMAGESTR_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dbestruct.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dbestruct.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dbestruct.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dbestruct.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dbestruct.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dbestruct.h	(working copy)
 @@ -0,0 +1,202 @@
 +/******************************************************************************
 + * 
@@ -3979,8 +4022,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dbestruct.h
 +#endif                          /* DBE_STRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dgaproc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dgaproc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dgaproc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dgaproc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dgaproc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dgaproc.h	(working copy)
 @@ -0,0 +1,110 @@
 +
 +#ifndef __DGAPROC_H
@@ -4094,8 +4139,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dgaproc.h
 +#endif                          /* __DGAPROC_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dix.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dix.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dix.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dix.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dix.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dix.h	(working copy)
 @@ -0,0 +1,611 @@
 +/***********************************************************
 +
@@ -4710,8 +4757,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dix.h
 +#endif                          /* DIX_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixaccess.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixaccess.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixaccess.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixaccess.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixaccess.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixaccess.h	(working copy)
 @@ -0,0 +1,54 @@
 +/***********************************************************
 +
@@ -4769,8 +4818,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixaccess.h
 +#endif                          /* DIX_ACCESS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixevents.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixevents.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixevents.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixevents.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixevents.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixevents.h	(working copy)
 @@ -0,0 +1,80 @@
 +/************************************************************
 +
@@ -4854,8 +4905,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixevents.h
 +#endif                          /* DIXEVENTS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfont.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfont.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfont.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfont.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfont.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfont.h	(working copy)
 @@ -0,0 +1,147 @@
 +/***********************************************************
 +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -5006,8 +5059,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfont.h
 +#endif                          /* DIXFONT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfontstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfontstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfontstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfontstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfontstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfontstr.h	(working copy)
 @@ -0,0 +1,93 @@
 +/***********************************************************
 +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -5104,8 +5159,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixfontstr.h
 +#endif                          /* DIXFONTSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixgrabs.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixgrabs.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixgrabs.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixgrabs.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixgrabs.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixgrabs.h	(working copy)
 @@ -0,0 +1,64 @@
 +/************************************************************
 +
@@ -5173,8 +5230,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixgrabs.h
 +#endif                          /* DIXGRABS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixstruct.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixstruct.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixstruct.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixstruct.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixstruct.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixstruct.h	(working copy)
 @@ -0,0 +1,193 @@
 +/***********************************************************
 +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -5371,8 +5430,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dixstruct.h
 +#endif                          /* DIXSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri.h	(working copy)
 @@ -0,0 +1,361 @@
 +/**************************************************************************
 +
@@ -5737,8 +5798,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri2.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri2.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri2.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri2.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri2.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri2.h	(working copy)
 @@ -0,0 +1,362 @@
 +/*
 + * Copyright © 2007 Red Hat, Inc.
@@ -6104,9 +6167,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri2.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h	(working copy)
-@@ -0,0 +1,65 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h	(working copy)
+@@ -0,0 +1,77 @@
 +/*
 + * Copyright © 2013 Keith Packard
 + *
@@ -6139,12 +6204,17 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h
 +#include <X11/extensions/dri3proto.h>
 +#include <randrstr.h>
 +
-+#define DRI3_SCREEN_INFO_VERSION        0
++#define DRI3_SCREEN_INFO_VERSION        1
 +
 +typedef int (*dri3_open_proc)(ScreenPtr screen,
 +                              RRProviderPtr provider,
 +                              int *fd);
 +
++typedef int (*dri3_open_client_proc)(ClientPtr client,
++                                     ScreenPtr screen,
++                                     RRProviderPtr provider,
++                                     int *fd);
++
 +typedef PixmapPtr (*dri3_pixmap_from_fd_proc) (ScreenPtr screen,
 +                                               int fd,
 +                                               CARD16 width,
@@ -6164,18 +6234,27 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dri3.h
 +    dri3_open_proc              open;
 +    dri3_pixmap_from_fd_proc    pixmap_from_fd;
 +    dri3_fd_from_pixmap_proc    fd_from_pixmap;
++
++    /* Version 1 */
++    dri3_open_client_proc       open_client;
++
 +} dri3_screen_info_rec, *dri3_screen_info_ptr;
 +
 +extern _X_EXPORT Bool
 +dri3_screen_init(ScreenPtr screen, dri3_screen_info_ptr info);
 +
++extern _X_EXPORT int
++dri3_send_open_reply(ClientPtr client, int fd);
++
 +#endif
 +
 +#endif /* _DRI3_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dristruct.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dristruct.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dristruct.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dristruct.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dristruct.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dristruct.h	(working copy)
 @@ -0,0 +1,124 @@
 +/**************************************************************************
 +
@@ -6303,8 +6382,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/dristruct.h
 +#endif                          /* DRI_STRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/edid.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/edid.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/edid.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/edid.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/edid.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/edid.h	(working copy)
 @@ -0,0 +1,657 @@
 +/*
 + * edid.h: defines to parse an EDID block 
@@ -6965,8 +7046,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/edid.h
 +#endif                          /* _EDID_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/events.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/events.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/events.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/events.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/events.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/events.h	(working copy)
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright © 2009 Red Hat, Inc.
@@ -7012,8 +7095,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/events.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exa.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exa.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exa.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exa.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exa.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exa.h	(working copy)
 @@ -0,0 +1,820 @@
 +/*
 + *
@@ -7837,8 +7922,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exa.h
 +#endif                          /* EXA_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exevents.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exevents.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exevents.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exevents.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exevents.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exevents.h	(working copy)
 @@ -0,0 +1,307 @@
 +/************************************************************
 +
@@ -8149,9 +8236,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/exevents.h
 +#endif                          /* EXEVENTS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extension.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extension.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extension.h	(working copy)
-@@ -0,0 +1,102 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extension.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extension.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extension.h	(working copy)
+@@ -0,0 +1,103 @@
 +/***********************************************************
 +
 +Copyright 1987, 1998  The Open Group
@@ -8251,13 +8340,16 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extension.h
 +
 +extern _X_EXPORT void CloseDownExtensions(void);
 +
-+extern _X_EXPORT void LoadExtension(const ExtensionModule *ext, Bool external);
++extern _X_EXPORT void LoadExtensionList(const ExtensionModule ext[],
++                                        int listSize, Bool external);
 +
 +#endif                          /* EXTENSION_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extinit.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extinit.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extinit.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extinit.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extinit.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extinit.h	(working copy)
 @@ -0,0 +1,189 @@
 +/************************************************************
 +
@@ -8450,8 +8542,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extinit.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extnsionst.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extnsionst.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extnsionst.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extnsionst.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extnsionst.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extnsionst.h	(working copy)
 @@ -0,0 +1,112 @@
 +/***********************************************************
 +
@@ -8567,8 +8661,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/extnsionst.h
 +#endif                          /* EXTENSIONSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fb.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fb.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fb.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fb.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fb.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fb.h	(working copy)
 @@ -0,0 +1,1660 @@
 +/*
 + *
@@ -10232,8 +10328,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fb.h
 +#endif                          /* _FB_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbdevhw.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbdevhw.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbdevhw.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbdevhw.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbdevhw.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbdevhw.h	(working copy)
 @@ -0,0 +1,66 @@
 +
 +#ifndef _FBDEVHW_H_
@@ -10303,8 +10401,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbdevhw.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fboverlay.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fboverlay.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fboverlay.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fboverlay.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fboverlay.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fboverlay.h	(working copy)
 @@ -0,0 +1,112 @@
 +/*
 + *
@@ -10420,9 +10520,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fboverlay.h
 +#endif                          /* _FBOVERLAY_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbpict.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbpict.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbpict.h	(working copy)
-@@ -0,0 +1,75 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbpict.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbpict.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbpict.h	(working copy)
+@@ -0,0 +1,88 @@
 +/*
 + *
 + * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@@ -10490,18 +10592,33 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbpict.h
 +             INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
 +
 +extern _X_EXPORT void
-+
 +fbTriangles(CARD8 op,
 +            PicturePtr pSrc,
 +            PicturePtr pDst,
 +            PictFormatPtr maskFormat,
 +            INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
 +
++extern _X_EXPORT void
++fbUnrealizeGlyph(ScreenPtr pScreen,
++		 GlyphPtr pGlyph);
++
++extern _X_EXPORT void
++fbGlyphs(CARD8 op,
++	 PicturePtr pSrc,
++	 PicturePtr pDst,
++	 PictFormatPtr maskFormat,
++	 INT16 xSrc,
++	 INT16 ySrc, int nlist,
++	 GlyphListPtr list,
++	 GlyphPtr *glyphs);
++
 +#endif                          /* _FBPICT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbrop.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbrop.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbrop.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbrop.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbrop.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbrop.h	(working copy)
 @@ -0,0 +1,137 @@
 +/*
 + * Copyright © 1998 Keith Packard
@@ -10642,8 +10759,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fbrop.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fi1236.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fi1236.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fi1236.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fi1236.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fi1236.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fi1236.h	(working copy)
 @@ -0,0 +1,113 @@
 +#ifndef __FI1236_H__
 +#define __FI1236_H__
@@ -10760,8 +10879,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fi1236.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fourcc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fourcc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fourcc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fourcc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fourcc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fourcc.h	(working copy)
 @@ -0,0 +1,159 @@
 +
 +/*
@@ -10924,8 +11045,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/fourcc.h
 +#endif                          /* _XF86_FOURCC_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gc.h	(working copy)
 @@ -0,0 +1,147 @@
 +/***********************************************************
 +
@@ -11076,8 +11199,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gc.h
 +#endif                          /* GC_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gcstruct.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gcstruct.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gcstruct.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gcstruct.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gcstruct.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gcstruct.h	(working copy)
 @@ -0,0 +1,292 @@
 +/***********************************************************
 +
@@ -11373,8 +11498,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/gcstruct.h
 +#endif                          /* GCSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geext.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geext.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geext.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geext.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geext.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geext.h	(working copy)
 @@ -0,0 +1,81 @@
 +/*
 +
@@ -11459,8 +11586,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geext.h
 +#endif                          /* _GEEXT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geint.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geint.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geint.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geint.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geint.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geint.h	(working copy)
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright 2007-2008 Peter Hutterer
@@ -11518,8 +11647,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/geint.h
 +#endif                          /* _GEINT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/globals.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/globals.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/globals.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/globals.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/globals.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/globals.h	(working copy)
 @@ -0,0 +1,53 @@
 +
 +#ifndef _XSERV_GLOBAL_H_
@@ -11576,8 +11707,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/globals.h
 +#endif                          /* !_XSERV_GLOBAL_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glx_extinit.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glx_extinit.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glx_extinit.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glx_extinit.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glx_extinit.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glx_extinit.h	(working copy)
 @@ -0,0 +1,34 @@
 +/*
 + * Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
@@ -11615,8 +11748,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glx_extinit.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glyphstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glyphstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glyphstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glyphstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glyphstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glyphstr.h	(working copy)
 @@ -0,0 +1,142 @@
 +/*
 + *
@@ -11762,9 +11897,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/glyphstr.h
 +#endif                          /* _GLYPHSTR_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h	(working copy)
-@@ -0,0 +1,75 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h	(working copy)
+@@ -0,0 +1,104 @@
 +/*
 + * Copyright © 2006-2007 Daniel Stone
 + *
@@ -11799,27 +11936,46 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h
 +extern _X_EXPORT void config_init(void);
 +extern _X_EXPORT void config_fini(void);
 +
++enum { ODEV_ATTRIB_STRING, ODEV_ATTRIB_INT };
++
 +struct OdevAttribute {
 +    struct xorg_list member;
 +    int attrib_id;
-+    char *attrib_name;
++    union {
++        char *attrib_name;
++        int attrib_value;
++    };
++    int attrib_type;
 +};
 +
 +struct OdevAttributes {
 +    struct xorg_list list;
-+    Bool unowned;
 +};
 +
++/* Note starting with xserver 1.16 this function never fails */
 +struct OdevAttributes *
 +config_odev_allocate_attribute_list(void);
 +
 +void
 +config_odev_free_attribute_list(struct OdevAttributes *attribs);
 +
++/* Note starting with xserver 1.16 this function never fails */
 +Bool
 +config_odev_add_attribute(struct OdevAttributes *attribs, int attrib,
 +                          const char *attrib_name);
 +
++char *
++config_odev_get_attribute(struct OdevAttributes *attribs, int attrib_id);
++
++/* Note starting with xserver 1.16 this function never fails */
++Bool
++config_odev_add_int_attribute(struct OdevAttributes *attribs, int attrib,
++                              int attrib_value);
++
++int
++config_odev_get_int_attribute(struct OdevAttributes *attribs, int attrib,
++                              int def);
++
 +void
 +config_odev_free_attributes(struct OdevAttributes *attribs);
 +
@@ -11829,6 +11985,12 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h
 +#define ODEV_ATTRIB_SYSPATH 2
 +/* DRI-style bus id */
 +#define ODEV_ATTRIB_BUSID 3
++/* Server managed FD */
++#define ODEV_ATTRIB_FD 4
++/* Major number of the device node pointed to by ODEV_ATTRIB_PATH */
++#define ODEV_ATTRIB_MAJOR 5
++/* Minor number of the device node pointed to by ODEV_ATTRIB_PATH */
++#define ODEV_ATTRIB_MINOR 6
 +
 +typedef void (*config_odev_probe_proc_ptr)(struct OdevAttributes *attribs);
 +void config_odev_probe(config_odev_probe_proc_ptr probe_callback);
@@ -11839,11 +12001,17 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/hotplug.h
 +#endif
 +
 +#define ServerIsNotSeat0() (SeatId && strcmp(SeatId, "seat0"))
++
++struct xf86_platform_device *
++xf86_find_platform_device_by_devnum(int major, int minor);
++
 +#endif                          /* HOTPLUG_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/i2c_def.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/i2c_def.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/i2c_def.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/i2c_def.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/i2c_def.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/i2c_def.h	(working copy)
 @@ -0,0 +1,6 @@
 +#ifndef __I2C_DEF_H__
 +#define __I2C_DEF_H__
@@ -11853,9 +12021,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/i2c_def.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h	(working copy)
-@@ -0,0 +1,697 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h	(working copy)
+@@ -0,0 +1,704 @@
 +/************************************************************
 +
 +Copyright 1987, 1998  The Open Group
@@ -12243,6 +12413,12 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h
 +                                               KbdCtrlProcPtr /*controlProc */
 +                                               );
 +
++extern _X_EXPORT Bool InitKeyboardDeviceStructFromString(DeviceIntPtr dev,
++							 const char *keymap,
++							 int keymap_length,
++							 BellProcPtr bell_func,
++							 KbdCtrlProcPtr ctrl_func);
++
 +extern int ApplyPointerMapping(DeviceIntPtr /* pDev */ ,
 +                               CARD8 * /* map */ ,
 +                               int /* len */ ,
@@ -12459,6 +12635,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h
 +void FixUpEventFromWindow(SpritePtr pSprite,
 +                          xEvent *xE,
 +                          WindowPtr pWin, Window child, Bool calcChild);
++extern Bool PointInBorderSize(WindowPtr pWin, int x, int y);
 +extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
 +extern int EventIsDeliverable(DeviceIntPtr dev, int evtype, WindowPtr win);
 +extern Bool ActivatePassiveGrab(DeviceIntPtr dev, GrabPtr grab,
@@ -12555,8 +12732,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/input.h
 +#endif                          /* INPUT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/inputstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/inputstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/inputstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/inputstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/inputstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/inputstr.h	(working copy)
 @@ -0,0 +1,673 @@
 +/************************************************************
 +
@@ -13233,8 +13412,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/inputstr.h
 +#endif                          /* INPUTSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/list.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/list.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/list.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/list.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/list.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/list.h	(working copy)
 @@ -0,0 +1,492 @@
 +/*
 + * Copyright © 2010 Intel Corporation
@@ -13730,9 +13911,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/list.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h	(working copy)
-@@ -0,0 +1,540 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h	(working copy)
+@@ -0,0 +1,544 @@
 +/***********************************************************
 +
 +Copyright 1987, 1998  The Open Group
@@ -14242,6 +14425,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h
 +extern _X_EXPORT void miSegregateChildren(WindowPtr pWin, RegionPtr pReg,
 +                                          int depth);
 +
++extern _X_EXPORT WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y);
++
++extern _X_EXPORT WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y);
++
 +/* mizerarc.c */
 +
 +extern _X_EXPORT void miZeroPolyArc(DrawablePtr /*pDraw */ ,
@@ -14275,8 +14462,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mi.h
 +#endif                          /* MI_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micmap.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micmap.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micmap.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micmap.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micmap.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micmap.h	(working copy)
 @@ -0,0 +1,67 @@
 +
 +#include "colormapst.h"
@@ -14347,8 +14536,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micmap.h
 +#endif                          /* _MICMAP_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micoord.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micoord.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micoord.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micoord.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micoord.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micoord.h	(working copy)
 @@ -0,0 +1,69 @@
 +/*
 + * Copyright (C) 2000 The XFree86 Project, Inc.  All Rights Reserved.
@@ -14421,8 +14612,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/micoord.h
 +#endif                          /* _MICOORD_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifillarc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifillarc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifillarc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifillarc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifillarc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifillarc.h	(working copy)
 @@ -0,0 +1,187 @@
 +/************************************************************
 +
@@ -14613,8 +14806,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifillarc.h
 +#endif                          /* __MIFILLARC_H__ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifpoly.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifpoly.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifpoly.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifpoly.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifpoly.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifpoly.h	(working copy)
 @@ -0,0 +1,102 @@
 +/***********************************************************
 +
@@ -14720,8 +14915,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mifpoly.h
 +#endif                          /* __MIFPOLY_H__ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/migc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/migc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/migc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/migc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/migc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/migc.h	(working copy)
 @@ -0,0 +1,49 @@
 +/*
 +
@@ -14774,8 +14971,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/migc.h
 +                                             DrawablePtr        pDrawable);
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miline.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miline.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miline.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miline.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miline.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miline.h	(working copy)
 @@ -0,0 +1,172 @@
 +
 +/*
@@ -14951,8 +15150,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miline.h
 +#endif                          /* MILINE_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mioverlay.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mioverlay.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mioverlay.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mioverlay.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mioverlay.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mioverlay.h	(working copy)
 @@ -0,0 +1,28 @@
 +
 +#ifdef HAVE_DIX_CONFIG_H
@@ -14984,8 +15185,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mioverlay.h
 +#endif                          /* __MIOVERLAY_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipict.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipict.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipict.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipict.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipict.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipict.h	(working copy)
 @@ -0,0 +1,160 @@
 +/*
 + *
@@ -15149,8 +15352,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipict.h
 +#endif                          /* _MIPICT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointer.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointer.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointer.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointer.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointer.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointer.h	(working copy)
 @@ -0,0 +1,124 @@
 +/*
 +
@@ -15278,8 +15483,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointer.h
 +#endif                          /* MIPOINTER_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointrst.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointrst.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointrst.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointrst.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointrst.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointrst.h	(working copy)
 @@ -0,0 +1,56 @@
 +/*
 + * mipointrst.h
@@ -15339,8 +15546,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mipointrst.h
 +#endif                          /* MIPOINTRST_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misc.h	(working copy)
 @@ -0,0 +1,447 @@
 +/***********************************************************
 +
@@ -15791,8 +16000,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misc.h
 +#endif                          /* MISC_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miscstruct.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miscstruct.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miscstruct.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miscstruct.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miscstruct.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miscstruct.h	(working copy)
 @@ -0,0 +1,65 @@
 +/***********************************************************
 +
@@ -15861,8 +16072,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miscstruct.h
 +#endif                          /* MISCSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mispans.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mispans.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mispans.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mispans.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mispans.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mispans.h	(working copy)
 @@ -0,0 +1,87 @@
 +/***********************************************************
 +
@@ -15953,8 +16166,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mispans.h
 +#endif                          /* MISPANS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mistruct.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mistruct.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mistruct.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mistruct.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mistruct.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mistruct.h	(working copy)
 @@ -0,0 +1,62 @@
 +/***********************************************************
 +
@@ -16020,8 +16235,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mistruct.h
 +#endif                          /* MISTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misync.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misync.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misync.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misync.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misync.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misync.h	(working copy)
 @@ -0,0 +1,100 @@
 +/*
 + * Copyright © 2010 NVIDIA Corporation
@@ -16125,8 +16342,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misync.h
 +#endif                          /* _MISYNC_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncfd.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncfd.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncfd.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncfd.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncfd.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncfd.h	(working copy)
 @@ -0,0 +1,45 @@
 +/*
 + * Copyright © 2013 Keith Packard
@@ -16175,8 +16394,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncfd.h
 +#endif /* _MISYNCFD_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncshm.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncshm.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncshm.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncshm.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncshm.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncshm.h	(working copy)
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright © 2013 Keith Packard
@@ -16208,9 +16429,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncshm.h
 +#endif /* _MISYNCSHM_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h	(working copy)
-@@ -0,0 +1,97 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h	(working copy)
+@@ -0,0 +1,98 @@
 +/*
 + * Copyright © 2010 NVIDIA Corporation
 + *
@@ -16242,6 +16465,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h
 +#define _MISYNCSTR_H_
 +
 +#include "dix.h"
++#include "misync.h"
 +#include "scrnintstr.h"
 +#include <X11/extensions/syncconst.h>
 +
@@ -16310,8 +16534,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/misyncstr.h
 +#endif                          /* _MISYNCSTR_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miwideline.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miwideline.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miwideline.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miwideline.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miwideline.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miwideline.h	(working copy)
 @@ -0,0 +1,119 @@
 +/*
 +
@@ -16434,8 +16660,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/miwideline.h
 +                                     int *pnright, int *h);
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mizerarc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mizerarc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mizerarc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mizerarc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mizerarc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mizerarc.h	(working copy)
 @@ -0,0 +1,124 @@
 +/************************************************************
 +
@@ -16563,8 +16791,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/mizerarc.h
 +    );
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/msp3430.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/msp3430.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/msp3430.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/msp3430.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/msp3430.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/msp3430.h	(working copy)
 @@ -0,0 +1,116 @@
 +#ifndef __MSP3430_H__
 +#define __MSP3430_H__
@@ -16684,9 +16914,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/msp3430.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h	(working copy)
-@@ -0,0 +1,78 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h	(working copy)
+@@ -0,0 +1,80 @@
 +/*
 +
 +Copyright 1987, 1998  The Open Group
@@ -16740,6 +16972,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h
 +extern _X_EXPORT int defaultScreenSaverAllowExposures;
 +extern _X_EXPORT const char *display;
 +extern _X_EXPORT int displayfd;
++extern _X_EXPORT Bool explicit_display;
 +
 +extern _X_EXPORT int defaultBackingStore;
 +extern _X_EXPORT Bool disableBackingStore;
@@ -16763,12 +16996,15 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/opaque.h
 +extern _X_EXPORT Bool bgNoneRoot;
 +
 +extern _X_EXPORT Bool CoreDump;
++extern _X_EXPORT Bool NoListenAll;
 +
 +#endif                          /* OPAQUE_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/optionstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/optionstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/optionstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/optionstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/optionstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/optionstr.h	(working copy)
 @@ -0,0 +1,13 @@
 +#ifndef OPTIONSTR_H_
 +#define OPTIONSTR_H_
@@ -16785,8 +17021,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/optionstr.h
 +#endif                          /* INPUTSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h	(working copy)
 @@ -0,0 +1,692 @@
 +/***********************************************************
 +
@@ -16956,9 +17194,9 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h
 +
 +extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ );
 +
-+#ifdef XQUARTZ
-+extern void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
-+#endif
++extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
++
++extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ );
 +
 +extern _X_EXPORT CARD32 GetTimeInMillis(void);
 +extern _X_EXPORT CARD64 GetTimeInMicros(void);
@@ -17482,8 +17720,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/os.h
 +#endif                          /* OS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiX.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiX.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiX.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiX.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiX.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiX.h	(working copy)
 @@ -0,0 +1,79 @@
 +/*****************************************************************
 +
@@ -17566,8 +17806,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiX.h
 +#endif                          /* _PANORAMIX_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiXsrv.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiXsrv.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiXsrv.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiXsrv.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiXsrv.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiXsrv.h	(working copy)
 @@ -0,0 +1,63 @@
 +
 +#ifdef HAVE_DIX_CONFIG_H
@@ -17634,8 +17876,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/panoramiXsrv.h
 +#endif                          /* _PANORAMIXSRV_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picture.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picture.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picture.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picture.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picture.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picture.h	(working copy)
 @@ -0,0 +1,232 @@
 +/*
 + *
@@ -17871,8 +18115,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picture.h
 +#endif                          /* _PICTURE_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picturestr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picturestr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picturestr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picturestr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picturestr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picturestr.h	(working copy)
 @@ -0,0 +1,614 @@
 +/*
 + * Copyright © 2000 SuSE, Inc.
@@ -18490,8 +18736,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/picturestr.h
 +#endif                          /* _PICTURESTR_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmap.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmap.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmap.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmap.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmap.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmap.h	(working copy)
 @@ -0,0 +1,131 @@
 +/***********************************************************
 +
@@ -18626,8 +18874,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmap.h
 +#endif                          /* PIXMAP_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmapstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmapstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmapstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmapstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmapstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmapstr.h	(working copy)
 @@ -0,0 +1,115 @@
 +/***********************************************************
 +
@@ -18746,8 +18996,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/pixmapstr.h
 +#endif                          /* PIXMAPSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/present.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/present.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/present.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/present.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/present.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/present.h	(working copy)
 @@ -0,0 +1,127 @@
 +/*
 + * Copyright © 2013 Keith Packard
@@ -18878,8 +19130,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/present.h
 +#endif /* _PRESENT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/presentext.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/presentext.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/presentext.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/presentext.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/presentext.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/presentext.h	(working copy)
 @@ -0,0 +1,29 @@
 +/*
 + * Copyright © 2013 Keith Packard
@@ -18912,8 +19166,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/presentext.h
 +#endif /* _PRESENTEXT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/privates.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/privates.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/privates.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/privates.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/privates.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/privates.h	(working copy)
 @@ -0,0 +1,361 @@
 +/***********************************************************
 +
@@ -19278,8 +19534,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/privates.h
 +#endif                          /* PRIVATES_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/property.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/property.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/property.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/property.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/property.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/property.h	(working copy)
 @@ -0,0 +1,85 @@
 +/***********************************************************
 +
@@ -19368,8 +19626,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/property.h
 +#endif                          /* PROPERTY_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/propertyst.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/propertyst.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/propertyst.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/propertyst.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/propertyst.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/propertyst.h	(working copy)
 @@ -0,0 +1,66 @@
 +/***********************************************************
 +
@@ -19439,8 +19699,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/propertyst.h
 +#endif                          /* PROPERTYSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/ptrveloc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/ptrveloc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/ptrveloc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/ptrveloc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/ptrveloc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/ptrveloc.h	(working copy)
 @@ -0,0 +1,144 @@
 +/*
 + *
@@ -19588,8 +19850,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/ptrveloc.h
 +#endif                          /* POINTERVELOCITY_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/randrstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/randrstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/randrstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/randrstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/randrstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/randrstr.h	(working copy)
 @@ -0,0 +1,1056 @@
 +/*
 + * Copyright © 2000 Compaq Computer Corporation
@@ -20649,8 +20913,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/randrstr.h
 + */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/region.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/region.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/region.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/region.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/region.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/region.h	(working copy)
 @@ -0,0 +1,52 @@
 +/***********************************************************
 +
@@ -20706,8 +20972,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/region.h
 +#endif                          /* REGION_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/regionstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/regionstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/regionstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/regionstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/regionstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/regionstr.h	(working copy)
 @@ -0,0 +1,376 @@
 +/***********************************************************
 +
@@ -21087,8 +21355,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/regionstr.h
 +#endif                          /* REGIONSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/registry.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/registry.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/registry.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/registry.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/registry.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/registry.h	(working copy)
 @@ -0,0 +1,66 @@
 +/***********************************************************
 +
@@ -21158,8 +21428,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/registry.h
 +#endif                          /* DIX_REGISTRY_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/resource.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/resource.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/resource.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/resource.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/resource.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/resource.h	(working copy)
 @@ -0,0 +1,287 @@
 +/***********************************************************
 +
@@ -21450,8 +21722,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/resource.h
 +#endif /* RESOURCE_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rgb.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rgb.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rgb.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rgb.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rgb.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rgb.h	(working copy)
 @@ -0,0 +1,52 @@
 +/***********************************************************
 +
@@ -21507,8 +21781,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rgb.h
 +#endif                          /* RGB_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rrtransform.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rrtransform.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rrtransform.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rrtransform.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rrtransform.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rrtransform.h	(working copy)
 @@ -0,0 +1,79 @@
 +/*
 + * Copyright © 2007 Keith Packard
@@ -21591,8 +21867,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/rrtransform.h
 +#endif                          /* _RRTRANSFORM_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/sarea.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/sarea.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/sarea.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/sarea.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/sarea.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/sarea.h	(working copy)
 @@ -0,0 +1,96 @@
 +/**
 + * \file sarea.h 
@@ -21692,8 +21970,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/sarea.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/screenint.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/screenint.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/screenint.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/screenint.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/screenint.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/screenint.h	(working copy)
 @@ -0,0 +1,93 @@
 +/***********************************************************
 +
@@ -21790,9 +22070,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/screenint.h
 +#endif                          /* SCREENINT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h	(working copy)
-@@ -0,0 +1,547 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h	(working copy)
+@@ -0,0 +1,554 @@
 +/***********************************************************
 +
 +Copyright 1987, 1998  The Open Group
@@ -22148,6 +22430,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h
 +
 +typedef Bool (*ReplaceScanoutPixmapProcPtr)(DrawablePtr, PixmapPtr, Bool);
 +
++typedef WindowPtr (*XYToWindowProcPtr)(ScreenPtr pScreen,
++                                       SpritePtr pSprite, int x, int y);
++
++typedef int (*NameWindowPixmapProcPtr)(WindowPtr, PixmapPtr, CARD32);
++
 +typedef struct _Screen {
 +    int myNum;                  /* index of this instance in Screens[] */
 +    ATOM id;
@@ -22258,6 +22545,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h
 +    SetWindowPixmapProcPtr SetWindowPixmap;
 +    GetScreenPixmapProcPtr GetScreenPixmap;
 +    SetScreenPixmapProcPtr SetScreenPixmap;
++    NameWindowPixmapProcPtr NameWindowPixmap;
 +
 +    PixmapPtr pScratchPixmap;   /* scratch pixmap "pool" */
 +
@@ -22308,6 +22596,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h
 +    struct xorg_list offload_head;
 +
 +    ReplaceScanoutPixmapProcPtr ReplaceScanoutPixmap;
++    XYToWindowProcPtr XYToWindow;
 +} ScreenRec;
 +
 +static inline RegionPtr
@@ -22342,8 +22631,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/scrnintstr.h
 +#endif                          /* SCREENINTSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/selection.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/selection.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/selection.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/selection.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/selection.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/selection.h	(working copy)
 @@ -0,0 +1,100 @@
 +/***********************************************************
 +
@@ -22447,8 +22738,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/selection.h
 +#endif                          /* SELECTION_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/servermd.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/servermd.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/servermd.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/servermd.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/servermd.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/servermd.h	(working copy)
 @@ -0,0 +1,365 @@
 +/***********************************************************
 +
@@ -22817,8 +23110,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/servermd.h
 +#endif                          /* SERVERMD_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadow.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadow.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadow.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadow.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadow.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadow.h	(working copy)
 @@ -0,0 +1,171 @@
 +/*
 + *
@@ -22993,8 +23288,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadow.h
 +#endif                          /* _SHADOW_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadowfb.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadowfb.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadowfb.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadowfb.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadowfb.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadowfb.h	(working copy)
 @@ -0,0 +1,39 @@
 +
 +#ifndef _SHADOWFB_H
@@ -23037,8 +23334,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shadowfb.h
 +#endif                          /* _SHADOWFB_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shmint.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shmint.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shmint.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shmint.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shmint.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shmint.h	(working copy)
 @@ -0,0 +1,93 @@
 +/*
 + * Copyright © 2003 Keith Packard
@@ -23135,8 +23434,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/shmint.h
 +#endif                          /* _SHMINT_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/site.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/site.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/site.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/site.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/site.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/site.h	(working copy)
 @@ -0,0 +1,126 @@
 +/************************************************************
 +
@@ -23266,8 +23567,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/site.h
 +#endif                          /* SITE_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swaprep.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swaprep.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swaprep.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swaprep.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swaprep.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swaprep.h	(working copy)
 @@ -0,0 +1,260 @@
 +/************************************************************
 +
@@ -23531,8 +23834,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swaprep.h
 +#endif                          /* SWAPREP_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swapreq.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swapreq.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swapreq.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swapreq.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swapreq.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swapreq.h	(working copy)
 @@ -0,0 +1,106 @@
 +/************************************************************
 +
@@ -23642,8 +23947,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/swapreq.h
 +#endif                          /* SWAPREQ_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/syncsdk.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/syncsdk.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/syncsdk.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/syncsdk.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/syncsdk.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/syncsdk.h	(working copy)
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright © 2010 NVIDIA Corporation
@@ -23693,8 +24000,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/syncsdk.h
 +#endif                          /* _SYNCSDK_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda8425.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda8425.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda8425.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda8425.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda8425.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda8425.h	(working copy)
 @@ -0,0 +1,44 @@
 +#ifndef __TDA8425_H__
 +#define __TDA8425_H__
@@ -23742,8 +24051,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda8425.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9850.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9850.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9850.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9850.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9850.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9850.h	(working copy)
 @@ -0,0 +1,43 @@
 +#ifndef __TDA9850_H__
 +#define __TDA9850_H__
@@ -23790,8 +24101,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9850.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9885.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9885.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9885.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9885.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9885.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9885.h	(working copy)
 @@ -0,0 +1,63 @@
 +#ifndef __TDA9885_H__
 +#define __TDA9885_H__
@@ -23858,8 +24171,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/tda9885.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/uda1380.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/uda1380.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/uda1380.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/uda1380.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/uda1380.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/uda1380.h	(working copy)
 @@ -0,0 +1,81 @@
 +/*************************************************************************************
 + * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
@@ -23944,8 +24259,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/uda1380.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/validate.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/validate.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/validate.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/validate.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/validate.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/validate.h	(working copy)
 @@ -0,0 +1,40 @@
 +
 +/*
@@ -23989,8 +24306,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/validate.h
 +#endif                          /* VALIDATE_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbe.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbe.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbe.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbe.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbe.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbe.h	(working copy)
 @@ -0,0 +1,357 @@
 +
 +/*
@@ -24351,8 +24670,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbe.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbeModes.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbeModes.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbeModes.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbeModes.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbeModes.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbeModes.h	(working copy)
 @@ -0,0 +1,94 @@
 +/*
 + * Copyright © 2002 David Dawes
@@ -24450,8 +24771,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vbeModes.h
 +#endif                          /* VBE_MODES_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vgaHW.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vgaHW.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vgaHW.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vgaHW.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vgaHW.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vgaHW.h	(working copy)
 @@ -0,0 +1,237 @@
 +
 +/*
@@ -24692,8 +25015,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vgaHW.h
 +#endif                          /* _VGAHW_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vidmodeproc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vidmodeproc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vidmodeproc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vidmodeproc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vidmodeproc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vidmodeproc.h	(working copy)
 @@ -0,0 +1,84 @@
 +
 +/* Prototypes for DGA functions that the DDX must provide */
@@ -24781,8 +25106,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/vidmodeproc.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/wfbrename.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/wfbrename.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/wfbrename.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/wfbrename.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/wfbrename.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/wfbrename.h	(working copy)
 @@ -0,0 +1,170 @@
 +#define fb16Lane wfb16Lane
 +#define fb24_32CopyMtoN wfb24_32CopyMtoN
@@ -24956,8 +25283,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/wfbrename.h
 +#define image_from_pict wfb_image_from_pict
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/window.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/window.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/window.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/window.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/window.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/window.h	(working copy)
 @@ -0,0 +1,228 @@
 +/***********************************************************
 +
@@ -25189,8 +25518,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/window.h
 +#endif                          /* WINDOW_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/windowstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/windowstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/windowstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/windowstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/windowstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/windowstr.h	(working copy)
 @@ -0,0 +1,221 @@
 +/***********************************************************
 +
@@ -25415,8 +25746,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/windowstr.h
 +#endif                          /* WINDOWSTRUCT_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xaarop.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xaarop.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xaarop.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xaarop.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xaarop.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xaarop.h	(working copy)
 @@ -0,0 +1,268 @@
 +#ifndef _XAAROP_H
 +#define _XAAROP_H
@@ -25688,8 +26021,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xaarop.h
 +#endif                          /* _XAAROP_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xace.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xace.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xace.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xace.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xace.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xace.h	(working copy)
 @@ -0,0 +1,128 @@
 +/************************************************************
 +
@@ -25821,8 +26156,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xace.h
 +#endif                          /* _XACE_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xacestr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xacestr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xacestr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xacestr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xacestr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xacestr.h	(working copy)
 @@ -0,0 +1,147 @@
 +/************************************************************
 +
@@ -25973,8 +26310,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xacestr.h
 +#endif                          /* _XACESTR_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86.h	(working copy)
 @@ -0,0 +1,453 @@
 +/*
 + * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -26431,8 +26770,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86.h
 +#endif                          /* _XF86_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h	(working copy)
 @@ -0,0 +1,1021 @@
 +/*
 + * Copyright © 2006 Keith Packard
@@ -26622,13 +26963,13 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h
 +    /**
 +     * Load monochrome image
 +     */
-+    void
++    Bool
 +     (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
 +
 +    /**
 +     * Load ARGB image
 +     */
-+    void
++    Bool
 +     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);
 +
 +    /**
@@ -27457,8 +27798,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Crtc.h
 +#endif                          /* _XF86CRTC_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h	(working copy)
 @@ -0,0 +1,52 @@
 +
 +#ifndef _XF86CURSOR_H
@@ -27474,7 +27817,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h
 +    int MaxHeight;
 +    void (*SetCursorColors) (ScrnInfoPtr pScrn, int bg, int fg);
 +    void (*SetCursorPosition) (ScrnInfoPtr pScrn, int x, int y);
-+    void (*LoadCursorImage) (ScrnInfoPtr pScrn, unsigned char *bits);
++    Bool (*LoadCursorImage) (ScrnInfoPtr pScrn, unsigned char *bits);
 +    void (*HideCursor) (ScrnInfoPtr pScrn);
 +    void (*ShowCursor) (ScrnInfoPtr pScrn);
 +    unsigned char *(*RealizeCursor) (struct _xf86CursorInfoRec *, CursorPtr);
@@ -27482,7 +27825,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h
 +
 +#ifdef ARGB_CURSOR
 +    Bool (*UseHWCursorARGB) (ScreenPtr, CursorPtr);
-+    void (*LoadCursorARGB) (ScrnInfoPtr, CursorPtr);
++    Bool (*LoadCursorARGB) (ScrnInfoPtr, CursorPtr);
 +#endif
 +
 +} xf86CursorInfoRec, *xf86CursorInfoPtr;
@@ -27514,8 +27857,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Cursor.h
 +#endif                          /* _XF86CURSOR_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86DDC.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86DDC.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86DDC.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86DDC.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86DDC.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86DDC.h	(working copy)
 @@ -0,0 +1,103 @@
 +
 +/* xf86DDC.h
@@ -27622,8 +27967,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86DDC.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Modes.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Modes.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Modes.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Modes.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Modes.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Modes.h	(working copy)
 @@ -0,0 +1,117 @@
 +/*
 + * Copyright © 2006 Intel Corporation
@@ -27744,8 +28091,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Modes.h
 +#endif                          /* _XF86MODES_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h	(working copy)
 @@ -0,0 +1,199 @@
 +/*
 + * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -27829,8 +28178,8 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h
 + * mask is 0xFFFF0000.
 + */
 +#define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(16, 0)
-+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(20, 0)
++#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(17, 0)
++#define ABI_XINPUT_VERSION	SET_ABI_VERSION(21, 0)
 +#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(8, 0)
 +#define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 +
@@ -27948,8 +28297,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Module.h
 +#endif                          /* _XF86STR_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Opt.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Opt.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Opt.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Opt.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Opt.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Opt.h	(working copy)
 @@ -0,0 +1,158 @@
 +
 +/*
@@ -28111,8 +28462,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Opt.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optionstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optionstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optionstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optionstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optionstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optionstr.h	(working copy)
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright © 2011 Red Hat, Inc.
@@ -28158,8 +28511,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optionstr.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optrec.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optrec.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optrec.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optrec.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optrec.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optrec.h	(working copy)
 @@ -0,0 +1,93 @@
 +/* 
 + * 
@@ -28256,8 +28611,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Optrec.h
 +#endif                          /* _xf86Optrec_h_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Parser.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Parser.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Parser.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Parser.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Parser.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Parser.h	(working copy)
 @@ -0,0 +1,468 @@
 +/* 
 + * 
@@ -28729,8 +29086,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Parser.h
 +#endif                          /* _xf86Parser_h_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Pci.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Pci.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Pci.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Pci.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Pci.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Pci.h	(working copy)
 @@ -0,0 +1,259 @@
 +/*
 + * Copyright 1998 by Concurrent Computer Corporation
@@ -28993,8 +29352,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Pci.h
 +#endif                          /* _XF86PCI_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86PciInfo.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86PciInfo.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86PciInfo.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86PciInfo.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86PciInfo.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86PciInfo.h	(working copy)
 @@ -0,0 +1,732 @@
 +
 +/*
@@ -29730,8 +30091,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86PciInfo.h
 +#endif                          /* _XF86_PCIINFO_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Priv.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Priv.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Priv.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Priv.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Priv.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Priv.h	(working copy)
 @@ -0,0 +1,171 @@
 +/*
 + * Copyright (c) 1997-2002 by The XFree86 Project, Inc.
@@ -29906,9 +30269,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Priv.h
 +#endif                          /* _XF86PRIV_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Privstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Privstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Privstr.h	(working copy)
-@@ -0,0 +1,166 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Privstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Privstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Privstr.h	(working copy)
+@@ -0,0 +1,170 @@
 +
 +/*
 + * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -30074,11 +30439,17 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Privstr.h
 +#define WSCONS		  32
 +#endif
 +
++/* Root window property to tell clients whether our VT is currently active.
++ * Name chosen to match the "XFree86_VT" property. */
++#define HAS_VT_ATOM_NAME "XFree86_has_VT"
++
 +#endif                          /* _XF86PRIVSTR_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RamDac.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RamDac.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RamDac.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RamDac.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RamDac.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RamDac.h	(working copy)
 @@ -0,0 +1,88 @@
 +
 +#ifndef _XF86RAMDAC_H
@@ -30170,8 +30541,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RamDac.h
 +#endif                          /* _XF86RAMDAC_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RandR12.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RandR12.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RandR12.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RandR12.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RandR12.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RandR12.h	(working copy)
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright © 2006 Keith Packard
@@ -30218,8 +30591,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86RandR12.h
 +#endif                          /* _XF86_RANDR_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86VGAarbiter.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86VGAarbiter.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86VGAarbiter.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86VGAarbiter.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86VGAarbiter.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86VGAarbiter.h	(working copy)
 @@ -0,0 +1,49 @@
 +/*
 + * Copyright (c) 2009 Tiago Vignatti
@@ -30272,9 +30647,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86VGAarbiter.h
 +#endif                          /* __XF86VGAARBITER_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h	(working copy)
-@@ -0,0 +1,204 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h	(working copy)
+@@ -0,0 +1,212 @@
 +/*
 + * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
 + *                                                                            
@@ -30341,6 +30718,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h
 +/* 0x08 is reserved for legacy XI86_SEND_DRAG_EVENTS, do not use for now */
 +/* server-internal only */
 +#define XI86_DEVICE_DISABLED    0x10    /* device was disabled before vt switch */
++#define XI86_SERVER_FD		0x20	/* fd is managed by xserver */
++
++/* Input device driver capabilities */
++#define XI86_DRV_CAP_SERVER_FD	0x01
 +
 +/* This holds the input driver entry and module information. */
 +typedef struct _InputDriverRec {
@@ -30353,6 +30734,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h
 +                    struct _InputInfoRec * pInfo, int flags);
 +    void *module;
 +    const char **default_options;
++    int capabilities;
 +} InputDriverRec, *InputDriverPtr;
 +
 +/* This is to input devices what the ScrnInfoRec is to screens. */
@@ -30373,6 +30755,8 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h
 +      int *valuators, int first_valuator, int num_valuators);
 +
 +    int fd;
++    int major;
++    int minor;
 +    DeviceIntPtr dev;
 +    void *private;
 +    const char *type_name;
@@ -30449,6 +30833,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h
 +extern _X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo);
 +extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 +extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
++extern _X_EXPORT void xf86InputEnableVTProbe(void);
 +
 +/* not exported */
 +int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
@@ -30481,8 +30866,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h
 +#endif                          /* _xf86Xinput_h */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSlib.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSlib.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSlib.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSlib.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSlib.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSlib.h	(working copy)
 @@ -0,0 +1,371 @@
 +/*
 + * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
@@ -30857,8 +31244,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSlib.h
 +#endif                          /* _XF86_OSLIB_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSproc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSproc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSproc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSproc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSproc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSproc.h	(working copy)
 @@ -0,0 +1,231 @@
 +/*
 + * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
@@ -31093,8 +31482,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86_OSproc.h
 +#endif                          /* _XF86_OSPROC_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86cmap.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86cmap.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86cmap.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86cmap.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86cmap.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86cmap.h	(working copy)
 @@ -0,0 +1,67 @@
 +
 +/*
@@ -31165,8 +31556,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86cmap.h
 +#endif                          /* _XF86CMAP_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86fbman.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86fbman.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86fbman.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86fbman.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86fbman.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86fbman.h	(working copy)
 @@ -0,0 +1,171 @@
 +
 +/*
@@ -31341,8 +31734,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86fbman.h
 +#endif                          /* _XF86FBMAN_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86i2c.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86i2c.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86i2c.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86i2c.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86i2c.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86i2c.h	(working copy)
 @@ -0,0 +1,117 @@
 +/* 
 + *  Copyright (C) 1998 Itai Nahshon, Michael Schimek
@@ -31463,8 +31858,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86i2c.h
 +#endif /*_XF86I2C_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86int10.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86int10.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86int10.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86int10.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86int10.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86int10.h	(working copy)
 @@ -0,0 +1,191 @@
 +
 +/*
@@ -31659,9 +32056,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86int10.h
 +#endif                          /* _XF86INT10_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h	(working copy)
-@@ -0,0 +1,68 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h	(working copy)
+@@ -0,0 +1,82 @@
 +/*
 + * Copyright © 2012 Red Hat.
 + *
@@ -31694,24 +32093,36 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h
 +    struct OdevAttributes *attribs;
 +    /* for PCI devices */
 +    struct pci_device *pdev;
++    int flags;
 +};
 +
++/* xf86_platform_device flags */
++#define XF86_PDEV_UNOWNED       0x01
++#define XF86_PDEV_SERVER_FD     0x02
++#define XF86_PDEV_PAUSED        0x04
++
 +#ifdef XSERVER_PLATFORM_BUS
 +int xf86platformProbe(void);
 +int xf86platformProbeDev(DriverPtr drvp);
 +
 +extern int xf86_num_platform_devices;
++extern struct xf86_platform_device *xf86_platform_devices;
 +
 +extern char *
 +xf86_get_platform_attrib(int index, int attrib_id);
 +extern int
-+xf86_add_platform_device(struct OdevAttributes *attribs);
++xf86_get_platform_int_attrib(int index, int attrib_id, int def);
++extern int
++xf86_add_platform_device(struct OdevAttributes *attribs, Bool unowned);
 +extern int
 +xf86_remove_platform_device(int dev_index);
 +extern Bool
++xf86_get_platform_device_unowned(int index);
++/* Note starting with xserver 1.16 these 2 functions never fail */
++extern Bool
 +xf86_add_platform_device_attrib(int index, int attrib_id, char *attrib_str);
 +extern Bool
-+xf86_get_platform_device_unowned(int index);
++xf86_add_platform_device_int_attrib(int index, int attrib_id, int attrib_value);
 +
 +extern int
 +xf86platformAddDevice(int index);
@@ -31720,6 +32131,8 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h
 +
 +extern _X_EXPORT char *
 +xf86_get_platform_device_attrib(struct xf86_platform_device *device, int attrib_id);
++extern _X_EXPORT int
++xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int attrib_id, int def);
 +extern _X_EXPORT Bool
 +xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *busid);
 +
@@ -31732,8 +32145,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86platformBus.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86sbusBus.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86sbusBus.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86sbusBus.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86sbusBus.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86sbusBus.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86sbusBus.h	(working copy)
 @@ -0,0 +1,111 @@
 +/*
 + * SBUS bus-specific declarations
@@ -31848,9 +32263,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86sbusBus.h
 +#endif                          /* _XF86_SBUSBUS_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h	(working copy)
-@@ -0,0 +1,899 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h	(working copy)
+@@ -0,0 +1,900 @@
 +
 +/*
 + * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -32109,7 +32526,8 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h
 +    RR_GET_INFO,
 +    RR_SET_CONFIG,
 +    RR_GET_MODE_MM,
-+    GET_REQUIRED_HW_INTERFACES = 10
++    GET_REQUIRED_HW_INTERFACES = 10,
++    SUPPORTS_SERVER_FDS = 11,
 +} xorgDriverFuncOp;
 +
 +typedef Bool xorgDriverFuncProc(ScrnInfoPtr, xorgDriverFuncOp, void *);
@@ -32752,8 +33170,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86str.h
 +#endif                          /* _XF86STR_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xv.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xv.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xv.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xv.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xv.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xv.h	(working copy)
 @@ -0,0 +1,266 @@
 +
 +/*
@@ -33023,8 +33443,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xv.h
 +#endif                          /* _XF86XV_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvmc.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvmc.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvmc.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvmc.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvmc.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvmc.h	(working copy)
 @@ -0,0 +1,141 @@
 +
 +/*
@@ -33169,8 +33591,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvmc.h
 +#endif                          /* _XF86XVMC_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvpriv.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvpriv.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvpriv.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvpriv.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvpriv.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvpriv.h	(working copy)
 @@ -0,0 +1,88 @@
 +
 +/*
@@ -33262,8 +33686,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86xvpriv.h
 +#endif                          /* _XF86XVPRIV_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xfixes.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xfixes.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xfixes.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xfixes.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xfixes.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xfixes.h	(working copy)
 @@ -0,0 +1,56 @@
 +/*
 + * Copyright © 2002 Keith Packard
@@ -33323,8 +33749,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xfixes.h
 +#endif                          /* _XFIXES_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xisb.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xisb.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xisb.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xisb.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xisb.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xisb.h	(working copy)
 @@ -0,0 +1,65 @@
 +/*
 + * Copyright (c) 1997  Metro Link Incorporated
@@ -33393,8 +33821,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xisb.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbfile.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbfile.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbfile.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbfile.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbfile.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbfile.h	(working copy)
 @@ -0,0 +1,276 @@
 +/************************************************************
 + Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -33674,8 +34104,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbfile.h
 +#endif                          /* _XKBFILE_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbrules.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbrules.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbrules.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbrules.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbrules.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbrules.h	(working copy)
 @@ -0,0 +1,120 @@
 +#ifndef _XKBRULES_H_
 +#define	_XKBRULES_H_ 1
@@ -33799,9 +34231,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbrules.h
 +#endif                          /* _XKBRULES_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h	(working copy)
-@@ -0,0 +1,872 @@
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h	(working copy)
+@@ -0,0 +1,886 @@
 +/************************************************************
 +Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 +
@@ -34442,6 +34876,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h
 +                                       DeviceEvent *    /* event */
 +    );
 +
++extern void XkbPushLockedStateToSlaves(DeviceIntPtr /* master */,
++                                       int /* evtype */,
++                                       int /* key */);
++
 +extern _X_EXPORT Bool XkbEnableDisableControls(XkbSrvInfoPtr /* xkbi */ ,
 +                                               unsigned long /* change */ ,
 +                                               unsigned long /* newValues */ ,
@@ -34624,8 +35062,11 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h
 +extern Bool XkbCopyKeymap(XkbDescPtr /* dst */ ,
 +                          XkbDescPtr /* src */ );
 +
-+extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */ ,
-+                                          DeviceIntPtr /* src */ );
++extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */,
++					  DeviceIntPtr /* src */);
++
++extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ ,
++                                           XkbDescPtr /* src */ );
 +
 +extern void XkbFilterEvents(ClientPtr /* pClient */ ,
 +                            int /* nEvents */ ,
@@ -34641,6 +35082,9 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h
 +                                int /* press */ ,
 +                                int /* button */ );
 +
++extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
++                                      XkbDescPtr /* src */ );
++
 +#include "xkbfile.h"
 +#include "xkbrules.h"
 +
@@ -34673,11 +35117,17 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbsrv.h
 +                                             XkbRMLVOSet *      /* rmlvo */
 +    );
 +
++extern _X_EXPORT XkbDescPtr XkbCompileKeymapFromString(DeviceIntPtr dev,
++						       const char *keymap,
++						       int keymap_length);
++
 +#endif                          /* _XKBSRV_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbstr.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbstr.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbstr.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbstr.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbstr.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbstr.h	(working copy)
 @@ -0,0 +1,640 @@
 +/************************************************************
 +Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -35321,8 +35771,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xkbstr.h
 +#endif                          /* _XKBSTR_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h	(working copy)
 @@ -0,0 +1,231 @@
 +/* include/xorg-server.h.  Generated from xorg-server.h.in by configure.  */
 +/* xorg-server.h.in						-*- c -*-
@@ -35473,7 +35925,7 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h
 +/* #undef XORG_RELEASE */
 +
 +/* Current Xorg version */
-+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((99) * 1000) + 901)
++#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((99) * 1000) + 902)
 +
 +/* Build Xv Extension */
 +#define XvExtension 1
@@ -35557,8 +36009,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorg-server.h
 +#endif /* _XORG_SERVER_H_ */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorgVersion.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorgVersion.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorgVersion.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorgVersion.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorgVersion.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorgVersion.h	(working copy)
 @@ -0,0 +1,49 @@
 +
 +/*
@@ -35611,8 +36065,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xorgVersion.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xserver-properties.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xserver-properties.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xserver-properties.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xserver-properties.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xserver-properties.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xserver-properties.h	(working copy)
 @@ -0,0 +1,205 @@
 +/*
 + * Copyright 2008 Red Hat, Inc.
@@ -35821,8 +36277,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xserver-properties.h
 +#endif
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvdix.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvdix.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvdix.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvdix.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvdix.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvdix.h	(working copy)
 @@ -0,0 +1,267 @@
 +/***********************************************************
 +Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
@@ -36093,8 +36551,10 @@ Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvdix.h
 +#endif                          /* XVDIX_H */
 Index: src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvmcext.h
 ===================================================================
---- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvmcext.h	(revision 0)
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvmcext.h	(working copy)
+diff --git a/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvmcext.h b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvmcext.h
+new file mode 10644
+--- /dev/null	(revision 0)
++++ b/src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xvmcext.h	(working copy)
 @@ -0,0 +1,98 @@
 +
 +#ifndef _XVMC_H
diff --git a/virtualbox.changes b/virtualbox.changes
index 68bcfca..c9e9e80 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon May  5 21:52:39 UTC 2014 - speilicke@suse.com
+
+- Update to version 4.3.10:
+  + VMM: more work on improving the emulation of certain MSR registers on certain host CPUs (e.g. bugs #12734, #12736, #12744, #12748, #12686, #12770)
+  + VMM: fixed single-stepping for real-mode guests (VT-x without unrestricted guest execution) and some I/O instructions (bug #12636)
+  + VMM: fixed a potential problem with COW pages if nested paging is not available
+  + GUI: Mac OS X: experimental native full screen support for Mountain Lion and Mavericks (bug #12292)
+  + GUI: Mac OS X: removed the mini-toolbar minimize button which doesn't work under Mac OS X full screen mode anyway
+  + GUI: experimental HID LEDs synchronization for Windows and Mac OS X hosts: fixed keyboard re-synchronization if the feature is disabled (as done by default; bug #12758)
+  + GUI: fixed a potential crash when opening the preferences menu (bug #12862)
+  + OVF: fixed a crash of the VirtualBox Manager when re-starting guest export (bug #12586)
+  + 3D support: several fixes
+  + HGCM: fixed a problem with saved states which could cause several guest misbehavior after a VM was started from a saved state
+  + Storage: fixed a bug preventing to compact differential snapshots under certain conditions
+  + VBoxSVC: fixed a segmentation fault on Linux hosts if a very long path exists under /dev (bug #12760)
+  + API: fixed guest misbehavior under certain conditions if a storage medium was attached or removed at VM runtime
+  + Windows installer: make the --silent parameter work again (bug #12764)
+  + Linux Additions: install correctly on Ubuntu guest systems with a /usr/lib64 directory (bug #12513)
+  + X11 Additions: fix for the VBoxClient process not exiting correctly (bug #12348) and consuming too much processor time 
+- Refresh virtualbox-xserver-116.patch to xorg-server-1.15.99.902 with
+  x.org video driver protocol version 17.0
+- Set mode of /usr/lib/virtualbox/VirtualBox to 4750 to match /etc/permissions.easy
+  as newly complained by chkstat (due to ro's change)
+
 -------------------------------------------------------------------
 Mon Mar 24 12:36:47 UTC 2014 - speilicke@suse.com
 
diff --git a/virtualbox.spec b/virtualbox.spec
index d44dbd1..6a3acbe 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -94,7 +94,7 @@ BuildRequires:  xorg-x11-libXt-devel-32bit
 %endif
 #
 ExclusiveArch:  %ix86 x86_64
-Version:        4.3.8
+Version:        4.3.10
 Release:        0
 Summary:        VirtualBox is an Emulator
 License:        GPL-2.0+
@@ -147,7 +147,7 @@ Patch103:       vbox-disable-updates.diff
 #use pie/fPIE for setuid binaries (bnc#743143) 
 Patch104:       vbox-fpie.diff
 # PATCH-FIX-UPSTREAM speilicke@suse.com
-Patch105:       Virtualbox-xserver-1.16.patch
+Patch105:       virtualbox-xserver-116.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
@@ -281,7 +281,7 @@ This package contains icons for guest desktop files that were created on the des
 %patch101 -p1
 %patch103
 %patch104 -p1
-%patch105 -p0
+%patch105 -p1
 #copy user manual
 %__cp %{S:1} UserManual.pdf
 #copy kbuild config
@@ -800,7 +800,7 @@ exit 0
 %files qt
 %defattr(-, root, root)
 %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage
-%verify(not mode) %attr(4755,root,vboxusers) %{_vbox_instdir}/VirtualBox
+%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VirtualBox
 #wrapper script is in bindir
 %attr(0755,root,root) %{_bindir}/VirtualBox
 #ldd shows libQt* dependency