diff --git a/veejay-current/veejay-server/Makefile.am b/veejay-current/veejay-server/Makefile.am
index e5405c39..e43f5a07 100644
--- a/veejay-current/veejay-server/Makefile.am
+++ b/veejay-current/veejay-server/Makefile.am
@@ -6,8 +6,8 @@ else
 SUBDIRS = mjpegtools 
 endif
 
-SUBDIRS += aclib
-SUBDIRS += libOSC libhash libvjmsg libvjmem libqrwrap 
+SUBDIRS += thirdparty
+SUBDIRS += libhash libvjmsg libvjmem libqrwrap 
 SUBDIRS += bio2jack libvevo liblzo libvje libplugger libsample libvjnet libsubsample libyuv libel libstream libsamplerec
 SUBDIRS += veejay 
 SUBDIRS += livido-plugins
diff --git a/veejay-current/veejay-server/bio2jack/Makefile.am b/veejay-current/veejay-server/bio2jack/Makefile.am
index 8c4a1b50..36bb8c10 100644
--- a/veejay-current/veejay-server/bio2jack/Makefile.am
+++ b/veejay-current/veejay-server/bio2jack/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LTLIBRARIES = libbio2jack4vj.la
-INCLUDES=-I$(top_srcdir)/libvjmem
+AM_CPPFLAGS=-I$(top_srcdir)/libvjmem
 LIBS = @LIBS@ @PTHREAD_LIBS@ @JACK_LIBS@
 libbio2jack4vj_la_SOURCES = bio2jack.c bio2jack.h
diff --git a/veejay-current/veejay-server/configure.ac b/veejay-current/veejay-server/configure.ac
index 093b5da3..593ab419 100644
--- a/veejay-current/veejay-server/configure.ac
+++ b/veejay-current/veejay-server/configure.ac
@@ -15,7 +15,8 @@ dnl AX_CONFIG_PREFIXED_HEADER([veejay-config.h], [VEEJAY], [config.h])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.7])
+
+AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
 AC_DEFINE(VEEJAY,1,[Building Veejay])
