diff --git a/veejay-current/veejay-server/libvje/effects/noisepencil.c b/veejay-current/veejay-server/libvje/effects/noisepencil.c
index 90ab228f..a0e8bcba 100644
--- a/veejay-current/veejay-server/libvje/effects/noisepencil.c
+++ b/veejay-current/veejay-server/libvje/effects/noisepencil.c
@@ -18,13 +18,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA.
  */
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <libvje/vje.h>
+#include "common.h"
 #include <libvjmem/vjmem.h>
 #include "noisepencil.h"
-#include "common.h"
 
 static uint8_t *Yb_frame = NULL;
 
@@ -314,21 +310,23 @@ static void noisepencil_5_apply(uint8_t *src[3], int width, int height, int coee
 /* with min_t -> max_t select the threshold to 'noise ' */
 void noisepencil_apply(VJFrame *frame, int type, int coeef, int min_t, int max_t)
 {
+	const unsigned int width = frame->width;
+	const unsigned int height = frame->height;
 	switch(type) {
 		case 0:
-		noisepencil_1_apply(frame->data,frame->width,frame->height,coeef,min_t,max_t);
+		noisepencil_1_apply(frame->data,width, height, coeef,min_t,max_t);
 			break;
 		case 1:
-		noisepencil_2_apply(frame->data,frame->width,frame->height,coeef,min_t,max_t);
+		noisepencil_2_apply(frame->data, width, height, coeef,min_t,max_t);
 			break;
 		case 2:
-		noisepencil_3_apply(frame->data,frame->width,frame->height,coeef,min_t,max_t);
+		noisepencil_3_apply(frame->data, width, height, coeef,min_t,max_t);
 			break;
 		case 3:
-		noisepencil_4_apply(frame->data,frame->width,frame->height,coeef,min_t,max_t);
+		noisepencil_4_apply(frame->data, width, height, coeef,min_t,max_t);
 			break;
 		case 4:
-		noisepencil_5_apply(frame->data,frame->width,frame->height,coeef,min_t,max_t);
+		noisepencil_5_apply(frame->data, width, height, coeef,min_t,max_t);
 			break;
 	}
 }
diff --git a/veejay-current/veejay-server/libvje/effects/noisepencil.h b/veejay-current/veejay-server/libvje/effects/noisepencil.h
index 8a9f266c..32fb95d6 100644
--- a/veejay-current/veejay-server/libvje/effects/noisepencil.h
+++ b/veejay-current/veejay-server/libvje/effects/noisepencil.h
@@ -19,14 +19,9 @@
  */
 
 #ifndef NOISEPENCIL_H
-#define NOISEPENCIL_H          
-#include <libvje/vje.h>
-#include <sys/types.h>
-#include <stdint.h>
-
+#define NOISEPENCIL_H
 vj_effect *noisepencil_init  (int w, int h);
 void noisepencil_free();
 int noisepencil_malloc(int w, int h);
 void noisepencil_apply( VJFrame *frame, int t, int n, int a, int b);
-
 #endif