From 52f3cf3c612b2f33e39fd6f985b840a0d7192a50 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed, 19 Jun 2013 18:09:07 +0100
Subject: [PATCH] hw/xwin: Remove standard includes from internal.h and add
 them where needed

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
---
 hw/xwin/winclipboard/internal.h | 14 --------------
 hw/xwin/winclipboard/thread.c   | 13 +++++++++----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/hw/xwin/winclipboard/internal.h b/hw/xwin/winclipboard/internal.h
index e31db546c..0f9a656c1 100644
--- a/hw/xwin/winclipboard/internal.h
+++ b/hw/xwin/winclipboard/internal.h
@@ -32,20 +32,6 @@
 #ifndef WINCLIPBOARD_INTERNAL_H
 #define WINCLIPBOARD_INTERNAL_H
 
-/* Standard library headers */
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#ifdef __CYGWIN__
-#include <sys/select.h>
-#else
-#include <X11/Xwinsock.h>
-#endif
-#include <fcntl.h>
-#include <setjmp.h>
-#include <pthread.h>
-
 /* X headers */
 #include <X11/X.h>
 #include <X11/Xatom.h>
diff --git a/hw/xwin/winclipboard/thread.c b/hw/xwin/winclipboard/thread.c
index 0d64cce21..ea0ef42a8 100644
--- a/hw/xwin/winclipboard/thread.c
+++ b/hw/xwin/winclipboard/thread.c
@@ -36,10 +36,15 @@
 #define HAS_WINSOCK 1
 #endif
 
-#include <sys/types.h>
-#include <signal.h>
-#include "windisplay.h"
-#ifdef __CYGWIN__
+#include <assert.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <pthread.h>
+
+#ifdef HAS_WINSOCK
+#include <X11/Xwinsock.h>
+#else
 #include <errno.h>
 #endif