@@ -1142,8 +1143,9 @@ if test "$have_mjpegtools" = "false" ; then
 fi
 
 AC_CONFIG_FILES([
-aclib/Makefile
-libOSC/Makefile
+thirdparty/Makefile
+thirdparty/libOSC/Makefile
+thirdparty/aclib/Makefile
 libhash/Makefile
 libvjmsg/Makefile
 libvevo/Makefile
diff --git a/veejay-current/veejay-server/libel/Makefile.am b/veejay-current/veejay-server/libel/Makefile.am
index fde0c5a4..5906afd4 100644
--- a/veejay-current/veejay-server/libel/Makefile.am
+++ b/veejay-current/veejay-server/libel/Makefile.am
@@ -2,19 +2,19 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES =	-I$(top_srcdir) \
-	 	-I$(includedir) \
-	 	-I$(top_srcdir)/vjmem \
-		-I$(top_srcdir)/vjmsg 
+AM_CPPFLAGS =	-I$(top_srcdir) \
+			 	-I$(includedir) \
+	 			-I$(top_srcdir)/vjmem \
+				-I$(top_srcdir)/vjmsg 
 
 
 if HAVE_MJPEGTOOLS
-INCLUDES +=
+AM_CPPFLAGS +=
 else
-INCLUDES += -I$(top_srcdir)/mjpegtools
+AM_CPPFLAGS += -I$(top_srcdir)/mjpegtools
 endif
 
-INCLUDES += $(FFMPEG_CFLAGS) $(PIXBUF_CFLAGS) $(LIBQUICKTIME_CFLAGS) $(MJPEGTOOLS_CFLAGS)
+AM_CPPFLAGS += $(FFMPEG_CFLAGS) $(PIXBUF_CFLAGS) $(LIBQUICKTIME_CFLAGS) $(MJPEGTOOLS_CFLAGS)
  
 VJEL_LIB_FILE = libel.la
 noinst_LTLIBRARIES = $(VJEL_LIB_FILE)
diff --git a/veejay-current/veejay-server/libhash/Makefile.am b/veejay-current/veejay-server/libhash/Makefile.am
index c03f9fd7..4bd462de 100644
--- a/veejay-current/veejay-server/libhash/Makefile.am
+++ b/veejay-current/veejay-server/libhash/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for veejay
 EXTRA_DIST= hash.h
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) 
 HASH_LIB_FILE = libhash.la
 noinst_LTLIBRARIES = $(HASH_LIB_FILE)
 libhash_la_SOURCES =	hash.c 
diff --git a/veejay-current/veejay-server/liblzo/Makefile.am b/veejay-current/veejay-server/liblzo/Makefile.am
index adb172a4..6ad9c33c 100644
--- a/veejay-current/veejay-server/liblzo/Makefile.am
+++ b/veejay-current/veejay-server/liblzo/Makefile.am
@@ -1,9 +1,9 @@
 # Makefile for veejay
 
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \
-		-I$(top_srcdir)/vjmsg
- 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \
+              -I$(top_srcdir)/vjmsg
+
 VJLZO_LIB_FILE = libvjlzo.la
 noinst_LTLIBRARIES = $(VJLZO_LIB_FILE)
 libvjlzo_la_SOURCES = minilzo.c lzo.c 
diff --git a/veejay-current/veejay-server/libplugger/Makefile.am b/veejay-current/veejay-server/libplugger/Makefile.am
index fe50950a..a0498b54 100644
--- a/veejay-current/veejay-server/libplugger/Makefile.am
+++ b/veejay-current/veejay-server/libplugger/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = 	-I$(top_srcdir)/libplugger -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvevo ${FFMPEG_CFLAGS} 
+AM_CPPFLAGS = -I$(top_srcdir)/libplugger -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvevo ${FFMPEG_CFLAGS} 
 
 
 LIBVJPLUG_LIB_FILE = libvjplug.la
diff --git a/veejay-current/veejay-server/libqrwrap/Makefile.am b/veejay-current/veejay-server/libqrwrap/Makefile.am
index 58056c03..c36c74af 100644
--- a/veejay-current/veejay-server/libqrwrap/Makefile.am
+++ b/veejay-current/veejay-server/libqrwrap/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for veejay
 EXTRA_DIST= qrwrapper.h
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) 
 QRWRAP_LIB_FILE = libqrwrap.la
 noinst_LTLIBRARIES = $(QRWRAP_LIB_FILE)
 libqrwrap_la_SOURCES = qrwrap.c 
diff --git a/veejay-current/veejay-server/libsample/Makefile.am b/veejay-current/veejay-server/libsample/Makefile.am
index 0666e131..490e8ef8 100644
--- a/veejay-current/veejay-server/libsample/Makefile.am
+++ b/veejay-current/veejay-server/libsample/Makefile.am
@@ -1,13 +1,13 @@
 # Makefile for veejay
 
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libhash 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libhash 
 if HAVE_MJPEGTOOLS
-INCLUDES +=
+AM_CPPFLAGS +=
 else
-INCLUDES += -I$(top_srcdir)/mjpegtools
+AM_CPPFLAGS += -I$(top_srcdir)/mjpegtools
 endif
 
-INCLUDES += $(FFMPEG_CFLAGS) $(XML2_CFLAGS) $(MJPEGTOOLS_CFLAGS)
+AM_CPPFLAGS += $(FFMPEG_CFLAGS) $(XML2_CFLAGS) $(MJPEGTOOLS_CFLAGS)
 
 SAMPLE_LIB_FILE = libsample.la
 noinst_LTLIBRARIES = $(SAMPLE_LIB_FILE)
diff --git a/veejay-current/veejay-server/libsamplerec/Makefile.am b/veejay-current/veejay-server/libsamplerec/Makefile.am
index e666a109..b89c1043 100644
--- a/veejay-current/veejay-server/libsamplerec/Makefile.am
+++ b/veejay-current/veejay-server/libsamplerec/Makefile.am
@@ -1,16 +1,16 @@
 # Makefile for veejay
 
