[Spice-devel] [PATCH spice-gtk v2 4/4] Only include spice-client.h where necessary

Jonathon Jongsma jjongsma at redhat.com
Thu Sep 24 15:20:29 PDT 2015 

spice-client.h is a public "super"-header, which includes all of the
other public headers.  Including this header from other public headers
can result in cyclical dependencies. For consistency, I've removed all
includes of this header from spice-gtk files except where absolutely
necessary.
---
 src/channel-base.c          | 2 +-
 src/channel-cursor.c        | 2 +-
 src/channel-cursor.h        | 2 +-
 src/channel-display-mjpeg.c | 1 -
 src/channel-display.c       | 2 +-
 src/channel-display.h       | 3 ++-
 src/channel-inputs.c        | 2 +-
 src/channel-inputs.h        | 2 +-
 src/channel-main.c          | 1 +
 src/channel-main.h          | 2 +-
 src/channel-playback-priv.h | 2 ++
 src/channel-playback.c      | 2 +-
 src/channel-playback.h      | 2 +-
 src/channel-record.c        | 2 +-
 src/channel-record.h        | 2 +-
 src/channel-smartcard.c     | 2 +-
 src/channel-smartcard.h     | 2 +-
 src/channel-usbredir-priv.h | 3 ++-
 src/channel-usbredir.c      | 1 -
 src/channel-usbredir.h      | 2 +-
 src/channel-webdav.c        | 2 +-
 src/channel-webdav.h        | 1 -
 src/desktop-integration.h   | 2 +-
 src/spice-audio.c           | 1 -
 src/spice-audio.h           | 1 +
 src/spice-cmdline.c         | 1 -
 src/spice-cmdline.h         | 2 ++
 src/spice-gstaudio.c        | 2 ++
 src/spice-gstaudio.h        | 2 +-
 src/spice-gtk-session.c     | 2 ++
 src/spice-gtk-session.h     | 2 +-
 src/spice-pulse.c           | 1 +
 src/spice-pulse.h           | 1 -
 src/spice-session-priv.h    | 1 +
 src/spice-session.c         | 2 +-
 src/spice-widget-priv.h     | 4 ++++
 src/spice-widget.c          | 1 +
 src/spice-widget.h          | 2 --
 src/spicy.c                 | 4 +---
 src/usb-device-manager.h    | 4 +++-
 src/usb-device-widget.c     | 1 -
 src/usb-device-widget.h     | 2 +-
 42 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/src/channel-base.c b/src/channel-base.c
index 13e4ced..d4321a9 100644
--- a/src/channel-base.c
+++ b/src/channel-base.c
@@ -17,11 +17,11 @@
 */
 #include "config.h"
 
-#include "spice-client.h"
 #include "spice-common.h"
 
 #include "spice-session-priv.h"
 #include "spice-channel-priv.h"
+#include "channel-port.h"
 
 /* coroutine context */
 G_GNUC_INTERNAL
diff --git a/src/channel-cursor.c b/src/channel-cursor.c
index 6a9d60a..22dbc3b 100644
--- a/src/channel-cursor.c
+++ b/src/channel-cursor.c
@@ -18,8 +18,8 @@
 #include "config.h"
 
 #include "glib-compat.h"
-#include "spice-client.h"
 #include "spice-common.h"
+#include "channel-cursor.h"
 
 #include "spice-channel-priv.h"
 #include "spice-channel-cache.h"
diff --git a/src/channel-cursor.h b/src/channel-cursor.h
index df64ac2..662e8fa 100644
--- a/src/channel-cursor.h
+++ b/src/channel-cursor.h
@@ -22,7 +22,7 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-display-mjpeg.c b/src/channel-display-mjpeg.c
index 95d5b33..7b2f70e 100644
--- a/src/channel-display-mjpeg.c
+++ b/src/channel-display-mjpeg.c
@@ -17,7 +17,6 @@
 */
 #include "config.h"
 
