diff --git a/Jamfile b/Jamfile
index 410b9e6..8e85a9e 100644
--- a/Jamfile
+++ b/Jamfile
@@ -8,26 +8,15 @@ SubDir TOP ;
 
 # libhb + contrib libraries
 HANDBRAKE_LIBS = libhb.a
-          contrib/lib/liba52.a        contrib/lib/libavformat.a
-          contrib/lib/libavcodec.a    contrib/lib/libavutil.a
-          contrib/lib/libdca.a        contrib/lib/libdvdread.a
-          contrib/lib/libmp4v2.a      contrib/lib/libfaac.a
-          contrib/lib/libmp3lame.a    contrib/lib/libmpeg2.a
-          contrib/lib/libvorbis.a     contrib/lib/libvorbisenc.a
-          contrib/lib/libogg.a        contrib/lib/libsamplerate.a
-          contrib/lib/libx264.a       contrib/lib/libxvidcore.a
-          contrib/lib/libmkv.a        contrib/lib/libswscale.a ;
+          contrib/lib/liba52.a        contrib/lib/libdca.a
+          contrib/lib/libmp4v2.a      contrib/lib/libmpeg2.a
+          contrib/lib/libx264.a       contrib/lib/libmkv.a ;
 
 if $(OS) = UNKNOWN
 {
     OS = CYGWIN ;
 }
 
-if $(OS) != CYGWIN
-{
-    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
-}
-
 # Interfaces
 CLI_BIN = HandBrakeCLI ;
 CLI_SRC = test/test.c 
diff --git a/configure b/configure
index ae0d0ba..ae941ff 100755
--- a/configure
+++ b/configure
@@ -4,7 +4,7 @@ CC="gcc"
 CXX="g++"
 CCFLAGS="$CCFLAGS -Wall -g"
 OPTIM="$OPTIM -O3 -funroll-loops"
-LINKLIBS="-lz"
+LINKLIBS="-lz -lavcodec -lavformat -lavutil -ldvdcss -ldvdread -lfaac -lmp3lame -logg -lsamplerate -lxvidcore -lswscale -lvorbis -lvorbisenc"
 
 # System-specific flags
 SYSTEM=`uname -s`
diff --git a/libhb/deblock.c b/libhb/deblock.c
index 2d8b166..8f63fdc 100644
--- a/libhb/deblock.c
+++ b/libhb/deblock.c
@@ -17,7 +17,7 @@
 */
 
 #include "hb.h"
-#include "ffmpeg/avcodec.h"
+#include <ffmpeg/avcodec.h>
 #include "mpeg2dec/mpeg2.h"
 
 #define PP7_QP_DEFAULT    0
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index 4301f43..e990bfd 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -6,7 +6,7 @@
 
 #include "hb.h"
 
-#include "ffmpeg/avcodec.h"
+#include <ffmpeg/avcodec.h>
 
 int  decavcodecInit( hb_work_object_t *, hb_job_t * );
 int  decavcodecWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c
index 2d35ecf..48efd0c 100644
--- a/libhb/deinterlace.c
+++ b/libhb/deinterlace.c
@@ -17,7 +17,7 @@
 */
 
 #include "hb.h"
-#include "ffmpeg/avcodec.h"
+#include <ffmpeg/avcodec.h>
 #include "mpeg2dec/mpeg2.h"
 
 #define SUPPRESS_AV_LOG