-INCLUDES = 	-I$(top_srcdir) -I$(includedir)\
-		-I$(top_srcdir)/vjmem\
-		-I$(top_srcdir)/vjmsg \
-		-I$(top_srcdir)/libel 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir)\
+              -I$(top_srcdir)/vjmem\
+              -I$(top_srcdir)/vjmsg \
+              -I$(top_srcdir)/libel 
 if HAVE_MJPEGTOOLS
-INCLUDES +=
+AM_CPPFLAGS +=
 else
-INCLUDES += -I$(top_srcdir)/mjpegtools
+AM_CPPFLAGS += -I$(top_srcdir)/mjpegtools
 endif
 
-INCLUDES += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(MJPEGTOOLS_CFLAGS)
+AM_CPPFLAGS += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(MJPEGTOOLS_CFLAGS)
 
 SAMPLEREC_LIB_FILE = libsamplerec.la
 noinst_LTLIBRARIES = $(SAMPLEREC_LIB_FILE)
diff --git a/veejay-current/veejay-server/libstream/Makefile.am b/veejay-current/veejay-server/libstream/Makefile.am
index 094e9102..cb5eaf40 100644
--- a/veejay-current/veejay-server/libstream/Makefile.am
+++ b/veejay-current/veejay-server/libstream/Makefile.am
@@ -1,17 +1,17 @@
 # Makefile for veejay
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \
-		-I$(top_srcdir)/vjmsg \
-		-I$(top_srcdir)/libvjnet/ \
-		-I$(top_srcdir)/libhash 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \
+              -I$(top_srcdir)/vjmsg \
+              -I$(top_srcdir)/libvjnet/ \
+              -I$(top_srcdir)/libhash 
 
 if HAVE_MJPEGTOOLS
-INCLUDES +=
+AM_CPPFLAGS +=
 else
-INCLUDES += -I$(top_srcdir)/mjpegtools 
+AM_CPPFLAGS += -I$(top_srcdir)/mjpegtools 
 endif
 
-INCLUDES += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(PTHREAD_CFLAGS) $(MJPEGTOOLS_CFLAGS)
+AM_CPPFLAGS += $(XML2_CFLAGS) $(FFMPEG_CFLAGS) $(PTHREAD_CFLAGS) $(MJPEGTOOLS_CFLAGS)
 
 STREAM_LIB_FILE = libstream.la
 noinst_LTLIBRARIES = $(STREAM_LIB_FILE)
diff --git a/veejay-current/veejay-server/libsubsample/Makefile.am b/veejay-current/veejay-server/libsubsample/Makefile.am
index ddc8ee0f..861fc0d8 100644
--- a/veejay-current/veejay-server/libsubsample/Makefile.am
+++ b/veejay-current/veejay-server/libsubsample/Makefile.am
@@ -1,8 +1,7 @@
 # Makefile for veejay
-CFLAGS=
 AM_CFLAGS=$(SUBSAMPLE_CFLAGS)
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libyuv 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libyuv 
 SUBSAMPLE_LIB_FILE = libsubsample.la
 pkginclude_HEADERS=subsample.h
 EXTRA_DIST = subsample.h  
diff --git a/veejay-current/veejay-server/libvevo/Makefile.am b/veejay-current/veejay-server/libvevo/Makefile.am
index abf84aed..627d8a3c 100644
--- a/veejay-current/veejay-server/libvevo/Makefile.am
+++ b/veejay-current/veejay-server/libvevo/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = 	$(GLIB_CFLAGS) -I$(top_srcdir)/libvevo -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvjmem -I$(top_srcdir)/libvjmsg 
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/libvevo -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvjmem -I$(top_srcdir)/libvjmsg 
 
 VEVO_LIB_FILE = libvevo.la
 pkginclude_HEADERS = libvevo.h lowlevel.h pool.h vevo.h
