diff --git a/veejay-current/veejay-server/libvje/effects/picinpic.c b/veejay-current/veejay-server/libvje/effects/picinpic.c
index 11868dee..4ed687b1 100644
--- a/veejay-current/veejay-server/libvje/effects/picinpic.c
+++ b/veejay-current/veejay-server/libvje/effects/picinpic.c
@@ -22,15 +22,12 @@
 	This effect uses libpostproc , it should be enabled at compile time
 	(--with-swscaler) if you want to use this Effect.
  */
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include "common.h"
 #include <libvjmem/vjmem.h>
-#include "picinpic.h"
 #include <libyuv/yuvconv.h>
 #include <libavutil/pixfmt.h>
-#include <libel/avcommon.h>
-#include "common.h" 
+#include "picinpic.h"
+
 extern void    vj_get_yuv444_template(VJFrame *src, int w, int h);
 typedef struct
 {
@@ -99,10 +96,12 @@ static int	nearest_div(int val )
 	return val;
 }
 
-void picinpic_apply( void *user_data, VJFrame *frame, VJFrame *frame2, int width, int height,
-		   int twidth, int theight, int x1, int y1 ) 
+void picinpic_apply( void *user_data, VJFrame *frame, VJFrame *frame2,
+                    int twidth, int theight, int x1, int y1 )
 {
 	int x, y;
+	const unsigned int width = frame->width;
+	const unsigned int height = frame->height;
 	pic_t	*picture = (pic_t*) user_data;
 	int view_width = nearest_div(twidth);
 	int view_height = nearest_div(theight);
diff --git a/veejay-current/veejay-server/libvje/effects/picinpic.h b/veejay-current/veejay-server/libvje/effects/picinpic.h
index 3c8bc3af..d2f960a7 100644
--- a/veejay-current/veejay-server/libvje/effects/picinpic.h
+++ b/veejay-current/veejay-server/libvje/effects/picinpic.h
@@ -20,18 +20,9 @@
 
 #ifndef PICINPIC_H
 #define PICINPIC_H
-
-#include <libvje/vje.h>
-#include <sys/types.h>
-#include <stdint.h>
-vj_effect	*picinpic_init( int w, int h );
-
-void		 picinpic_free(void *d);
-
-int		 picinpic_malloc( void **c, int w , int h );
-
-
-void 		 picinpic_apply( void *user_data, VJFrame *frame, VJFrame *frame2,
-		   int w, int h, int twidth, int theight, int x1, int y1 ); 
-
+vj_effect *picinpic_init( int w, int h );
+void picinpic_free(void *d);
+int picinpic_malloc( void **c, int w , int h );
+void picinpic_apply( void *user_data, VJFrame *frame, VJFrame *frame2,
+                    int twidth, int theight, int x1, int y1 );
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index de18cb96..06c94e30 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -476,10 +476,8 @@ extern void videoplay_apply(VJFrame *frame,VJFrame *B, int a, int b, int c);
 extern void videowall_apply(VJFrame *frame,VJFrame *B, int a, int b, int c, int d);
 extern void flare_apply(VJFrame *frame, int type, int threshold, int radius );
 extern void constantblend_apply(VJFrame *frame, int type, int scale, int y );
-
 extern void picinpic_apply( void *user_data, VJFrame *frame, VJFrame *frame2,
-		   int twidth, int theight, int x1, int y1,
-		   int width, int height);
+                           int x1, int y1, int width, int height);
 
 extern void threshold_apply( VJFrame *frame, VJFrame *frame2,int width, int height, int threshold, int reverse );
 
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index b8260123..a960a089 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -603,8 +603,8 @@ static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,in
 	                 arg[4], arg[5], arg[6]);
 	break;
 	case VJ_VIDEO_EFFECT_PICINPIC:
-	picinpic_apply( vj_effects[entry]->user_data,frames[0], frames[1], frames[0]->width, frames[0]->height,
-			arg[0], arg[1], arg[2], arg[3] );
+	picinpic_apply( vj_effects[entry]->user_data,frames[0], frames[1],
+	               arg[0], arg[1], arg[2], arg[3] );
 	break;
 	case VJ_VIDEO_EFFECT_RIPPLETV:
 	water_apply( vj_effects[entry]->user_data,frames[0],frames[1],arg[0],arg[1],arg[2],arg[3],arg[4] );