--- a/gst_plugins_base/gst/videoscale/vs_4tap.h	Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/gst/videoscale/vs_4tap.h	Wed Sep 01 12:16:41 2010 +0100
@@ -30,164 +30,15 @@
 
 #include "vs_image.h"
 
-#include <liboil/liboil.h>
+#include <gst/liboil.h>
 
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 void vs_4tap_init (void);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_scanline_resample_4tap_Y (uint8_t *dest, uint8_t *src,
     int n, int src_width, int *xacc, int increment);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_scanline_merge_4tap_Y (uint8_t *dest, uint8_t *src1, uint8_t *src2,
     uint8_t *src3, uint8_t *src4, int n, int acc);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_4tap_Y (const VSImage * dest, const VSImage * src,
     uint8_t * tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-void vs_scanline_resample_4tap_RGBA (uint8_t *dest, uint8_t *src,
-    int n, int src_width, int *xacc, int increment);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_scanline_merge_4tap_RGBA (uint8_t *dest, uint8_t *src1, uint8_t *src2,
-    uint8_t *src3, uint8_t *src4, int n, int acc);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_image_scale_4tap_RGBA (const VSImage * dest, const VSImage * src,
-    uint8_t * tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-void vs_scanline_resample_4tap_RGB (uint8_t *dest, uint8_t *src,
-    int n, int src_width, int *xacc, int increment);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_scanline_merge_4tap_RGB (uint8_t *dest, uint8_t *src1, uint8_t *src2,
-    uint8_t *src3, uint8_t *src4, int n, int acc);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_image_scale_4tap_RGB (const VSImage * dest, const VSImage * src,
-    uint8_t * tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-void vs_scanline_resample_4tap_YUYV (uint8_t *dest, uint8_t *src,
-    int n, int src_width, int *xacc, int increment);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_scanline_merge_4tap_YUYV (uint8_t *dest, uint8_t *src1, uint8_t *src2,
-    uint8_t *src3, uint8_t *src4, int n, int acc);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_image_scale_4tap_YUYV (const VSImage * dest, const VSImage * src,
-    uint8_t * tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-void vs_scanline_resample_4tap_UYVY (uint8_t *dest, uint8_t *src,
-    int n, int src_width, int *xacc, int increment);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_scanline_merge_4tap_UYVY (uint8_t *dest, uint8_t *src1, uint8_t *src2,
-    uint8_t *src3, uint8_t *src4, int n, int acc);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_image_scale_4tap_UYVY (const VSImage * dest, const VSImage * src,
-    uint8_t * tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-void vs_scanline_resample_4tap_RGB565 (uint8_t *dest, uint8_t *src,
-    int n, int src_width, int *xacc, int increment);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_scanline_merge_4tap_RGB565 (uint8_t *dest, uint8_t *src1, uint8_t *src2,
-    uint8_t *src3, uint8_t *src4, int n, int acc);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_image_scale_4tap_RGB565 (const VSImage * dest, const VSImage * src,
-    uint8_t * tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-void vs_scanline_resample_4tap_RGB555 (uint8_t *dest, uint8_t *src,
-    int n, int src_width, int *xacc, int increment);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_scanline_merge_4tap_RGB555 (uint8_t *dest, uint8_t *src1, uint8_t *src2,
-    uint8_t *src3, uint8_t *src4, int n, int acc);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_image_scale_4tap_RGB555 (const VSImage * dest, const VSImage * src,
-    uint8_t * tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_scanline_resample_4tap_Y16 (uint8_t *dest, uint8_t *src,
-    int n, int src_width, int *xacc, int increment);
-	
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-	
-void vs_scanline_merge_4tap_Y16 (uint8_t *dest, uint8_t *src1, uint8_t *src2,
-    uint8_t *src3, uint8_t *src4, int n, int acc);
-	
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void vs_image_scale_4tap_Y16 (const VSImage * dest, const VSImage * src,
-    uint8_t * tmpbuf);
 
 #endif