diff --git a/veejay-current/veejay-server/libvje/Makefile.am b/veejay-current/veejay-server/libvje/Makefile.am
index b1f35103..bca97872 100644
--- a/veejay-current/veejay-server/libvje/Makefile.am
+++ b/veejay-current/veejay-server/libvje/Makefile.am
@@ -1,8 +1,7 @@
 # Makefile for veejay
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg $(FFMPEG_CFLAGS) $(GLIB_CFLAGS)   
-CFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg $(FFMPEG_CFLAGS) $(GLIB_CFLAGS)   
 AM_CFLAGS = $(OPTCFLAGS) $(FREEFRAME_CFLAGS)
 
 pkginclude_HEADERS=vje.h
diff --git a/veejay-current/veejay-server/libvjmem/Makefile.am b/veejay-current/veejay-server/libvjmem/Makefile.am
index 6cbc9d34..7120ca6a 100644
--- a/veejay-current/veejay-server/libvjmem/Makefile.am
+++ b/veejay-current/veejay-server/libvjmem/Makefile.am
@@ -1,9 +1,10 @@
 # Makefile for memory managment / platform specific optimizations
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) -I$(top_builddir)/libvjmsg
-CFLAGS = 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/thirdparty -I$(top_builddir)/libvjmsg
 AM_CFLAGS = $(OPTCFLAGS)
+
 VJMEM_LIB_FILE = libvjmem.la
 pkginclude_HEADERS = vjmem.h
+
 noinst_LTLIBRARIES = $(VJMEM_LIB_FILE)
 libvjmem_la_SOURCES =	memcpy.c vj-x86.c 
 
diff --git a/veejay-current/veejay-server/libvjmsg/Makefile.am b/veejay-current/veejay-server/libvjmsg/Makefile.am
index 62d247b6..6013cb66 100644
--- a/veejay-current/veejay-server/libvjmsg/Makefile.am
+++ b/veejay-current/veejay-server/libvjmsg/Makefile.am
@@ -1,14 +1,16 @@
 # Makefile for  logging/messages 
-INCLUDES = 	-I$(top_srcdir) -I$(includedir)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir)
 if !HAVE_MJPEGTOOLS
-INCLUDES += -I$(top_srcdir)/mjpegtools
+AM_CPPFLAGS += -I$(top_srcdir)/mjpegtools
 endif
-INCLUDES += $(MJPEGTOOLS_CFLAGS)
-INCLUDES += $(LIBUNWIND_CFLAGS)
- 
-AM_CLFAGS=$(OP_CFLAGS)
+AM_CPPFLAGS += $(MJPEGTOOLS_CFLAGS)
+AM_CPPFLAGS += $(LIBUNWIND_CFLAGS)
+
+AM_CFLAGS = $(OP_CFLAGS)
+
 VJMSG_LIB_FILE = libvjmsg.la
 noinst_LTLIBRARIES = $(VJMSG_LIB_FILE)
+
 pkginclude_HEADERS= vj-msg.h
 libvjmsg_la_SOURCES =	vj-common.c 
 
diff --git a/veejay-current/veejay-server/libvjnet/Makefile.am b/veejay-current/veejay-server/libvjnet/Makefile.am
index efdc59d2..e5f84517 100644
--- a/veejay-current/veejay-server/libvjnet/Makefile.am
+++ b/veejay-current/veejay-server/libvjnet/Makefile.am
@@ -1,9 +1,10 @@
-# Makefile for veejay
+# Makefile for libvjnet
 
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/libyuv -I$(top_srcdir)/liblzo -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/libyuv -I$(top_srcdir)/liblzo -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg 
+
 VJNET_LIB_FILE = libvjnet.la
-EXTRA_DIST= vj-client.h bswap.h cmd.h mcastreceiver.h mcastsender.h packet.h vj-server.h
-pkginclude_HEADERS=vj-client.h
+EXTRA_DIST = vj-client.h bswap.h cmd.h mcastreceiver.h mcastsender.h packet.h vj-server.h
+pkginclude_HEADERS = vj-client.h
 noinst_LTLIBRARIES = $(VJNET_LIB_FILE)
 libvjnet_la_SOURCES =	packet.c mcastsender.c mcastreceiver.c cmd.c vj-server.c vj-client.c
