include cleanups

16 files changed, 30 insertions, 44 deletions

diff --git a/gtk/channel-base.c b/gtk/channel-base.c
index 5618632..097f012 100644
--- a/gtk/channel-base.c
+++ b/gtk/channel-base.c
@@ -1,4 +1,6 @@
 #include "spice-client.h"
+#include "spice-common.h"
+
 #include "spice-channel-priv.h"
 
 void spice_channel_handle_set_ack(SpiceChannel *channel, spice_msg_in *in)
diff --git a/gtk/channel-cursor.c b/gtk/channel-cursor.c
index 450dd80..4009faa 100644
--- a/gtk/channel-cursor.c
+++ b/gtk/channel-cursor.c
@@ -1,6 +1,6 @@
-#include <assert.h>
-
 #include "spice-client.h"
+#include "spice-common.h"
+
 #include "spice-channel-cache.h"
 #include "spice-marshal.h"
 
diff --git a/gtk/channel-display-mjpeg.c b/gtk/channel-display-mjpeg.c
index 3a11aed..db3ee67 100644
--- a/gtk/channel-display-mjpeg.c
+++ b/gtk/channel-display-mjpeg.c
@@ -1,4 +1,5 @@
 #include "spice-client.h"
+#include "spice-common.h"
 
 #include "channel-display-priv.h"
 
diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index 034e3f2..2e3a061 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -1,15 +1,14 @@
-#include <assert.h>
-
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
 #include "spice-client.h"
-#include "spice-channel-cache.h"
-#include "spice-marshal.h"
+#include "spice-common.h"
 
+#include "spice-marshal.h"
+#include "spice-channel-cache.h"
 #include "channel-display-priv.h"
 #include "decode.h"
 
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
 #define SPICE_DISPLAY_CHANNEL_GET_PRIVATE(obj)                                  \
     (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_DISPLAY_CHANNEL, spice_display_channel))
 
diff --git a/gtk/channel-inputs.c b/gtk/channel-inputs.c
index 443a39d..5878c60 100644
--- a/gtk/channel-inputs.c
+++ b/gtk/channel-inputs.c
@@ -1,6 +1,5 @@
-#include <assert.h>
-
 #include "spice-client.h"
+#include "spice-common.h"
 
 #define SPICE_INPUTS_CHANNEL_GET_PRIVATE(obj)                                  \
     (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_INPUTS_CHANNEL, spice_inputs_channel))
diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 76e608f..5f2189a 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -1,11 +1,11 @@
-#include <assert.h>
-
-#include <spice/vd_agent.h>
-
 #include "spice-client.h"
+#include "spice-common.h"
+
 #include "spice-session-priv.h"
 
-#define SPICE_MAIN_CHANNEL_GET_PRIVATE(obj)                                  \
+#include <spice/vd_agent.h>
+
+#define SPICE_MAIN_CHANNEL_GET_PRIVATE(obj)                             \
     (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_MAIN_CHANNEL, spice_main_channel))
 
 struct spice_main_channel {
diff --git a/gtk/channel-playback.c b/gtk/channel-playback.c
index 8d114d2..20b86d7 100644
--- a/gtk/channel-playback.c
+++ b/gtk/channel-playback.c
@@ -1,6 +1,6 @@
-#include <assert.h>
-
 #include "spice-client.h"
+#include "spice-common.h"
+
 #include "spice-marshal.h"
 
 #define SPICE_PLAYBACK_CHANNEL_GET_PRIVATE(obj)                                  \
diff --git a/gtk/snappy.c b/gtk/snappy.c
index 372272c..812b9ea 100644
--- a/gtk/snappy.c
+++ b/gtk/snappy.c
@@ -1,4 +1,5 @@
 #include "spice-client.h"
+#include "spice-common.h"
 
 /* config */
 static char *host      = "localhost";
diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
index fd7a83c..81e1e40 100644
--- a/gtk/spice-channel.c
+++ b/gtk/spice-channel.c
@@ -1,10 +1,10 @@
 #include "spice-client.h"
+#include "spice-common.h"
+
 #include "spice-channel-priv.h"
 #include "spice-session-priv.h"
 #include "spice-marshal.h"
 
-#include <assert.h>
-
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
diff --git a/gtk/spice-client.h b/gtk/spice-client.h
index 48fd9f1..63f0843 100644
--- a/gtk/spice-client.h
+++ b/gtk/spice-client.h
@@ -1,15 +1,6 @@
 #ifndef __SPICE_CLIENT_CLIENT_H__
 #define __SPICE_CLIENT_CLIENT_H__
 
-/* system */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <inttypes.h>
-
 /* glib */
 #include <glib.h>
 #include <glib-object.h>
@@ -18,18 +9,12 @@
 #include <spice/enums.h>
 #include <spice/protocol.h>
 
-/* spice/common */
-#include "mem.h"
-#include "messages.h"
-#include "marshaller.h"
+/* spice/client -- FIXME */
 #include "marshallers.h"
-
-/* spice/client */
 #include "demarshallers.h"
 
 /* spice/gtk */
 #include "spice-types.h"
-#include "spice-events.h"
 #include "spice-session.h"
 #include "spice-channel.h"
 
diff --git a/gtk/spice-events.c b/gtk/spice-events.c
index 7caaf28..0a5c0ac 100644
--- a/gtk/spice-events.c
+++ b/gtk/spice-events.c
@@ -1,4 +1,5 @@
 #include "spice-client.h"
+#include "spice-common.h"
 
 struct spice_watch {
     GIOChannel        *ch;
diff --git a/gtk/spice-pulse.c b/gtk/spice-pulse.c
index 02f6864..7c363f1 100644
--- a/gtk/spice-pulse.c
+++ b/gtk/spice-pulse.c
@@ -1,6 +1,5 @@
 #include "spice-pulse.h"
-
-#include <assert.h>
+#include "spice-common.h"
 
 #include <pulse/glib-mainloop.h>
 #include <pulse/context.h>
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index d92c195..157a30e 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -1,8 +1,7 @@
-#include <assert.h>
-
 #include "spice-client.h"
-#include "spice-session-priv.h"
+#include "spice-common.h"
 
+#include "spice-session-priv.h"
 #include "tcp.h"
 
 /* spice/common */
diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
index 7e5812f..8061025 100644
--- a/gtk/spice-widget.c
+++ b/gtk/spice-widget.c
@@ -1,7 +1,7 @@
 #include "spice-widget.h"
-#include "vncdisplaykeymap.h"
+#include "spice-common.h"
 
-#include <assert.h>
+#include "vncdisplaykeymap.h"
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
diff --git a/gtk/spice-widget.h b/gtk/spice-widget.h
index 5024f9a..a54e236 100644
--- a/gtk/spice-widget.h
+++ b/gtk/spice-widget.h
@@ -3,7 +3,6 @@
 
 #include "spice-client.h"
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/spicy.c b/gtk/spicy.c
index 379edd9..21710be 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -1,5 +1,6 @@
 #include "spice-widget.h"
 #include "spice-pulse.h"
+#include "spice-common.h"
 
 typedef struct spice_window spice_window;
 struct spice_window {