-#include "spice-client.h"
 #include "spice-common.h"
 #include "spice-channel-priv.h"
 
diff --git a/src/channel-display.c b/src/channel-display.c
index 9f9d62a..c76a92f 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -30,12 +30,12 @@
 #endif
 
 #include "glib-compat.h"
-#include "spice-client.h"
 #include "spice-common.h"
 
 #include "spice-marshal.h"
 #include "spice-channel-priv.h"
 #include "spice-session-priv.h"
+#include "channel-display.h"
 #include "channel-display-priv.h"
 #include "decode.h"
 
diff --git a/src/channel-display.h b/src/channel-display.h
index 8904d68..4428ede 100644
--- a/src/channel-display.h
+++ b/src/channel-display.h
@@ -22,7 +22,8 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include <spice/enums.h>
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-inputs.c b/src/channel-inputs.c
index 7572bff..87af552 100644
--- a/src/channel-inputs.c
+++ b/src/channel-inputs.c
@@ -17,7 +17,7 @@
 */
 #include "config.h"
 
-#include "spice-client.h"
+#include "channel-inputs.h"
 #include "spice-common.h"
 #include "spice-channel-priv.h"
 
diff --git a/src/channel-inputs.h b/src/channel-inputs.h
index 0d76ba5..76cd3c1 100644
--- a/src/channel-inputs.h
+++ b/src/channel-inputs.h
@@ -22,7 +22,7 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-main.c b/src/channel-main.c
index 6701f93..5c9f324 100644
--- a/src/channel-main.c
+++ b/src/channel-main.c
@@ -22,6 +22,7 @@
 #include <common/rect.h>
 #include <glib/gstdio.h>
 
+#include "channel-main.h"
 #include "glib-compat.h"
 #include "spice-client.h"
 #include "spice-common.h"
diff --git a/src/channel-main.h b/src/channel-main.h
index f0fe57d..f4fc005 100644
--- a/src/channel-main.h
+++ b/src/channel-main.h
@@ -22,7 +22,7 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-playback-priv.h b/src/channel-playback-priv.h
index aa33d2c..f3497be 100644
--- a/src/channel-playback-priv.h
+++ b/src/channel-playback-priv.h
@@ -18,6 +18,8 @@
 #ifndef __SPICE_CLIENT_PLAYBACK_CHANNEL_PRIV_H__
 #define __SPICE_CLIENT_PLAYBACK_CHANNEL_PRIV_H__
 
+#include "channel-playback.h"
+
 gboolean spice_playback_channel_is_active(SpicePlaybackChannel *channel);
 guint32 spice_playback_channel_get_latency(SpicePlaybackChannel *channel);
 void spice_playback_channel_sync_latency(SpicePlaybackChannel *channel);
diff --git a/src/channel-playback.c b/src/channel-playback.c
index a124cbb..3bcb7b8 100644
--- a/src/channel-playback.c
+++ b/src/channel-playback.c
@@ -17,7 +17,7 @@
 */
 #include "config.h"
 
-#include "spice-client.h"
+#include "channel-playback.h"
 #include "spice-common.h"
 #include "spice-channel-priv.h"
 #include "spice-session-priv.h"
diff --git a/src/channel-playback.h b/src/channel-playback.h
index 36851ca..ddbba77 100644
--- a/src/channel-playback.h
+++ b/src/channel-playback.h
@@ -22,7 +22,7 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-record.c b/src/channel-record.c
index 08269c9..7a43c62 100644
--- a/src/channel-record.c
+++ b/src/channel-record.c
@@ -17,7 +17,7 @@
 */
 #include "config.h"
 
-#include "spice-client.h"
+#include "channel-record.h"
 #include "spice-common.h"
 #include "spice-channel-priv.h"
 
