diff --git a/veejay-current/veejay-server/libplugger/freeframe-loader.c b/veejay-current/veejay-server/libplugger/freeframe-loader.c
index 6064d02d..cc2002dd 100644
--- a/veejay-current/veejay-server/libplugger/freeframe-loader.c
+++ b/veejay-current/veejay-server/libplugger/freeframe-loader.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <dlfcn.h>
@@ -31,7 +32,7 @@
 #include <libplugger/defs.h>
 #include <libplugger/ldefs.h>
 #include <libyuv/yuvconv.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #include <libplugger/portdef.h>
 #define LINUX 1 
 #include <libplugger/specs/FreeFrame.h>
diff --git a/veejay-current/veejay-server/libplugger/frei0r-loader.c b/veejay-current/veejay-server/libplugger/frei0r-loader.c
index 8293af46..e6f11c89 100644
--- a/veejay-current/veejay-server/libplugger/frei0r-loader.c
+++ b/veejay-current/veejay-server/libplugger/frei0r-loader.c
@@ -31,7 +31,7 @@
 #include <libvevo/libvevo.h>
 #include <libplugger/defs.h>
 #include <libyuv/yuvconv.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/veejay-current/veejay-server/libplugger/livido-loader.c b/veejay-current/veejay-server/libplugger/livido-loader.c
index d29aee7e..2e9559eb 100644
--- a/veejay-current/veejay-server/libplugger/livido-loader.c
+++ b/veejay-current/veejay-server/libplugger/livido-loader.c
@@ -42,7 +42,7 @@
 #include <libplugger/specs/livido.h>
 #include <libplugger/portdef.h>
 #include <libyuv/yuvconv.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #include <stdlib.h>
 //#include <veejay/oscservit.h>
 #include <libplugger/utility.h>
diff --git a/veejay-current/veejay-server/libstream/vj-net.c b/veejay-current/veejay-server/libstream/vj-net.c
index 94036207..d05e1be2 100644
--- a/veejay-current/veejay-server/libstream/vj-net.c
+++ b/veejay-current/veejay-server/libstream/vj-net.c
@@ -27,7 +27,7 @@
 #include <veejay/vims.h>
 #include <libyuv/yuvconv.h>
 #include <libvjmem/vjmem.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #include <libvjmsg/vj-msg.h>
 #include <veejay/vims.h>
 #include <libstream/vj-net.h>
diff --git a/veejay-current/veejay-server/libvje/effects/colorhis.c b/veejay-current/veejay-server/libvje/effects/colorhis.c
index a2023136..101daea1 100644
--- a/veejay-current/veejay-server/libvje/effects/colorhis.c
+++ b/veejay-current/veejay-server/libvje/effects/colorhis.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <libvjmem/vjmem.h>
 #include "colorhis.h"
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #include <libyuv/yuvconv.h>
 #include <veejay/vims.h>
 #include "common.h"
diff --git a/veejay-current/veejay-server/libvje/effects/rgbchannel.c b/veejay-current/veejay-server/libvje/effects/rgbchannel.c
index 507e2072..f464bfbd 100644
--- a/veejay-current/veejay-server/libvje/effects/rgbchannel.c
+++ b/veejay-current/veejay-server/libvje/effects/rgbchannel.c
@@ -23,7 +23,7 @@
 #include <libvjmem/vjmem.h>
 #include <libvje/vje.h>
 #include <libyuv/yuvconv.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #include "rgbchannel.h"
 
 vj_effect *rgbchannel_init(int w, int h)
diff --git a/veejay-current/veejay-server/libvje/vje.h b/veejay-current/veejay-server/libvje/vje.h
index 1eb53ef1..20004038 100644
--- a/veejay-current/veejay-server/libvje/vje.h
+++ b/veejay-current/veejay-server/libvje/vje.h
@@ -27,6 +27,7 @@
 #define PARAM_HEIGHT	(1<<0x3)
 #define PARAM_FADER  	(1<<0x1)
 
+
 typedef struct
 {
 	int type;
diff --git a/veejay-current/veejay-server/veejay/vj-composite.c b/veejay-current/veejay-server/veejay/vj-composite.c
index 1e678252..313380d7 100644
--- a/veejay-current/veejay-server/veejay/vj-composite.c
+++ b/veejay-current/veejay-server/veejay/vj-composite.c
@@ -32,7 +32,7 @@
 #include <veejay/vj-viewport.h>
 #include <veejay/vj-composite.h>
 #include <veejay/vj-misc.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 
 #ifdef HAVE_XML2
 #include <libxml/xmlmemory.h>
diff --git a/veejay-current/veejay-server/veejay/vj-misc.c b/veejay-current/veejay-server/veejay/vj-misc.c
index 42a9dd6a..1217987e 100644
--- a/veejay-current/veejay-server/veejay/vj-misc.c
+++ b/veejay-current/veejay-server/veejay/vj-misc.c
@@ -39,7 +39,7 @@
 #include <libvjmsg/vj-msg.h>
 #include <libvje/vje.h>
 #include <libyuv/yuvconv.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #ifdef STRICT_CHECKING
 #include <assert.h>
 #endif
diff --git a/veejay-current/veejay-server/veejay/vj-viewport.c b/veejay-current/veejay-server/veejay/vj-viewport.c
index ce46f8a5..67aa8150 100644
--- a/veejay-current/veejay-server/veejay/vj-viewport.c
+++ b/veejay-current/veejay-server/veejay/vj-viewport.c
@@ -40,7 +40,7 @@
 #include <veejay/vj-viewport-xml.h>
 #include <libvje/effects/opacity.h>
 #include <libyuv/yuvconv.h>
-#include <libavutil/avutil.h>
+#include <libavutil/pixfmt.h>
 #include <libvjmem/vjmem.h>
 #include <math.h>
 #include <assert.h>