diff --git a/veejay-current/veejay-server/libyuv/Makefile.am b/veejay-current/veejay-server/libyuv/Makefile.am
index 2a8170e8..3d83d003 100644
--- a/veejay-current/veejay-server/libyuv/Makefile.am
+++ b/veejay-current/veejay-server/libyuv/Makefile.am
@@ -1,9 +1,10 @@
 # Makefile for veejay
 
 MAINTAINERCLEANFILES = Makefile.in
-CFLAGS =
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/aclib  -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libpostproc -I$(FFMPEG_CFLAGS) 
+
+AM_CPPFLAGS = 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/thirdparty  -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libpostproc -I$(FFMPEG_CFLAGS) 
 AM_CFLAGS = $(OPTCFLAGS)
+
 YUV_LIB_FILE = libyuv.la
 pkginclude_HEADERS=yuvconv.h
 EXTRA_DIST = mmx.h yuvconv.h mmx_macros.h 
diff --git a/veejay-current/veejay-server/livido-plugins/Makefile.am b/veejay-current/veejay-server/livido-plugins/Makefile.am
index 7ef409ec..73dd1596 100644
--- a/veejay-current/veejay-server/livido-plugins/Makefile.am
+++ b/veejay-current/veejay-server/livido-plugins/Makefile.am
@@ -8,9 +8,9 @@ lvd_colortone_la_SOURCES = lvd_colortone.c
 lvd_displaywall_la_SOURCES = lvd_displaywall.c
 lvd_stroboscope_la_SOURCES = lvd_stroboscope.c
 
-INCLUDES=$(FFMPEG_CFLAGS)
-AM_CFLAGS=-I@top_srcdir@/include 
-AM_LDFLAGS=-module -avoid-version -lm -export-dynamic
+AM_CPPFLAGS = $(FFMPEG_CFLAGS)
+AM_CFLAGS = -I@top_srcdir@/include 
+AM_LDFLAGS = -module -avoid-version -lm -export-dynamic
 AM_LIBTOOLFLAGS = --tag=disable-static
 
 lividoplugindir = @libdir@/livido-plugins
diff --git a/veejay-current/veejay-server/mjpegtools/Makefile.am b/veejay-current/veejay-server/mjpegtools/Makefile.am
index 184e8a50..fc23133c 100644
--- a/veejay-current/veejay-server/mjpegtools/Makefile.am
+++ b/veejay-current/veejay-server/mjpegtools/Makefile.am
@@ -1,7 +1,9 @@
 EXTRA_DIST= fastintfns.h mjpeg_logging.h mpegconsts.h videodev_mjpeg.h yuv4mpeg_intern.h format_codes.h \
 mjpeg_types.h mpegtimecode.h yuv4mpeg.h
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/mjpegtools  $(PTHREAD_CFLAGS)
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/mjpegtools  $(PTHREAD_CFLAGS)
+
 MJPEGUTILS_LIB_FILE = libmjpegutils.la
 noinst_LTLIBRARIES = $(MJPEGUTILS_LIB_FILE)
 DISTCLEANFILES =
diff --git a/veejay-current/veejay-server/thirdparty/Makefile.am b/veejay-current/veejay-server/thirdparty/Makefile.am
new file mode 100644
index 00000000..13eba57c
--- /dev/null
+++ b/veejay-current/veejay-server/thirdparty/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = aclib libOSC
diff --git a/veejay-current/veejay-server/aclib/Makefile.am b/veejay-current/veejay-server/thirdparty/aclib/Makefile.am
similarity index 93%
rename from veejay-current/veejay-server/aclib/Makefile.am
rename to veejay-current/veejay-server/thirdparty/aclib/Makefile.am
index d77b6e6b..a5230130 100644
--- a/veejay-current/veejay-server/aclib/Makefile.am
+++ b/veejay-current/veejay-server/thirdparty/aclib/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST= ac.h ac_internal.h imgconvert.h img_internal.h img_x86_common.h
 
 AM_CPPFLAGS = \
         $(PTHREAD_CFLAGS) \