diff --git a/src/channel-record.h b/src/channel-record.h
index 60c146c..56fab12 100644
--- a/src/channel-record.h
+++ b/src/channel-record.h
@@ -22,7 +22,7 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-smartcard.c b/src/channel-smartcard.c
index 942f973..1305d81 100644
--- a/src/channel-smartcard.c
+++ b/src/channel-smartcard.c
@@ -21,7 +21,7 @@
 #include <vreader.h>
 #endif
 
-#include "spice-client.h"
+#include "channel-smartcard.h"
 #include "spice-common.h"
 
 #include "spice-channel-priv.h"
diff --git a/src/channel-smartcard.h b/src/channel-smartcard.h
index a96aa0a..302cacf 100644
--- a/src/channel-smartcard.h
+++ b/src/channel-smartcard.h
@@ -22,7 +22,7 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-usbredir-priv.h b/src/channel-usbredir-priv.h
index 2c4c6f7..cedd8d9 100644
--- a/src/channel-usbredir-priv.h
+++ b/src/channel-usbredir-priv.h
@@ -23,7 +23,8 @@
 
 #include <libusb.h>
 #include <usbredirfilter.h>
-#include "spice-client.h"
+#include "channel-usbredir.h"
+#include "usb-device-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
index c236ee7..859ca01 100644
--- a/src/channel-usbredir.c
+++ b/src/channel-usbredir.c
@@ -32,7 +32,6 @@
 #include "usbutil.h"
 #endif
 
-#include "spice-client.h"
 #include "spice-common.h"
 
 #include "spice-channel-priv.h"
diff --git a/src/channel-usbredir.h b/src/channel-usbredir.h
index 72368fc..ac20785 100644
--- a/src/channel-usbredir.h
+++ b/src/channel-usbredir.h
@@ -25,7 +25,7 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/channel-webdav.c b/src/channel-webdav.c
index e72c92c..bb655e8 100644
--- a/src/channel-webdav.c
+++ b/src/channel-webdav.c
@@ -17,7 +17,7 @@
 */
 #include "config.h"
 
-#include "spice-client.h"
+#include "channel-webdav.h"
 #include "spice-common.h"
 #include "spice-channel-priv.h"
 #include "spice-session-priv.h"
diff --git a/src/channel-webdav.h b/src/channel-webdav.h
index fb25763..6babf8e 100644
--- a/src/channel-webdav.h
+++ b/src/channel-webdav.h
@@ -23,7 +23,6 @@
 #endif
 
 #include <gio/gio.h>
-#include "spice-client.h"
 #include "channel-port.h"
 
 G_BEGIN_DECLS
diff --git a/src/desktop-integration.h b/src/desktop-integration.h
index 3716089..3518e40 100644
--- a/src/desktop-integration.h
+++ b/src/desktop-integration.h
@@ -21,7 +21,7 @@
 #ifndef __SPICE_DESKTOP_INTEGRATION_H__
 #define __SPICE_DESKTOP_INTEGRATION_H__
 
-#include "spice-client.h"
+#include "spice-session.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/spice-audio.c b/src/spice-audio.c
index 75742d7..7ba287d 100644
--- a/src/spice-audio.c
+++ b/src/spice-audio.c
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#include "spice-client.h"
 #include "spice-common.h"
 
 #include "spice-audio.h"
diff --git a/src/spice-audio.h b/src/spice-audio.h
index 5bf487f..1dbe68c 100644
--- a/src/spice-audio.h
+++ b/src/spice-audio.h
@@ -26,6 +26,7 @@
 #include <gio/gio.h>
 #include "spice-util.h"
 #include "spice-session.h"
+#include "spice-channel.h"
 #include "channel-main.h"
 
 G_BEGIN_DECLS
diff --git a/src/spice-cmdline.c b/src/spice-cmdline.c
index 8619b57..6bb8bfd 100644
--- a/src/spice-cmdline.c
+++ b/src/spice-cmdline.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #include <glib/gi18n.h>
 
-#include "spice-client.h"
 #include "spice-common.h"
 #include "spice-cmdline.h"
 
