From c31415f4b64682aa244b61be6811b13c912e83aa Mon Sep 17 00:00:00 2001
From: Chris Moeller <kode54@gmail.com>
Date: Mon, 30 Sep 2013 12:43:21 -0700
Subject: [PATCH] Fix new WavPack inclusion in OS X project

---
 Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj | 4 ++--
 Plugins/WavPack/WavPackDecoder.h                     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj b/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj
index f0a1a21a7..261c82c45 100644
--- a/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj
+++ b/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		83DD1DD017FA038A00249519 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83DD1DCD17FA038A00249519 /* utils.h */; };
+		83DD1DD017FA038A00249519 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83DD1DCD17FA038A00249519 /* utils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		83DD1DD117FA038A00249519 /* wavpack_local.h in Headers */ = {isa = PBXBuildFile; fileRef = 83DD1DCE17FA038A00249519 /* wavpack_local.h */; };
 		83DD1DD217FA038A00249519 /* wavpack_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 83DD1DCF17FA038A00249519 /* wavpack_version.h */; };
 		83DD1DD417FA03F900249519 /* tags.c in Sources */ = {isa = PBXBuildFile; fileRef = 83DD1DD317FA03F900249519 /* tags.c */; };
@@ -169,8 +169,8 @@
 				8E7574B309F31BB90080F1EE /* md5.h in Headers */,
 				83DD1DD117FA038A00249519 /* wavpack_local.h in Headers */,
 				8E7574B409F31BB90080F1EE /* unpack3.h in Headers */,
-				83DD1DD217FA038A00249519 /* wavpack_version.h in Headers */,
 				83DD1DD017FA038A00249519 /* utils.h in Headers */,
+				83DD1DD217FA038A00249519 /* wavpack_version.h in Headers */,
 				8E7574B509F31BB90080F1EE /* wavpack.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Plugins/WavPack/WavPackDecoder.h b/Plugins/WavPack/WavPackDecoder.h
index a7abe4498..331e3a507 100644
--- a/Plugins/WavPack/WavPackDecoder.h
+++ b/Plugins/WavPack/WavPackDecoder.h
@@ -9,7 +9,9 @@
 #import <Cocoa/Cocoa.h>
 #import "Plugin.h"
 
-#import "WavPack/wputils.h"
+#define ChunkHeader WavPackChunkHeader
+
+#import <WavPack/wavpack.h>
 
 @interface WavPackDecoder : NSObject <CogDecoder>
 {