-        -I$(top_srcdir)
+        -I$(top_srcdir)/thirdparty
 
 noinst_LTLIBRARIES = libac.la
 
diff --git a/veejay-current/veejay-server/aclib/ac.h b/veejay-current/veejay-server/thirdparty/aclib/ac.h
similarity index 100%
rename from veejay-current/veejay-server/aclib/ac.h
rename to veejay-current/veejay-server/thirdparty/aclib/ac.h
diff --git a/veejay-current/veejay-server/aclib/ac_internal.h b/veejay-current/veejay-server/thirdparty/aclib/ac_internal.h
similarity index 100%
rename from veejay-current/veejay-server/aclib/ac_internal.h
rename to veejay-current/veejay-server/thirdparty/aclib/ac_internal.h
diff --git a/veejay-current/veejay-server/aclib/accore.c b/veejay-current/veejay-server/thirdparty/aclib/accore.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/accore.c
rename to veejay-current/veejay-server/thirdparty/aclib/accore.c
diff --git a/veejay-current/veejay-server/aclib/average.c b/veejay-current/veejay-server/thirdparty/aclib/average.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/average.c
rename to veejay-current/veejay-server/thirdparty/aclib/average.c
diff --git a/veejay-current/veejay-server/aclib/img_internal.h b/veejay-current/veejay-server/thirdparty/aclib/img_internal.h
similarity index 100%
rename from veejay-current/veejay-server/aclib/img_internal.h
rename to veejay-current/veejay-server/thirdparty/aclib/img_internal.h
diff --git a/veejay-current/veejay-server/aclib/img_rgb_packed.c b/veejay-current/veejay-server/thirdparty/aclib/img_rgb_packed.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/img_rgb_packed.c
rename to veejay-current/veejay-server/thirdparty/aclib/img_rgb_packed.c
diff --git a/veejay-current/veejay-server/aclib/img_x86_common.h b/veejay-current/veejay-server/thirdparty/aclib/img_x86_common.h
similarity index 100%
rename from veejay-current/veejay-server/aclib/img_x86_common.h
rename to veejay-current/veejay-server/thirdparty/aclib/img_x86_common.h
diff --git a/veejay-current/veejay-server/aclib/img_yuv_mixed.c b/veejay-current/veejay-server/thirdparty/aclib/img_yuv_mixed.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/img_yuv_mixed.c
rename to veejay-current/veejay-server/thirdparty/aclib/img_yuv_mixed.c
diff --git a/veejay-current/veejay-server/aclib/img_yuv_packed.c b/veejay-current/veejay-server/thirdparty/aclib/img_yuv_packed.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/img_yuv_packed.c
rename to veejay-current/veejay-server/thirdparty/aclib/img_yuv_packed.c
diff --git a/veejay-current/veejay-server/aclib/img_yuv_planar.c b/veejay-current/veejay-server/thirdparty/aclib/img_yuv_planar.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/img_yuv_planar.c
rename to veejay-current/veejay-server/thirdparty/aclib/img_yuv_planar.c
diff --git a/veejay-current/veejay-server/aclib/img_yuv_rgb.c b/veejay-current/veejay-server/thirdparty/aclib/img_yuv_rgb.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/img_yuv_rgb.c
rename to veejay-current/veejay-server/thirdparty/aclib/img_yuv_rgb.c
diff --git a/veejay-current/veejay-server/aclib/imgconvert.c b/veejay-current/veejay-server/thirdparty/aclib/imgconvert.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/imgconvert.c
rename to veejay-current/veejay-server/thirdparty/aclib/imgconvert.c
diff --git a/veejay-current/veejay-server/aclib/imgconvert.h b/veejay-current/veejay-server/thirdparty/aclib/imgconvert.h
similarity index 100%
rename from veejay-current/veejay-server/aclib/imgconvert.h
rename to veejay-current/veejay-server/thirdparty/aclib/imgconvert.h
diff --git a/veejay-current/veejay-server/aclib/memcpy.c b/veejay-current/veejay-server/thirdparty/aclib/memcpy.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/memcpy.c
rename to veejay-current/veejay-server/thirdparty/aclib/memcpy.c
diff --git a/veejay-current/veejay-server/aclib/rescale.c b/veejay-current/veejay-server/thirdparty/aclib/rescale.c
similarity index 100%
rename from veejay-current/veejay-server/aclib/rescale.c
rename to veejay-current/veejay-server/thirdparty/aclib/rescale.c
diff --git a/veejay-current/veejay-server/aclib/rgb-yuv-conv.pl b/veejay-current/veejay-server/thirdparty/aclib/rgb-yuv-conv.pl
similarity index 100%
rename from veejay-current/veejay-server/aclib/rgb-yuv-conv.pl
rename to veejay-current/veejay-server/thirdparty/aclib/rgb-yuv-conv.pl
diff --git a/veejay-current/veejay-server/libOSC/AUTHORS b/veejay-current/veejay-server/thirdparty/libOSC/AUTHORS
similarity index 100%
rename from veejay-current/veejay-server/libOSC/AUTHORS
rename to veejay-current/veejay-server/thirdparty/libOSC/AUTHORS
diff --git a/veejay-current/veejay-server/libOSC/Makefile.am b/veejay-current/veejay-server/thirdparty/libOSC/Makefile.am
similarity index 91%
rename from veejay-current/veejay-server/libOSC/Makefile.am
rename to veejay-current/veejay-server/thirdparty/libOSC/Makefile.am
index c2b96863..8846c5d5 100644
--- a/veejay-current/veejay-server/libOSC/Makefile.am
+++ b/veejay-current/veejay-server/thirdparty/libOSC/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/libOSC -I$(includedir)
+AM_CPPFLAGS = -I$(includedir) -I$(top_srcdir)/thirdparty
+
 OSC_LIB_FILE = libOSC.la 
 noinst_LTLIBRARIES = $(OSC_LIB_FILE)
 libOSC_la_SOURCES = OSC-address-space.c \