diff --git a/src/spice-cmdline.h b/src/spice-cmdline.h
index 11a8086..e21b307 100644
--- a/src/spice-cmdline.h
+++ b/src/spice-cmdline.h
@@ -19,6 +19,8 @@
 #ifndef SPICE_CMDLINE_H_
 # define SPICE_CMDLINE_H_
 
+#include "spice-session.h"
+
 G_BEGIN_DECLS
 
 GOptionGroup *spice_cmdline_get_option_group(void);
diff --git a/src/spice-gstaudio.c b/src/spice-gstaudio.c
index 1623421..9f18568 100644
--- a/src/spice-gstaudio.c
+++ b/src/spice-gstaudio.c
@@ -22,6 +22,8 @@
 #include <gst/app/gstappsink.h>
 #include <gst/audio/streamvolume.h>
 
+#include "channel-record.h"
+#include "channel-playback.h"
 #include "spice-gstaudio.h"
 #include "spice-common.h"
 #include "spice-session.h"
diff --git a/src/spice-gstaudio.h b/src/spice-gstaudio.h
index b605f1c..980b518 100644
--- a/src/spice-gstaudio.h
+++ b/src/spice-gstaudio.h
@@ -18,7 +18,7 @@
 #ifndef __SPICE_CLIENT_GSTAUDIO_H__
 #define __SPICE_CLIENT_GSTAUDIO_H__
 
-#include "spice-client.h"
+#include "spice-session.h"
 #include "spice-audio.h"
 
 G_BEGIN_DECLS
diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
index 5abb16c..fd94db5 100644
--- a/src/spice-gtk-session.c
+++ b/src/spice-gtk-session.c
@@ -38,6 +38,7 @@
 #include <gtk/gtk.h>
 #include <spice/vd_agent.h>
 #include "desktop-integration.h"
+#include "channel-inputs.h"
 #include "gtk-compat.h"
 #include "spice-common.h"
 #include "spice-gtk-session.h"
@@ -45,6 +46,7 @@
 #include "spice-session-priv.h"
 #include "spice-util-priv.h"
 #include "spice-channel-priv.h"
+#include "usb-device-manager.h"
 
 #define CLIPBOARD_LAST (VD_AGENT_CLIPBOARD_SELECTION_SECONDARY + 1)
 
diff --git a/src/spice-gtk-session.h b/src/spice-gtk-session.h
index 08f838d..98735f6 100644
--- a/src/spice-gtk-session.h
+++ b/src/spice-gtk-session.h
@@ -22,7 +22,7 @@
 #error "Only <spice-client-gtk.h> can be included directly"
 #endif
 
-#include "spice-client.h"
+#include "spice-session.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/spice-pulse.c b/src/spice-pulse.c
index 22db893..9d81bb7 100644
--- a/src/spice-pulse.c
+++ b/src/spice-pulse.c
@@ -17,6 +17,7 @@
 */
 #include "config.h"
 
+#include "spice-client.h"
 #include "spice-pulse.h"
 #include "spice-common.h"
 #include "spice-session-priv.h"
diff --git a/src/spice-pulse.h b/src/spice-pulse.h
index 819647e..ef676b5 100644
--- a/src/spice-pulse.h
+++ b/src/spice-pulse.h
@@ -18,7 +18,6 @@
 #ifndef __SPICE_CLIENT_PULSE_H__
 #define __SPICE_CLIENT_PULSE_H__
 
-#include "spice-client.h"
 #include "spice-audio.h"
 
 G_BEGIN_DECLS
diff --git a/src/spice-session-priv.h b/src/spice-session-priv.h
index 049973a..c41bd00 100644
--- a/src/spice-session-priv.h
+++ b/src/spice-session-priv.h
@@ -30,6 +30,7 @@ typedef struct _PhodavServer PhodavServer;
 #endif
 
 #include "desktop-integration.h"