@@ -551,9 +551,9 @@ int hb_deinterlace_work( hb_buffer_t * buf_in,
         yadif_store_ref( (const uint8_t**)pv->pic_in.data, pv );
         
         hb_buffer_copy_settings( pv->buf_settings, buf_in );
-
-        /* don't let 'work_loop' send a chapter mark upstream */
-        buf_in->new_chap  = 0;
+
+        /* don't let 'work_loop' send a chapter mark upstream */
+        buf_in->new_chap  = 0;
 
         pv->yadif_ready = 1;
         
@@ -591,9 +591,9 @@ int hb_deinterlace_work( hb_buffer_t * buf_in,
     
     /* Replace buffered settings with input buffer settings */
     hb_buffer_copy_settings( pv->buf_settings, buf_in );    
-
-    /* don't let 'work_loop' send a chapter mark upstream */
-    buf_in->new_chap  = 0;
+
+    /* don't let 'work_loop' send a chapter mark upstream */
+    buf_in->new_chap  = 0;
 
     return FILTER_OK;
 }
diff --git a/libhb/denoise.c b/libhb/denoise.c
index 70902a6..ac3bdfd 100644
--- a/libhb/denoise.c
+++ b/libhb/denoise.c
@@ -17,7 +17,7 @@
 */
 
 #include "hb.h"
-#include "ffmpeg/avcodec.h"
+#include <ffmpeg/avcodec.h>
 #include "mpeg2dec/mpeg2.h"
 
 #define HQDN3D_SPATIAL_LUMA_DEFAULT    4.0f
diff --git a/libhb/detelecine.c b/libhb/detelecine.c
index 93b153c..e11ae70 100644
--- a/libhb/detelecine.c
+++ b/libhb/detelecine.c
@@ -1,5 +1,5 @@
 #include "hb.h"
-#include "ffmpeg/avcodec.h"
+#include <ffmpeg/avcodec.h>
 #include "mpeg2dec/mpeg2.h"
 
 /*
diff --git a/libhb/dvd.c b/libhb/dvd.c
index 234e55b..439e2dc 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -7,8 +7,8 @@
 #include "hb.h"
 #include "lang.h"
 
-#include "dvdread/ifo_read.h"
-#include "dvdread/nav_read.h"
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
 
 struct hb_dvd_s
 {
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index 85aa608..c10a4a2 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -6,7 +6,7 @@
 
 #include "hb.h"
 
-#include "ffmpeg/avcodec.h"
+#include <ffmpeg/avcodec.h>
 
 struct hb_work_private_s
 {
diff --git a/libhb/encfaac.c b/libhb/encfaac.c
index 2ba9ad4..1f91d95 100644
--- a/libhb/encfaac.c
+++ b/libhb/encfaac.c
@@ -6,7 +6,7 @@
 
 #include "hb.h"
 
-#include "faac.h"
+#include <faac.h>
 
 struct hb_work_private_s
 {
diff --git a/libhb/enclame.c b/libhb/enclame.c
index 4913651..4764fa4 100644
--- a/libhb/enclame.c
+++ b/libhb/enclame.c
@@ -6,7 +6,7 @@
 
 #include "hb.h"
 
-#include "lame/lame.h"
+#include <lame/lame.h>
 
 int  enclameInit( hb_work_object_t *, hb_job_t * );
 int  enclameWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c
index a90b285..23b9a27 100644
--- a/libhb/encvorbis.c
+++ b/libhb/encvorbis.c
@@ -6,7 +6,7 @@
 
 #include "hb.h"
 
-#include "vorbis/vorbisenc.h"
+#include <vorbis/vorbisenc.h>
 
 #define OGGVORBIS_FRAME_SIZE 1024
 
diff --git a/libhb/encxvid.c b/libhb/encxvid.c
index 7bdee7b..9c0c01f 100644
--- a/libhb/encxvid.c
+++ b/libhb/encxvid.c
@@ -6,7 +6,7 @@
 
 #include "hb.h"
 
-#include "xvid.h"
+#include <xvid.h>
 
 int  encxvidInit( hb_work_object_t *, hb_job_t * );
 int  encxvidWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
diff --git a/libhb/hb.c b/libhb/hb.c
index a53bd1f..c4dadab 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -1,7 +1,7 @@
 #include "hb.h"
 
-#include "ffmpeg/avcodec.h"
-#include "ffmpeg/swscale.h"
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/swscale.h>
 
 struct hb_handle_s
 {
diff --git a/libhb/render.c b/libhb/render.c
index edbd18a..e2baaef 100644
--- a/libhb/render.c
+++ b/libhb/render.c
@@ -6,8 +6,8 @@
 
 #include "hb.h"
 
-#include "ffmpeg/avcodec.h"
-#include "ffmpeg/swscale.h"
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/swscale.h>
 
 struct hb_work_private_s
 {
diff --git a/libhb/sync.c b/libhb/sync.c
index 9c66245..f0cc565 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -6,8 +6,8 @@
 
 #include "hb.h"
 
-#include "samplerate.h"
-#include "ffmpeg/avcodec.h"
+#include <samplerate.h>
+#include <ffmpeg/avcodec.h>
 
 #ifdef INT64_MIN
 #undef INT64_MIN /* Because it isn't defined correctly in Zeta */