diff --git a/veejay-current/veejay-server/libOSC/NEWS b/veejay-current/veejay-server/thirdparty/libOSC/NEWS
similarity index 100%
rename from veejay-current/veejay-server/libOSC/NEWS
rename to veejay-current/veejay-server/thirdparty/libOSC/NEWS
diff --git a/veejay-current/veejay-server/libOSC/NetworkReturnAddress.c b/veejay-current/veejay-server/thirdparty/libOSC/NetworkReturnAddress.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/NetworkReturnAddress.c
rename to veejay-current/veejay-server/thirdparty/libOSC/NetworkReturnAddress.c
diff --git a/veejay-current/veejay-server/libOSC/NetworkReturnAddress.h b/veejay-current/veejay-server/thirdparty/libOSC/NetworkReturnAddress.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/NetworkReturnAddress.h
rename to veejay-current/veejay-server/thirdparty/libOSC/NetworkReturnAddress.h
diff --git a/veejay-current/veejay-server/libOSC/NetworkUDP.h b/veejay-current/veejay-server/thirdparty/libOSC/NetworkUDP.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/NetworkUDP.h
rename to veejay-current/veejay-server/thirdparty/libOSC/NetworkUDP.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-address-space.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-address-space.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-address-space.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-address-space.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-address-space.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-address-space.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-address-space.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-address-space.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-callbacklist.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-callbacklist.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-callbacklist.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-callbacklist.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-callbacklist.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-callbacklist.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-callbacklist.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-callbacklist.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-common.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-common.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-common.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-common.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-common.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-common.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-common.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-common.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-dispatch.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-dispatch.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-dispatch.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-dispatch.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-drop.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-drop.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-drop.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-drop.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-drop.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-drop.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-drop.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-drop.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-internal-messages.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-internal-messages.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-internal-messages.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-internal-messages.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-pattern-match.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-pattern-match.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-pattern-match.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-pattern-match.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-pattern-match.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-pattern-match.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-pattern-match.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-pattern-match.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-priority-queue.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-priority-queue.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-priority-queue.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-priority-queue.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-priority-queue.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-priority-queue.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-priority-queue.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-priority-queue.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-receive.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-receive.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-receive.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-receive.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-receive.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-receive.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-receive.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-receive.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-string-help.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-string-help.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-string-help.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-string-help.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-string-help.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-string-help.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-string-help.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-string-help.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-struct.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-struct.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-struct.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-struct.h
diff --git a/veejay-current/veejay-server/libOSC/OSC-timetag.c b/veejay-current/veejay-server/thirdparty/libOSC/OSC-timetag.c
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-timetag.c
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-timetag.c
diff --git a/veejay-current/veejay-server/libOSC/OSC-timetag.h b/veejay-current/veejay-server/thirdparty/libOSC/OSC-timetag.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/OSC-timetag.h
rename to veejay-current/veejay-server/thirdparty/libOSC/OSC-timetag.h
diff --git a/veejay-current/veejay-server/libOSC/libosc.h b/veejay-current/veejay-server/thirdparty/libOSC/libosc.h
similarity index 100%
rename from veejay-current/veejay-server/libOSC/libosc.h
rename to veejay-current/veejay-server/thirdparty/libOSC/libosc.h
diff --git a/veejay-current/veejay-server/veejay/Makefile.am b/veejay-current/veejay-server/veejay/Makefile.am
index 3251381e..2048339d 100644
--- a/veejay-current/veejay-server/veejay/Makefile.am
+++ b/veejay-current/veejay-server/veejay/Makefile.am
@@ -1,16 +1,17 @@
 # Makefile for veejay
 
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = 	-I$(top_srcdir) -I$(includedir) \
-		-DG_LOG_DOMAIN=\"veejay\" -DVEEJAY_VERSION=\"$(VERSION)\" 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) \
+              -DG_LOG_DOMAIN=\"veejay\" -DVEEJAY_VERSION=\"$(VERSION)\" 
 
 if HAVE_MJPEGTOOLS
