Header cleanup

6 files changed, 23 insertions, 91 deletions

diff --git a/src/modules/emotion/gstreamer1/emotion_alloc.c b/src/modules/emotion/gstreamer1/emotion_alloc.c
index a2cba3b33..80d116021 100644
--- a/src/modules/emotion/gstreamer1/emotion_alloc.c
+++ b/src/modules/emotion/gstreamer1/emotion_alloc.c
@@ -2,22 +2,6 @@
 # include "config.h"
 #endif
 
-#include <Eina.h>
-#include <Evas.h>
-#include <Ecore.h>
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <gst/video/gstvideosink.h>
-#include <gst/video/video.h>
-#include <gst/audio/audio.h>
-
-#ifdef HAVE_ECORE_X
-# include <Ecore_X.h>
-# include <gst/video/videooverlay.h>
-#endif
-
-#include "Emotion.h"
 #include "emotion_gstreamer.h"
 
 Emotion_Gstreamer_Buffer *
diff --git a/src/modules/emotion/gstreamer1/emotion_convert.c b/src/modules/emotion/gstreamer1/emotion_convert.c
index 2c703b702..2a3aaa58e 100644
--- a/src/modules/emotion/gstreamer1/emotion_convert.c
+++ b/src/modules/emotion/gstreamer1/emotion_convert.c
@@ -2,21 +2,6 @@
 # include "config.h"
 #endif
 
-#include <Eina.h>
-#include <Evas.h>
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideosink.h>
-
-#ifdef HAVE_ECORE_X
-# include <Ecore_X.h>
-# include <gst/video/videooverlay.h>
-#endif
-
-#include "Emotion.h"
 #include "emotion_gstreamer.h"
 
 static inline void
diff --git a/src/modules/emotion/gstreamer1/emotion_fakeeos.c b/src/modules/emotion/gstreamer1/emotion_fakeeos.c
index 48eba67e6..7e71e7294 100644
--- a/src/modules/emotion/gstreamer1/emotion_fakeeos.c
+++ b/src/modules/emotion/gstreamer1/emotion_fakeeos.c
@@ -2,21 +2,6 @@
 # include "config.h"
 #endif
 
-#include <Eina.h>
-#include <Evas.h>
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideosink.h>
-
-#ifdef HAVE_ECORE_X
-# include <Ecore_X.h>
-# include <gst/video/videooverlay.h>
-#endif
-
-#include "Emotion.h"
 #include "emotion_gstreamer.h"
 
 typedef struct _FakeEOSBin
diff --git a/src/modules/emotion/gstreamer1/emotion_gstreamer.c b/src/modules/emotion/gstreamer1/emotion_gstreamer.c
index 0d95f3275..f7cfebc03 100644
--- a/src/modules/emotion/gstreamer1/emotion_gstreamer.c
+++ b/src/modules/emotion/gstreamer1/emotion_gstreamer.c
@@ -2,30 +2,6 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <Eina.h>
-#include <Evas.h>
-#include <Ecore.h>
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <glib-object.h>
-#include <gst/video/gstvideosink.h>
-#include <gst/video/video.h>
-#include <gst/audio/audio.h>
-#include <gst/tag/tag.h>
-
-// forcibly disable x overlay window.. broken badly.
-#undef HAVE_ECORE_X
-
-#ifdef HAVE_ECORE_X
-# include <Ecore_X.h>
-# include <gst/video/videooverlay.h>
-#endif
-
-#include "emotion_modules.h"
 #include "emotion_gstreamer.h"
 
 Eina_Bool window_manager_video = EINA_FALSE;
diff --git a/src/modules/emotion/gstreamer1/emotion_gstreamer.h b/src/modules/emotion/gstreamer1/emotion_gstreamer.h
index 8d83b9e8f..7ba9050cf 100644
--- a/src/modules/emotion/gstreamer1/emotion_gstreamer.h
+++ b/src/modules/emotion/gstreamer1/emotion_gstreamer.h
@@ -3,6 +3,29 @@
 
 #include "emotion_modules.h"
 
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <Eina.h>
+#include <Evas.h>
+#include <Ecore.h>
+
+#include <glib.h>
+#include <gst/gst.h>
+#include <glib-object.h>
+#include <gst/video/gstvideosink.h>
+#include <gst/video/video.h>
+#include <gst/audio/audio.h>
+#include <gst/tag/tag.h>
+
+// forcibly disable x overlay window.. broken badly.
+#undef HAVE_ECORE_X
+
+#ifdef HAVE_ECORE_X
+# include <Ecore_X.h>
+# include <gst/video/videooverlay.h>
+#endif
+
 typedef void (*Evas_Video_Convert_Cb)(unsigned char *evas_data,
                                       const unsigned char *gst_data,
                                       unsigned int w,
diff --git a/src/modules/emotion/gstreamer1/emotion_sink.c b/src/modules/emotion/gstreamer1/emotion_sink.c
index 7261baf45..3a061b6dd 100644
--- a/src/modules/emotion/gstreamer1/emotion_sink.c
+++ b/src/modules/emotion/gstreamer1/emotion_sink.c
@@ -2,27 +2,6 @@
 # include "config.h"
 #endif
 
-#include <Eina.h>
-#include <Evas.h>
-#include <Ecore.h>
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <glib-object.h>
-#include <gst/video/gstvideosink.h>
-#include <gst/video/video.h>
-#include <gst/audio/audio.h>
-
-// forcibly disable x overlay window.. broken badly.
-#undef HAVE_ECORE_X
-
-#ifdef HAVE_ECORE_X
-# include <Ecore_X.h>
-# include <Ecore_Evas.h>
-# include <gst/video/videooverlay.h>
-#endif
-
-#include "emotion_modules.h"
 #include "emotion_gstreamer.h"
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink",