Remove evil defines out of shared_x_display.h

webrtc/modules/desktop_capture/x11/shared_x_display.h

Index: webrtc/modules/desktop_capture/x11/shared_x_display.h
diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.h b/webrtc/modules/desktop_capture/x11/shared_x_display.h
index 6cade2decc09e3cc9541d5d3dd9e74f6bee7f108..648f67a51f19c8e9142bbba83ecc2273ae92d480 100644
--- a/webrtc/modules/desktop_capture/x11/shared_x_display.h
+++ b/webrtc/modules/desktop_capture/x11/shared_x_display.h
@@ -14,15 +14,17 @@
 #include <map>
 #include <vector>
 
-#include <assert.h>
-#include <X11/Xlib.h>
-
 #include <string>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 
+// Including Xlib.h will involve evil defines (Bool, Status, True, False), which
+// easily conflict with other headers.
+typedef struct _XDisplay Display;
+typedef union _XEvent XEvent;
+
 namespace webrtc {
 
 // A ref-counted object to store XDisplay connection.