merge XFree86 4.3.0.1 to -CURRENT

hw/xnest/TestExt.c

@@ -12,13 +12,18 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-#include "X.h"
-#include "Xproto.h"
+/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.5 2001/08/27 17:41:00 dawes Exp $ */
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xlib.h>
+#undef Bool
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
+#include "mipointer.h"
 #define XTestSERVER_SIDE
 #include "xtestext1.h"