waylandsink: cleanup header includes

diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
index 6c12c35..e6f3668 100644 (file)
--- a/ext/wayland/gstwaylandsink.c
+++ b/ext/wayland/gstwaylandsink.c
@@ -42,6 +42,7 @@
 
 #include "gstwaylandsink.h"
 #include "wlvideoformat.h"
+#include "waylandpool.h"
 
 /* signals */
 enum

diff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h
index c72b54c..7b47492 100644 (file)
--- a/ext/wayland/gstwaylandsink.h
+++ b/ext/wayland/gstwaylandsink.h
@@ -22,23 +22,8 @@
 #ifndef __GST_WAYLAND_VIDEO_SINK_H__
 #define __GST_WAYLAND_VIDEO_SINK_H__
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <assert.h>
-#include <unistd.h>
-
 #include <gst/gst.h>
-#include <gst/video/video.h>
 #include <gst/video/gstvideosink.h>
-#include <gst/video/gstvideometa.h>
 
 #include <wayland-client.h>
 
@@ -63,10 +48,6 @@ G_BEGIN_DECLS
 typedef struct _GstWaylandSink GstWaylandSink;
 typedef struct _GstWaylandSinkClass GstWaylandSinkClass;
 
-G_END_DECLS
-#include "waylandpool.h"
-G_BEGIN_DECLS
-
 struct _GstWaylandSink
 {
   GstVideoSink parent;

diff --git a/ext/wayland/waylandpool.c b/ext/wayland/waylandpool.c
index f80c440..9410572 100644 (file)
--- a/ext/wayland/waylandpool.c
+++ b/ext/wayland/waylandpool.c
@@ -22,20 +22,17 @@
 #include "config.h"
 #endif
 
-/* Object header */
-#include "gstwaylandsink.h"
+#include "waylandpool.h"
 #include "wldisplay.h"
 #include "wlvideoformat.h"
 
-/* Debugging category */
-#include <gst/gstinfo.h>
-
-/* Helper functions */
-#include <gst/video/video.h>
-#include <gst/video/gstvideometa.h>
-#include <gst/video/gstvideopool.h>
-
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/types.h>
 
 /* wl metadata */
 GType

diff --git a/ext/wayland/waylandpool.h b/ext/wayland/waylandpool.h
index c274feb..2dd8534 100644 (file)
--- a/ext/wayland/waylandpool.h
+++ b/ext/wayland/waylandpool.h
@@ -21,6 +21,9 @@
 #ifndef __GST_WAYLAND_BUFFER_POOL_H__
 #define __GST_WAYLAND_BUFFER_POOL_H__
 
+#include <gst/video/video.h>
+#include <gst/video/gstvideometa.h>
+
 #include "gstwaylandsink.h"
 
 G_BEGIN_DECLS

diff --git a/ext/wayland/wldisplay.c b/ext/wayland/wldisplay.c
index 5f142fb..13708ce 100644 (file)
--- a/ext/wayland/wldisplay.c
+++ b/ext/wayland/wldisplay.c
@@ -18,6 +18,10 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "wldisplay.h"
 
 #include <errno.h>

diff --git a/ext/wayland/wlvideoformat.c b/ext/wayland/wlvideoformat.c
index ff2858b..eedd1b3 100644 (file)
--- a/ext/wayland/wlvideoformat.c
+++ b/ext/wayland/wlvideoformat.c
@@ -21,6 +21,10 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "wlvideoformat.h"
 
 typedef struct

diff --git a/ext/wayland/wlwindow.c b/ext/wayland/wlwindow.c
index 97107ef..79a5a22 100644 (file)
--- a/ext/wayland/wlwindow.c
+++ b/ext/wayland/wlwindow.c
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "wlwindow.h"
 
 G_DEFINE_TYPE (GstWlWindow, gst_wl_window, G_TYPE_OBJECT);