--- core/Jamfile.orig	Sun May  7 11:49:29 2006
+++ core/Jamfile	Sun May  7 11:54:18 2006
@@ -18,22 +18,19 @@
 ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W ;
 
 # Needed includes
-ObjectHdrs Ac3Dec.c    : $(TOP)/contrib/liba52 ;
-ObjectHdrs FfmpegEnc.c
+ObjectHdrs Ac3Dec.c
+           FfmpegEnc.c
            HandBrake.c
            MpgaDec.c
-           Scale.c     : $(TOP)/contrib/libavcodec ;
-ObjectHdrs DVDRead.c
-           Scan.c      : $(TOP)/contrib/libdvdread ;
-ObjectHdrs FaacEnc.c   : $(TOP)/contrib/libfaac ;
-ObjectHdrs Mp3Enc.c    : $(TOP)/contrib/libmp3lame ;
-ObjectHdrs Mp4Mux.c    : $(TOP)/contrib/libmp4v2 ;
-ObjectHdrs Mpeg2Dec.c
-           Scan.c      : $(TOP)/contrib/libmpeg2 ;
-ObjectHdrs Resample.c  : $(TOP)/contrib/libsamplerate ;
-ObjectHdrs OgmMux.c
-           VorbisEnc.c : $(TOP)/contrib/libogg ;
-ObjectHdrs VorbisEnc.c : $(TOP)/contrib/libvorbis ;
+           Scale.c
+           DVDRead.c
+           Scan.c
+           FaacEnc.c
+           Mp3Enc.c
+           Mp4Mux.c
+           Mpeg2Dec.c
+           Resample.c
+           OgmMux.c
+           VorbisEnc.c
+           XvidEnc.c   : %%PREFIX%%/include ;
 ObjectHdrs X264Enc.c   : $(TOP)/contrib/libx264 ;
-ObjectHdrs XvidEnc.c   : $(TOP)/contrib/libxvidcore ;
-