+#include "spice-audio.h"
 #include "spice-session.h"
 #include "spice-gtk-session.h"
 #include "spice-channel-cache.h"
diff --git a/src/spice-session.c b/src/spice-session.c
index 85640a5..e971b83 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -24,7 +24,6 @@
 #endif
 #include "common/ring.h"
 
-#include "spice-client.h"
 #include "spice-common.h"
 #include "spice-channel-priv.h"
 #include "spice-util-priv.h"
@@ -35,6 +34,7 @@
 #include "spice-uri-priv.h"
 #include "channel-playback-priv.h"
 #include "spice-audio.h"
+#include "usb-device-manager.h"
 
 struct channel {
     SpiceChannel      *channel;
diff --git a/src/spice-widget-priv.h b/src/spice-widget-priv.h
index 682e889..4e6bdfd 100644
--- a/src/spice-widget-priv.h
+++ b/src/spice-widget-priv.h
@@ -30,6 +30,10 @@
 #include <windows.h>
 #endif
 
+#include "channel-cursor.h"
+#include "channel-inputs.h"
+#include "channel-main.h"
+#include "channel-smartcard.h"
 #include "spice-widget.h"
 #include "spice-common.h"
 #include "spice-gtk-session.h"
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 503f82a..2c754da 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -36,6 +36,7 @@
 #endif
 #endif
 
+#include "channel-display.h"
 #include "spice-widget.h"
 #include "spice-widget-priv.h"
 #include "spice-gtk-session-priv.h"
diff --git a/src/spice-widget.h b/src/spice-widget.h
index 7c3e768..5e0c52c 100644
--- a/src/spice-widget.h
+++ b/src/spice-widget.h
@@ -22,8 +22,6 @@
 #error "Only <spice-client-gtk.h> can be included directly"
 #endif
 
-#include "spice-client.h"
-
 #include <gtk/gtk.h>
 #include "spice-grabsequence.h"
 #include "spice-widget-enums.h"
diff --git a/src/spicy.c b/src/spicy.c
index f48a220..2a830ee 100644
--- a/src/spicy.c
+++ b/src/spicy.c
@@ -29,13 +29,11 @@
 #include "smartcard-manager.h"
 #endif
 
+#include "spice-client.h"
 #include "glib-compat.h"
-#include "spice-widget.h"
 #include "spice-gtk-session.h"
-#include "spice-audio.h"
 #include "spice-common.h"
 #include "spice-cmdline.h"
-#include "spice-option.h"
 #include "usb-device-widget.h"
 
 #include "spicy-connect.h"
diff --git a/src/usb-device-manager.h b/src/usb-device-manager.h
index 2e11bb7..b6ca48a 100644
--- a/src/usb-device-manager.h
+++ b/src/usb-device-manager.h
@@ -25,9 +25,11 @@
 #error "Only <spice-client.h> can be included directly"
 #endif
 
-#include "spice-client.h"
 #include <gio/gio.h>
 
+#include "spice-session.h"
+#include "spice-util.h"
+
 G_BEGIN_DECLS
 
 #define SPICE_TYPE_USB_DEVICE_MANAGER            (spice_usb_device_manager_get_type ())
diff --git a/src/usb-device-widget.c b/src/usb-device-widget.c
index fe983c9..481ccb0 100644
--- a/src/usb-device-widget.c
+++ b/src/usb-device-widget.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #include <glib/gi18n.h>
 #include "glib-compat.h"
-#include "spice-client.h"
 #include "spice-marshal.h"
 #include "usb-device-widget.h"
 
diff --git a/src/usb-device-widget.h b/src/usb-device-widget.h
index 16903b1..3ca13fe 100644
--- a/src/usb-device-widget.h
+++ b/src/usb-device-widget.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include "spice-client.h"
+#include "usb-device-manager.h"
 
 G_BEGIN_DECLS
 
-- 
2.1.0

More information about the Spice-devel mailing list