Index: libhb/Jamfile
===================================================================
--- libhb/Jamfile	(revision 1835)
+++ libhb/Jamfile	(working copy)
@@ -7,7 +7,7 @@
 SubDir TOP libhb : hbversion.h ;
 
 LIBHB_SRC =
-ipodutil.cpp common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c
+common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c
 demuxmpeg.c fifo.c render.c reader.c muxcommon.c muxmp4.c sync.c stream.c
 decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c decavcodec.c encxvid.c
 muxavi.c enclame.c muxogm.c encvorbis.c dvd.c muxmkv.c deblock.c deinterlace.c 
Index: libhb/ipodutil.cpp
===================================================================
--- libhb/ipodutil.cpp	(revision 1835)
+++ libhb/ipodutil.cpp	(working copy)
@@ -6,6 +6,7 @@
  * a proper return value is given.
  */
 
+#if 0
 #include "mp4common.h"
 
 static u_int8_t ipod_magic[] = {
@@ -32,3 +33,4 @@
  avc1->AddChildAtom(new IPodUUIDAtom());
 }
 
+#endif
Index: libhb/muxmp4.c
===================================================================
--- libhb/muxmp4.c	(revision 1835)
+++ libhb/muxmp4.c	(working copy)
@@ -9,8 +9,6 @@
 
 #include "hb.h"
 
-void AddIPodUUID(MP4FileHandle, MP4TrackId);
-
 struct hb_mux_object_s
 {
     HB_MUX_COMMON;
@@ -218,7 +216,7 @@
 		if( job->h264_level == 30 || job->ipod_atom)
 		{
 			hb_deep_log( 2, "muxmp4: adding iPod atom");
-			AddIPodUUID(m->file, mux_data->track);
+			MP4AddIPodUUID(m->file, mux_data->track);
 		}
 
         m->init_delay = job->config.h264.init_delay;
Index: libhb/Makefile
===================================================================
--- libhb/Makefile	(revision 1835)
+++ libhb/Makefile	(working copy)
@@ -25,7 +25,7 @@
 	   update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \
 	   muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \
 	   decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \
-	   dvd.c  ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c decomb.c lang.c
+	   dvd.c deblock.c deinterlace.c denoise.c detelecine.c decomb.c lang.c
 OTMP = $(SRCS:%.c=%.o) 
 OBJS = $(OTMP:%.cpp=%.o)