-INCLUDES +=
+AM_CPPFLAGS +=
 else
-INCLUDES += -I$(top_srcdir)/mjpegtools 
+AM_CPPFLAGS += -I$(top_srcdir)/mjpegtools 
 endif
 
-INCLUDES += -I /usr/X11R6/include -I$(top_srcdir)/libOSC \
+AM_CPPFLAGS += -I /usr/X11R6/include \
+		-I$(top_srcdir)/thirdparty \
 		-I$(top_srcdir)/libhash \
 		-I$(top_srcdir)/libvje \
 		-I$(top_srcdir)/libplugger \
@@ -45,7 +46,7 @@ libveejay_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 		       -release $(LT_RELEASE) -no-undefined -export-dynamic $(DEBUGLIBS)
 
 
-libveejay_la_LIBADD = 	-L$(top_builddir)/libOSC  -lOSC \
+libveejay_la_LIBADD = \
 			-L$(top_builddir)/libhash  -lhash \
 			-L$(top_builddir)/liblzo  -lvjlzo \
 			-L$(top_builddir)/bio2jack -lbio2jack4vj \
@@ -57,12 +58,13 @@ libveejay_la_LIBADD = 	-L$(top_builddir)/libOSC  -lOSC \
 			-L$(top_builddir)/libvjnet -lvjnet \
 			-L$(top_builddir)/libel -lel \
 			-L$(top_builddir)/libstream -lstream \
-			-L$(top_builddir)/aclib -lac \
 			-L$(top_builddir)/libsubsample -lsubsample \
 			-L$(top_builddir)/libyuv -lyuv \
 			-L$(top_builddir)/libsamplerec -lsamplerec \
 			-L$(top_builddir)/libqrwrap -lqrwrap \
-			-L$(top_builddir)/libvevo -lvevo 
+			-L$(top_builddir)/libvevo -lvevo \
+			-L$(top_builddir)/thirdparty/libOSC  -lOSC \
+			-L$(top_builddir)/thirdparty/aclib -lac
 
 if !HAVE_MJPEGTOOLS
 libveejay_la_LIBADD+=-L$(top_builddir)/mjpegtools -lmjpegutils