Merge branch 'adobe-sdk' into cs6-integration

This bring the CS6 version of the SDK to Exempi Adapt the build system. GIF support is currently disabled. Conflicts: XMPCore/source/XMPCore_Impl.hpp XMPFiles/source/FileHandlers/AVCHD_Handler.cpp XMPFiles/source/FileHandlers/MPEG4_Handler.cpp XMPFiles/source/FileHandlers/P2_Handler.cpp XMPFiles/source/FileHandlers/PSD_Handler.hpp XMPFiles/source/FileHandlers/PostScript_Handler.cpp XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp XMPFiles/source/FileHandlers/UCF_Handler.hpp XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp XMPFiles/source/FileHandlers/XDCAM_Handler.cpp XMPFiles/source/FormatSupport/PSIR_Support.hpp XMPFiles/source/XMPFiles.hpp XMPFiles/source/XMPFiles_Impl.cpp XMPFiles/source/XMPFiles_Impl.hpp samples/source/common/DumpFile.cpp samples/source/common/LargeFileAccess.cpp samples/source/common/LargeFileAccess.hpp samples/source/common/Log.cpp source/XMPFiles/FormatSupport/ID3_Support.hpp source/XMPFiles/XMPFiles.cpp source/XMP_LibUtils.cpp
author: Hubert Figuière <hub@figuiere.net> 2013-05-14 18:54:10 -0400
committer: Hubert Figuière <hub@figuiere.net> 2013-05-14 20:25:20 -0400
commit: f27e317d9f722d74895ad8ba0da1b3d3d81b0f76 (patch)
tree: e9ee3d18d09c9a1c2a3a90b84e53accb1a4ad793 /build
parent: 82aa3670838622e6ee645ebecfe2abd93ec56836 (diff)
parent: 81a4c6bcb1879cb321246590faca595e9746f8e5 (diff)
31 files changed, 2192 insertions, 1302 deletions
diff --git a/build/gcc/XMPCore-acc.exp b/build/gcc/XMPCore-acc.exp
new file mode 100644
index 0000000..e18566f
--- /dev/null
+++ b/build/gcc/XMPCore-acc.exp
@@ -0,0 +1,98 @@
++e WXMPMeta_GetVersionInfo_1
++e WXMPMeta_Initialize_1
++e WXMPMeta_Terminate_1
+
++e WXMPMeta_CTor_1
++e WXMPMeta_IncrementRefCount_1
++e WXMPMeta_DecrementRefCount_1
+
++e WXMPMeta_GetGlobalOptions_1
++e WXMPMeta_SetGlobalOptions_1
++e WXMPMeta_DumpNamespaces_1
++e WXMPMeta_RegisterNamespace_1
++e WXMPMeta_GetNamespacePrefix_1
++e WXMPMeta_GetNamespaceURI_1
++e WXMPMeta_DeleteNamespace_1
+
++e WXMPMeta_GetProperty_1
++e WXMPMeta_GetArrayItem_1
++e WXMPMeta_GetStructField_1
++e WXMPMeta_GetQualifier_1
++e WXMPMeta_SetProperty_1
++e WXMPMeta_SetArrayItem_1
++e WXMPMeta_AppendArrayItem_1
++e WXMPMeta_SetStructField_1
++e WXMPMeta_SetQualifier_1
++e WXMPMeta_DeleteProperty_1
++e WXMPMeta_DeleteArrayItem_1
++e WXMPMeta_DeleteStructField_1
++e WXMPMeta_DeleteQualifier_1
++e WXMPMeta_DoesPropertyExist_1
++e WXMPMeta_DoesArrayItemExist_1
++e WXMPMeta_DoesStructFieldExist_1
++e WXMPMeta_DoesQualifierExist_1
++e WXMPMeta_GetLocalizedText_1
++e WXMPMeta_SetLocalizedText_1
++e WXMPMeta_DeleteLocalizedText_1
++e WXMPMeta_GetProperty_Bool_1
++e WXMPMeta_GetProperty_Int_1
++e WXMPMeta_GetProperty_Int64_1
++e WXMPMeta_GetProperty_Float_1
++e WXMPMeta_GetProperty_Date_1
++e WXMPMeta_SetProperty_Bool_1
++e WXMPMeta_SetProperty_Int_1
++e WXMPMeta_SetProperty_Int64_1
++e WXMPMeta_SetProperty_Float_1
++e WXMPMeta_SetProperty_Date_1
++e WXMPMeta_GetObjectName_1
++e WXMPMeta_SetObjectName_1
++e WXMPMeta_GetObjectOptions_1
++e WXMPMeta_SetObjectOptions_1
++e WXMPMeta_Sort_1
++e WXMPMeta_Erase_1
++e WXMPMeta_Clone_1
++e WXMPMeta_CountArrayItems_1
++e WXMPMeta_DumpObject_1
++e WXMPMeta_ParseFromBuffer_1
++e WXMPMeta_SerializeToBuffer_1
+
++e WXMPIterator_PropCTor_1
++e WXMPIterator_TableCTor_1
++e WXMPIterator_IncrementRefCount_1
++e WXMPIterator_DecrementRefCount_1
++e WXMPIterator_Next_1
++e WXMPIterator_Skip_1
+
++e WXMPUtils_ComposeArrayItemPath_1
++e WXMPUtils_ComposeStructFieldPath_1
++e WXMPUtils_ComposeQualifierPath_1
++e WXMPUtils_ComposeLangSelector_1
++e WXMPUtils_ComposeFieldSelector_1
++e WXMPUtils_ConvertFromBool_1
++e WXMPUtils_ConvertFromInt_1
++e WXMPUtils_ConvertFromInt64_1
++e WXMPUtils_ConvertFromFloat_1
++e WXMPUtils_ConvertFromDate_1
++e WXMPUtils_ConvertToBool_1
++e WXMPUtils_ConvertToInt_1
++e WXMPUtils_ConvertToInt64_1
++e WXMPUtils_ConvertToFloat_1
++e WXMPUtils_ConvertToDate_1
++e WXMPUtils_CurrentDateTime_1
++e WXMPUtils_SetTimeZone_1
++e WXMPUtils_ConvertToUTCTime_1
++e WXMPUtils_ConvertToLocalTime_1
++e WXMPUtils_CompareDateTime_1
++e WXMPUtils_EncodeToBase64_1
++e WXMPUtils_DecodeFromBase64_1
++e WXMPUtils_PackageForJPEG_1
++e WXMPUtils_MergeFromJPEG_1
+
++e WXMPUtils_CatenateArrayItems_1
++e WXMPUtils_SeparateArrayItems_1
++e WXMPUtils_ApplyTemplate_1
++e WXMPUtils_RemoveProperties_1
++e WXMPUtils_DuplicateSubtree_1
+
++e XMP_NewExpatAdapter
++e XMP_GetAssertNotify
diff --git a/build/gcc/XMPCore-vacpp.exp b/build/gcc/XMPCore-vacpp.exp
new file mode 100644
index 0000000..2722002
--- /dev/null
+++ b/build/gcc/XMPCore-vacpp.exp
@@ -0,0 +1,98 @@
+WXMPMeta_GetVersionInfo_1
+WXMPMeta_Initialize_1
+WXMPMeta_Terminate_1
+
+WXMPMeta_CTor_1
+WXMPMeta_IncrementRefCount_1
+WXMPMeta_DecrementRefCount_1
+
+WXMPMeta_GetGlobalOptions_1
+WXMPMeta_SetGlobalOptions_1
+WXMPMeta_DumpNamespaces_1
+WXMPMeta_RegisterNamespace_1
+WXMPMeta_GetNamespacePrefix_1
+WXMPMeta_GetNamespaceURI_1
+WXMPMeta_DeleteNamespace_1
+
+WXMPMeta_GetProperty_1
+WXMPMeta_GetArrayItem_1
+WXMPMeta_GetStructField_1
+WXMPMeta_GetQualifier_1
+WXMPMeta_SetProperty_1
+WXMPMeta_SetArrayItem_1
+WXMPMeta_AppendArrayItem_1
+WXMPMeta_SetStructField_1
+WXMPMeta_SetQualifier_1
+WXMPMeta_DeleteProperty_1
+WXMPMeta_DeleteArrayItem_1
+WXMPMeta_DeleteStructField_1
+WXMPMeta_DeleteQualifier_1
+WXMPMeta_DoesPropertyExist_1
+WXMPMeta_DoesArrayItemExist_1
+WXMPMeta_DoesStructFieldExist_1
+WXMPMeta_DoesQualifierExist_1
+WXMPMeta_GetLocalizedText_1
+WXMPMeta_SetLocalizedText_1
+WXMPMeta_DeleteLocalizedText_1
+WXMPMeta_GetProperty_Bool_1
+WXMPMeta_GetProperty_Int_1
+WXMPMeta_GetProperty_Int64_1
+WXMPMeta_GetProperty_Float_1
+WXMPMeta_GetProperty_Date_1
+WXMPMeta_SetProperty_Bool_1
+WXMPMeta_SetProperty_Int_1
+WXMPMeta_SetProperty_Int64_1
+WXMPMeta_SetProperty_Float_1
+WXMPMeta_SetProperty_Date_1
+WXMPMeta_GetObjectName_1
+WXMPMeta_SetObjectName_1
+WXMPMeta_GetObjectOptions_1
+WXMPMeta_SetObjectOptions_1
+WXMPMeta_Sort_1
+WXMPMeta_Erase_1
+WXMPMeta_Clone_1
+WXMPMeta_CountArrayItems_1
+WXMPMeta_DumpObject_1
+WXMPMeta_ParseFromBuffer_1
+WXMPMeta_SerializeToBuffer_1
+
+WXMPIterator_PropCTor_1
+WXMPIterator_TableCTor_1
+WXMPIterator_IncrementRefCount_1
+WXMPIterator_DecrementRefCount_1
+WXMPIterator_Next_1
+WXMPIterator_Skip_1
+
+WXMPUtils_ComposeArrayItemPath_1
+WXMPUtils_ComposeStructFieldPath_1
+WXMPUtils_ComposeQualifierPath_1
+WXMPUtils_ComposeLangSelector_1
+WXMPUtils_ComposeFieldSelector_1
+WXMPUtils_ConvertFromBool_1
+WXMPUtils_ConvertFromInt_1
+WXMPUtils_ConvertFromInt64_1
+WXMPUtils_ConvertFromFloat_1
+WXMPUtils_ConvertFromDate_1
+WXMPUtils_ConvertToBool_1
+WXMPUtils_ConvertToInt_1
+WXMPUtils_ConvertToInt64_1
+WXMPUtils_ConvertToFloat_1
+WXMPUtils_ConvertToDate_1
+WXMPUtils_CurrentDateTime_1
+WXMPUtils_SetTimeZone_1
+WXMPUtils_ConvertToUTCTime_1
+WXMPUtils_ConvertToLocalTime_1
+WXMPUtils_CompareDateTime_1
+WXMPUtils_EncodeToBase64_1
+WXMPUtils_DecodeFromBase64_1
+WXMPUtils_PackageForJPEG_1
+WXMPUtils_MergeFromJPEG_1
+
+WXMPUtils_CatenateArrayItems_1
+WXMPUtils_SeparateArrayItems_1
+WXMPUtils_ApplyTemplate_1
+WXMPUtils_RemoveProperties_1
+WXMPUtils_DuplicateSubtree_1
+
+XMP_NewExpatAdapter
+XMP_GetAssertNotify
diff --git a/build/gcc/XMPCore.exp b/build/gcc/XMPCore.exp
new file mode 100644
index 0000000..901f3de
--- /dev/null
+++ b/build/gcc/XMPCore.exp
@@ -0,0 +1,107 @@
+VERSION {
+global:
+
+	WXMPMeta_GetVersionInfo_1;
+	WXMPMeta_Initialize_1;
+	WXMPMeta_Terminate_1;
+
+	WXMPMeta_CTor_1;
+	WXMPMeta_IncrementRefCount_1;
+	WXMPMeta_DecrementRefCount_1;
+
+	WXMPMeta_GetGlobalOptions_1;
+	WXMPMeta_SetGlobalOptions_1;
+	WXMPMeta_DumpNamespaces_1;
+	WXMPMeta_RegisterNamespace_1;
+	WXMPMeta_GetNamespacePrefix_1;
+	WXMPMeta_GetNamespaceURI_1;
+	WXMPMeta_DeleteNamespace_1;
+
+	WXMPMeta_GetProperty_1;
+	WXMPMeta_GetArrayItem_1;
+	WXMPMeta_GetStructField_1;
+	WXMPMeta_GetQualifier_1;
+	WXMPMeta_SetProperty_1;
+	WXMPMeta_SetArrayItem_1;
+	WXMPMeta_AppendArrayItem_1;
+	WXMPMeta_SetStructField_1;
+	WXMPMeta_SetQualifier_1;
+	WXMPMeta_DeleteProperty_1;
+	WXMPMeta_DeleteArrayItem_1;
+	WXMPMeta_DeleteStructField_1;
+	WXMPMeta_DeleteQualifier_1;
+	WXMPMeta_DoesPropertyExist_1;
+	WXMPMeta_DoesArrayItemExist_1;
+	WXMPMeta_DoesStructFieldExist_1;
+	WXMPMeta_DoesQualifierExist_1;
+	WXMPMeta_GetLocalizedText_1;
+	WXMPMeta_SetLocalizedText_1;
+	WXMPMeta_DeleteLocalizedText_1;
+	WXMPMeta_GetProperty_Bool_1;
+	WXMPMeta_GetProperty_Int_1;
+	WXMPMeta_GetProperty_Int64_1;
+	WXMPMeta_GetProperty_Float_1;
+	WXMPMeta_GetProperty_Date_1;
+	WXMPMeta_SetProperty_Bool_1;
+	WXMPMeta_SetProperty_Int_1;
+	WXMPMeta_SetProperty_Int64_1;
+	WXMPMeta_SetProperty_Float_1;
+	WXMPMeta_SetProperty_Date_1;
+	WXMPMeta_GetObjectName_1;
+	WXMPMeta_SetObjectName_1;
+	WXMPMeta_GetObjectOptions_1;
+	WXMPMeta_SetObjectOptions_1;
+	WXMPMeta_Clone_1;
+	WXMPMeta_Sort_1;
+	WXMPMeta_Erase_1;
+	WXMPMeta_CountArrayItems_1;
+	WXMPMeta_DumpObject_1;
+	WXMPMeta_ParseFromBuffer_1;
+	WXMPMeta_SerializeToBuffer_1;
+
+	WXMPIterator_PropCTor_1;
+	WXMPIterator_TableCTor_1;
+	WXMPIterator_IncrementRefCount_1;
+	WXMPIterator_DecrementRefCount_1;
+	WXMPIterator_Next_1;
+	WXMPIterator_Skip_1;
+
+	WXMPUtils_ComposeArrayItemPath_1;
+	WXMPUtils_ComposeStructFieldPath_1;
+	WXMPUtils_ComposeQualifierPath_1;
+	WXMPUtils_ComposeLangSelector_1;
+	WXMPUtils_ComposeFieldSelector_1;
+	WXMPUtils_ConvertFromBool_1;
+	WXMPUtils_ConvertFromInt_1;
+	WXMPUtils_ConvertFromInt64_1;
+	WXMPUtils_ConvertFromFloat_1;
+	WXMPUtils_ConvertFromDate_1;
+	WXMPUtils_ConvertToBool_1;
+	WXMPUtils_ConvertToInt_1;
+	WXMPUtils_ConvertToInt64_1;
+	WXMPUtils_ConvertToFloat_1;
+	WXMPUtils_ConvertToDate_1;
+	WXMPUtils_CurrentDateTime_1;
+	WXMPUtils_SetTimeZone_1;
+	WXMPUtils_ConvertToUTCTime_1;
+	WXMPUtils_ConvertToLocalTime_1;
+	WXMPUtils_CompareDateTime_1;
+	WXMPUtils_EncodeToBase64_1;
+	WXMPUtils_DecodeFromBase64_1;
+	WXMPUtils_PackageForJPEG_1;
+	WXMPUtils_MergeFromJPEG_1;
+
+	WXMPUtils_CatenateArrayItems_1;
+	WXMPUtils_SeparateArrayItems_1;
+	WXMPUtils_ApplyTemplate_1;
+	WXMPUtils_RemoveProperties_1;
+	WXMPUtils_DuplicateSubtree_1;
+	
+	XMP_NewExpatAdapter;
+	XMP_GetAssertNotify;
+
+local:
+
+	*;
+
+};
diff --git a/build/gcc4/XMPCore.mak b/build/gcc/XMPCore.mak
index 0891abd..70a419f 100644
--- a/build/gcc4/XMPCore.mak
+++ b/build/gcc/XMPCore.mak
@@ -73,13 +73,9 @@ XMPRoot  = ../..
 
 # 64-bit specific additions: (added in every 32-bit case, remain empty if not 64 bit mode)
 x64_ext =
-x64_compileFlags =
-x64_linkFlags =
 
 ifeq "${TargetArch}" "x64"
 	x64_ext = _x64
-	x64_compileFlags =-m64
-	x64_linkFlags =-m64
 endif
 
 LibRoot    = ${XMPRoot}/public/libraries/${TargetOS}${x64_ext}/${TargetStage}
@@ -103,22 +99,6 @@ ToolPath = ${PATH}
 Compile = PATH=${ToolPath} ${ToolName}
 Link    = PATH=${ToolPath} ${LibPathVar}=${LibraryPath} ${ToolName}
 
-# Do something innocuous by default for Strip.
-Strip = ls
-
-ifeq "${TargetStage}" "release"
-	Strip = PATH=${ToolPath} strip
-
-	ifeq "${TargetOS}" "rs6000aix"
-		Strip = PATH=/usr/bin strip
-	endif
-
-	ifeq "${TargetOS}" "hppahpux"
-		# Don't have a good gcc strip on HPUX yet.
-		Strip = ls
-	endif
-endif
-
 CPPFlags =
 
 XMPDefines = -DUNIX_ENV=1 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 ${ModeOpt}
@@ -146,12 +126,9 @@ endif
 
 Includes = \
    -I${XMPRoot}/public/include \
-   -I${XMPRoot}/source/common \
-   -I${XMPRoot}/source/XMPCore \
-   -I${XMPRoot}/third-party/expat/lib \
-   -I${XMPRoot}/third-party/MD5 \
+   -I${XMPRoot} \
    -I${XMPRoot}/build \
-   -I${XMPRoot}/build/gcc4
+   -I${XMPRoot}/build/gcc
 
 # --------------------------------
 # Define settings specific to gcc.
@@ -161,12 +138,19 @@ CPPFlags = -x c++ -Wno-ctor-dtor-privacy
 CompileFlags += -fPIC -funsigned-char -fexceptions -D_FILE_OFFSET_BITS=64
 CompileFlags += -Wno-multichar -Wno-implicit
 
-LinkFlags   = -shared -fPIC -z defs -Xlinker -Bsymbolic -Xlinker --version-script -Xlinker XMPCore.exp
-RuntimeLibs = -lc -lm -lpthread -L${ToolPath}/lib -Bdynamic -lstdc++ -shared-libgcc
+LinkFlags   = -shared -fPIC -z defs -Wl,-z,relro -Wl,-z,now -Xlinker -Bsymbolic -Xlinker --version-script -Xlinker XMPCore.exp
+
+RuntimeLibs = -lc -lm -lpthread -L${LibraryPath} -Bdynamic -lstdc++ -shared-libgcc
 
 ifeq "${TargetOS}" "i80386linux"
-	CompileFlags += -mtune=i686
 	LinkFlags += -Wl,-rpath,'$$ORIGIN'
+	ifeq "${TargetArch}" "x86"
+		CompileFlags += -m32 -mtune=i686
+		LinkFlags    += -m32
+	else
+		CompileFlags += -m64
+		LinkFlags    += -m64
+	endif
 endif
 
 ifeq "${TargetOS}" "sparcsolaris"
@@ -187,11 +171,6 @@ ifeq "${TargetOS}" "rs6000aix"
 	RuntimeLibs  += -Xlinker -brtl
 endif
 
-
-# add 64 bit flags (empty if n/a)
-CompileFlags += ${x64_compileFlags}
-LinkFlags += ${x64_linkFlags}
-
 # ==================================================================================================
 # Define the set of source files.
 
@@ -200,11 +179,11 @@ vpath %.incl_cpp\
     ${XMPRoot}/public/include/client-glue:\
 
 vpath %.cpp\
-    ${XMPRoot}/source/XMPCore:\
-    ${XMPRoot}/source/common:\
+    ${XMPRoot}/XMPCore/source:\
+    ${XMPRoot}/source:\
     ${XMPRoot}/public/include:\
     ${XMPRoot}/public/include/client-glue:\
-    ${XMPRoot}/third-party/MD5
+    ${XMPRoot}/third-party/zuid/interfaces
 
 vpath %.c\
     ${XMPRoot}/third-party/expat/lib
@@ -229,8 +208,8 @@ CPPSources = \
     ExpatAdapter.cpp \
     XML_Node.cpp \
     ParseRDF.cpp \
-    UnicodeConversions.cpp \
-	XMP_LibUtils.cpp \
+   	UnicodeConversions.cpp \
+		XMP_LibUtils.cpp \
     MD5.cpp \
 
 CObjs   = $(foreach objs,${CSources:.c=.o},${TempRoot}/$(objs))
@@ -251,9 +230,8 @@ ${TempRoot}/%.o : %.c
 	@echo "TargetPaths= ${TargetPaths}"
 	
 	@echo x64_ext = ${x64_ext}
-	@echo x64_compileFlags = ${x64_compileFlags}
-	@echo x64_linkFlags = ${x64_linkFlags}
-	
+	@echo CompileFlags = ${CompileFlags}
+
 	rm -f $@
 	${Compile} ${CompileFlags} ${XMPDefines} ${Includes} -c $< -o $@
 	@touch $@
@@ -265,8 +243,6 @@ ${TempRoot}/%.o : %.cpp
 	@echo "TargetPaths= ${TargetPaths}"
 
 	@echo x64_ext = ${x64_ext}
-	@echo x64_compileFlags = ${x64_compileFlags}
-	@echo x64_linkFlags = ${x64_linkFlags}
 	@echo CompileFlags = ${CompileFlags}
 
 	rm -f $@
diff --git a/build/gcc/XMPFiles-acc.exp b/build/gcc/XMPFiles-acc.exp
new file mode 100644
index 0000000..fad9071
--- /dev/null
+++ b/build/gcc/XMPFiles-acc.exp
@@ -0,0 +1,18 @@
++e WXMPFiles_Initialize_1
++e WXMPFiles_Initialize_2
++e WXMPFiles_Terminate_1
++e WXMPFiles_CTor_1
++e WXMPFiles_IncrementRefCount_1
++e WXMPFiles_DecrementRefCount_1
++e WXMPFiles_GetVersionInfo_1
++e WXMPFiles_GetFormatInfo_1
++e WXMPFiles_CheckFileFormat_1
++e WXMPFiles_CheckPackageFormat_1
++e WXMPFiles_GetFileModDate_1
++e WXMPFiles_OpenFile_1
++e WXMPFiles_CloseFile_1
++e WXMPFiles_GetFileInfo_1
++e WXMPFiles_SetAbortProc_1
++e WXMPFiles_GetXMP_1
++e WXMPFiles_PutXMP_1
++e WXMPFiles_CanPutXMP_1
diff --git a/build/gcc/XMPFiles-vacpp.exp b/build/gcc/XMPFiles-vacpp.exp
new file mode 100644
index 0000000..4fda815
--- /dev/null
+++ b/build/gcc/XMPFiles-vacpp.exp
@@ -0,0 +1,17 @@
+WXMPFiles_Initialize_1
+WXMPFiles_Terminate_1
+WXMPFiles_CTor_1
+WXMPFiles_IncrementRefCount_1
+WXMPFiles_DecrementRefCount_1
+WXMPFiles_GetVersionInfo_1
+WXMPFiles_GetFormatInfo_1
+WXMPFiles_CheckFileFormat_1
+WXMPFiles_CheckPackageFormat_1
+WXMPFiles_GetFileModDate_1
+WXMPFiles_OpenFile_1
+WXMPFiles_CloseFile_1
+WXMPFiles_GetFileInfo_1
+WXMPFiles_SetAbortProc_1
+WXMPFiles_GetXMP_1
+WXMPFiles_PutXMP_1
+WXMPFiles_CanPutXMP_1
diff --git a/build/gcc/XMPFiles.exp b/build/gcc/XMPFiles.exp
new file mode 100644
index 0000000..6dd2ba2
--- /dev/null
+++ b/build/gcc/XMPFiles.exp
@@ -0,0 +1,27 @@
+VERSION {
+global:
+
+	WXMPFiles_Initialize_1;
+	WXMPFiles_Initialize_2;
+	WXMPFiles_Terminate_1;
+	WXMPFiles_CTor_1;
+	WXMPFiles_IncrementRefCount_1;
+	WXMPFiles_DecrementRefCount_1;
+	WXMPFiles_GetVersionInfo_1;
+	WXMPFiles_GetFormatInfo_1;
+	WXMPFiles_CheckFileFormat_1;
+	WXMPFiles_CheckPackageFormat_1;
+	XMPFiles_GetFileModDate_1;
+	WXMPFiles_OpenFile_1;
+	WXMPFiles_CloseFile_1;
+	WXMPFiles_GetFileInfo_1;
+	WXMPFiles_SetAbortProc_1;
+	WXMPFiles_GetXMP_1;
+	WXMPFiles_PutXMP_1;
+	WXMPFiles_CanPutXMP_1;
+
+local:
+
+	*;
+
+};
diff --git a/build/gcc4/XMPFiles.mak b/build/gcc/XMPFiles.mak
index 294903a..6973155 100644
--- a/build/gcc4/XMPFiles.mak
+++ b/build/gcc/XMPFiles.mak
@@ -115,22 +115,6 @@ ToolPath = ${PATH}
 Compile = PATH=${ToolPath} ${ToolName}
 Link    = PATH=${ToolPath} ${LibPathVar}=${LibraryPath} ${ToolName}
 	
-# Do something innocuous by default for Strip.
-Strip = ls
-
-ifeq "${TargetStage}" "release"
-	Strip = PATH=${ToolPath} strip
-
-	ifeq "${TargetOS}" "rs6000aix"
-		Strip = PATH=/usr/bin strip
-	endif
-
-	ifeq "${TargetOS}" "hppahpux"
-		# Don't have a good gcc strip on HPUX yet.
-		Strip = ls
-	endif
-endif
-
 CPPFlags =
 
 XMPDefines = -DUNIX_ENV=1 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 ${EndianSetting} ${ModeOpt}
@@ -158,14 +142,10 @@ endif
 
 Includes = \
    -I${XMPRoot}/public/include \
-   -I${XMPRoot}/source/common \
-   -I${XMPRoot}/source/XMPFiles \
-   -I${XMPRoot}/source/XMPFiles/FileHandlers \
-   -I${XMPRoot}/source/XMPFiles/FormatSupport \
-   -I${XMPRoot}/third-party/MD5 \
-   -I${XMPRoot}/third-party/zlib \
+   -I${XMPRoot} \
+	 -I${XMPRoot}/XMPFilesPlugins/api/source \
    -I${XMPRoot}/build \
-   -I${XMPRoot}/build/gcc4
+   -I${XMPRoot}/build/gcc
 
 # --------------------------------
 # Define settings specific to gcc.
@@ -175,11 +155,17 @@ CompileFlags += -fPIC -funsigned-char -fexceptions -D_FILE_OFFSET_BITS=64
 CompileFlags += -Wno-multichar -Wno-implicit
 
 LinkFlags   = -shared -fPIC -z defs -Xlinker -Bsymbolic -Xlinker --version-script -Xlinker XMPFiles.exp
-RuntimeLibs = -lc -lm -lpthread -L${ToolPath}/lib -Bdynamic -lstdc++ -shared-libgcc
+RuntimeLibs = -lc -lm -lpthread -L${LibraryPath} -Bdynamic -lstdc++ -shared-libgcc -ldl
 
 ifeq "${TargetOS}" "i80386linux"
-	CompileFlags += -mtune=i686
 	LinkFlags += -Wl,-rpath,'$$ORIGIN'
+	ifeq "${TargetArch}" "x86"
+		CompileFlags += -m32 -mtune=i686
+		LinkFlags    += -m32
+	else
+		CompileFlags += -m64
+		LinkFlags    += -m64
+	endif
 endif
 
 ifeq "${TargetOS}" "sparcsolaris"
@@ -213,15 +199,18 @@ vpath %.incl_cpp\
     ${XMPRoot}/public/include/client-glue:\
 
 vpath %.cpp\
-    ${XMPRoot}/source/XMPFiles:\
-    ${XMPRoot}/source/XMPFiles/FileHandlers:\
-    ${XMPRoot}/source/XMPFiles/FormatSupport:\
-    ${XMPRoot}/source/common:\
+    ${XMPRoot}/XMPFiles/source:\
+    ${XMPRoot}/XMPFiles/source/FileHandlers:\
+    ${XMPRoot}/XMPFiles/source/FormatSupport:\
+		${XMPRoot}/XMPFiles/source/FormatSupport/AIFF:\
+		${XMPRoot}/XMPFiles/source/FormatSupport/IFF:\
+		${XMPRoot}/XMPFiles/source/FormatSupport/WAVE:\
+		${XMPRoot}/XMPFiles/source/NativeMetadataSupport:\
+		${XMPRoot}/XMPFiles/source/PluginHandler:\
+    ${XMPRoot}/source:\
     ${XMPRoot}/public/include:\
     ${XMPRoot}/public/include/client-glue:\
-    ${XMPRoot}/third-party/MD5:\
     ${XMPRoot}/third-party/zuid/interfaces:\
-    ${XMPRoot}/third-party/zuid/sources
 
 vpath %.c\
     ${XMPRoot}/third-party/zlib
@@ -248,7 +237,6 @@ CPPSources = \
 	XMPFiles.cpp \
 	XMPFiles_Impl.cpp \
 	XMP_LibUtils.cpp \
-	LargeFileAccess.cpp \
 	UnicodeConversions.cpp \
 	XML_Node.cpp \
 	MD5.cpp \
@@ -293,7 +281,39 @@ CPPSources = \
 	TIFF_MemoryReader.cpp \
 	TIFF_Support.cpp \
 	XDCAM_Support.cpp \
-	XMPScanner.cpp
+	XMPScanner.cpp \
+	HandlerRegistry.cpp \
+	AIFF_Handler.cpp \
+	WAVE_Handler.cpp \
+	ID3_Support.cpp \
+	AIFFBehavior.cpp \
+	AIFFMetadata.cpp \
+	AIFFReconcile.cpp \
+	Chunk.cpp \
+	ChunkController.cpp\
+	ChunkPath.cpp \
+	IChunkBehavior.cpp \
+	BEXTMetadata.cpp \
+	CartMetadata.cpp \
+	Cr8rMetadata.cpp \
+	DISPMetadata.cpp \
+	INFOMetadata.cpp \
+	PrmLMetadata.cpp \
+	WAVEBehavior.cpp \
+	WAVEReconcile.cpp \
+	IMetadata.cpp \
+	IReconcile.cpp \
+	MetadataSet.cpp \
+	FileHandlerInstance.cpp \
+	HostAPIImpl.cpp \
+	Module.cpp \
+	OS_Utils_Linux.cpp \
+	PluginManager.cpp \
+	XMPAtoms.cpp \
+	Host_IO-UNIX.cpp \
+	Host_IO-POSIX.cpp \
+	XIO.cpp \
+	XMPFiles_IO.cpp
 
 CObjs   = $(foreach objs,${CSources:.c=.o},${TempRoot}/$(objs))
 CPPObjs = $(foreach objs,${CPPSources:.cpp=.o},${TempRoot}/$(objs))
diff --git a/build/gcc4/XMPToolkit.mak b/build/gcc/XMPToolkit.mak
index e612b85..a3993f6 100644
--- a/build/gcc4/XMPToolkit.mak
+++ b/build/gcc/XMPToolkit.mak
@@ -90,16 +90,14 @@ specify_target :
 
 usage_advice:
 	@echo "# To build XMPToolkit (XMPCore+XMPFiles):"
-	@echo "#   make -f XMPToolkit.mak os=<os> stage=<stage> arch=<arch> (build|clean|rebuild|listOutput)"
+	@echo "#   make -f XMPToolkit.mak os=<os> stage=<stage> arch=<arch> libpath=<path> (build|clean|rebuild|listOutput)"
 	@echo "# "
-	@echo "#   os    = i80386linux | sparcsolaris | rs6000aix | hppahpux"
-	@echo "#   stage = debug | release"
-	@echo "#   arch  = x86 | x64  (just say x86 for anything 32 bit)"
-	@echo "#"
-	@echo "#                When using local:"	
-	@echo "#                Ensure path contains all the paths to your gcc compiler of choice."
-	@echo "#                You MUST set libpath to the directory where the matching libstdc++.a"
-	@echo "#                resides (directory name w/o trailing slash, i.e. /usr/lib/gcc/4.1.2/lib)"
+	@echo "#   os    	= i80386linux | sparcsolaris | rs6000aix | hppahpux"
+	@echo "#   stage 	= debug | release"
+	@echo "#   arch  	= x86 | x64  (just say x86 for anything 32 bit)"
+	@echo "#	 libpath= Ensure path contains all the paths to your gcc compiler of choice."
+	@echo "#            You MUST set libpath to the directory where the matching libstdc++.a"
+	@echo "#            resides (directory name w/o trailing slash, i.e. /usr/lib/gcc/4.1.2/lib)"
 	@echo ""
 	@exit 0
 
diff --git a/build/gcc4/expat_config.h b/build/gcc/expat_config.h
index 53bcd9a..53bcd9a 100644
--- a/build/gcc4/expat_config.h
+++ b/build/gcc/expat_config.h
diff --git a/build/gcc4/usage_examples.txt b/build/gcc/usage_examples.txt
index 269a0ae..269a0ae 100644
--- a/build/gcc4/usage_examples.txt
+++ b/build/gcc/usage_examples.txt
diff --git a/build/vc/XMPCore.vcxproj b/build/vc/XMPCore.vcxproj
new file mode 100644
index 0000000..4708558
--- /dev/null
+++ b/build/vc/XMPCore.vcxproj
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C5BB1536-3776-4474-861D-B5923C610FE4}</ProjectGuid>
+    <RootNamespace>XMPCore</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\public\libraries\windows\debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\intermediate\$(ProjectName)\windows\debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\public\libraries\windows_x64\debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\intermediate\$(ProjectName)\windows_x64\debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\public\libraries\windows\release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\intermediate\$(ProjectName)\windows\release\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\public\libraries\windows_x64\release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\intermediate\$(ProjectName)\windows_x64\release\</IntDir>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;DEBUG=1;XMP_StaticBuild=1;_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>..\..\intermediate\windows\debug\</ObjectFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)XMPCoreStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;DEBUG=1;_DEBUG=1;XMP_StaticBuild=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>..\..\intermediate\windows_x64\debug\</ObjectFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)XMPCoreStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;NDEBUG=1;XMP_StaticBuild=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>..\..\intermediate\windows\release\</ObjectFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)XMPCoreStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>
+      </IgnoreAllDefaultLibraries>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;NDEBUG=1;XMP_StaticBuild=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>..\..\intermediate\windows_x64\release\</ObjectFileName>
+      <BrowseInformation>
+      </BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)XMPCoreStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\UnicodeConversions.cpp" />
+    <ClCompile Include="..\..\source\XML_Node.cpp" />
+    <ClCompile Include="..\..\source\XMP_LibUtils.cpp" />
+    <ClCompile Include="..\..\third-party\expat\lib\xmlparse.c" />
+    <ClCompile Include="..\..\third-party\expat\lib\xmlrole.c" />
+    <ClCompile Include="..\..\third-party\expat\lib\xmltok.c" />
+    <ClCompile Include="..\..\third-party\zuid\interfaces\MD5.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\ExpatAdapter.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\ParseRDF.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\WXMPIterator.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\WXMPMeta.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\WXMPUtils.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPCore_Impl.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPIterator.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta-GetSet.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta-Parse.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta-Serialize.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPUtils-FileInfo.cpp" />
+    <ClCompile Include="..\..\XMPCore\source\XMPUtils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="expat_config.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/vc/XMPCore.vcxproj.filters b/build/vc/XMPCore.vcxproj.filters
new file mode 100644
index 0000000..2bc0515
--- /dev/null
+++ b/build/vc/XMPCore.vcxproj.filters
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Toolkit Core">
+      <UniqueIdentifier>{92454726-870b-42ce-937c-7a751d80eee3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Utilities">
+      <UniqueIdentifier>{ca180b0d-9406-457e-996e-af2820ef0fd8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\XML Parser">
+      <UniqueIdentifier>{5ce2eb07-09b7-4ec0-8f29-918bd0858afd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ABI Wrappers">
+      <UniqueIdentifier>{401a4314-ab70-4b04-95bc-0a03e6c96bd0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Third Party">
+      <UniqueIdentifier>{778d6a16-3b61-481a-9f31-ff2f97e13d7d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\XMPCore\source\WXMPMeta.cpp">
+      <Filter>Source Files\ABI Wrappers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\WXMPUtils.cpp">
+      <Filter>Source Files\ABI Wrappers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\WXMPIterator.cpp">
+      <Filter>Source Files\ABI Wrappers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPCore_Impl.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPIterator.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta-GetSet.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta-Parse.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPMeta-Serialize.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPUtils.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\XMPUtils-FileInfo.cpp">
+      <Filter>Source Files\Toolkit Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\ParseRDF.cpp">
+      <Filter>Source Files\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPCore\source\ExpatAdapter.cpp">
+      <Filter>Source Files\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\XML_Node.cpp">
+      <Filter>Source Files\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\XMP_LibUtils.cpp">
+      <Filter>Source Files\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\UnicodeConversions.cpp">
+      <Filter>Source Files\Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\expat\lib\xmlparse.c">
+      <Filter>Source Files\XML Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\expat\lib\xmlrole.c">
+      <Filter>Source Files\XML Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\expat\lib\xmltok.c">
+      <Filter>Source Files\XML Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zuid\interfaces\MD5.cpp">
+      <Filter>Source Files\Utilities</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="expat_config.h">
+      <Filter>Source Files\XML Parser</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/vc/XMPFiles.vcxproj b/build/vc/XMPFiles.vcxproj
new file mode 100644
index 0000000..767713d
--- /dev/null
+++ b/build/vc/XMPFiles.vcxproj
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}</ProjectGuid>
+    <RootNamespace>XMPFilesStatic</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\public\libraries\windows\debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\intermediate\$(ProjectName)\windows\debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\public\libraries\windows_x64\debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\intermediate\$(ProjectName)\windows_x64\debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\public\libraries\windows\release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\intermediate\$(ProjectName)\windows\release\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\public\libraries\windows_x64\release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\intermediate\$(ProjectName)\windows_x64\release\</IntDir>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;..\..\XMPFilesPlugins\api\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;DEBUG=1;_CRT_SECURE_NO_WARNINGS=1;_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>..\..\intermediate\windows\debug\</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)XMPFilesStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;..\..\XMPFilesPlugins\api\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;DEBUG=1;_DEBUG=1;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>..\..\intermediate\windows_x64\debug\</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+      <OutputFile>$(OutDir)XMPFilesStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;..\..\XMPFilesPlugins\api\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;NDEBUG=1;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)XMPFilesStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>
+      </IgnoreAllDefaultLibraries>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.\;..\..\;..\..\public\include\;..\..\XMPFilesPlugins\api\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;NDEBUG=1;_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions> /J</AdditionalOptions>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <ObjectFileName>..\..\intermediate\windows_x64\release\</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+      <OutputFile>$(OutDir)XMPFilesStatic.lib</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\Host_IO-Win.cpp" />
+    <ClCompile Include="..\..\source\UnicodeConversions.cpp" />
+    <ClCompile Include="..\..\source\XIO.cpp" />
+    <ClCompile Include="..\..\source\XML_Node.cpp" />
+    <ClCompile Include="..\..\source\XMPFiles_IO.cpp" />
+    <ClCompile Include="..\..\source\XMP_LibUtils.cpp" />
+    <ClCompile Include="..\..\third-party\zlib\adler32.c" />
+    <ClCompile Include="..\..\third-party\zlib\compress.c" />
+    <ClCompile Include="..\..\third-party\zlib\crc32.c" />
+    <ClCompile Include="..\..\third-party\zlib\deflate.c" />
+    <ClCompile Include="..\..\third-party\zlib\infback.c" />
+    <ClCompile Include="..\..\third-party\zlib\inffast.c" />
+    <ClCompile Include="..\..\third-party\zlib\inflate.c" />
+    <ClCompile Include="..\..\third-party\zlib\inftrees.c" />
+    <ClCompile Include="..\..\third-party\zlib\trees.c" />
+    <ClCompile Include="..\..\third-party\zlib\uncompr.c" />
+    <ClCompile Include="..\..\third-party\zlib\zutil.c" />
+    <ClCompile Include="..\..\third-party\zuid\interfaces\MD5.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\AIFF_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\ASF_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\AVCHD_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\Basic_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\FLV_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\InDesign_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\JPEG_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\MP3_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\MPEG2_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\MPEG4_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\P2_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\PNG_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\PostScript_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\PSD_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\RIFF_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\Scanner_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\SonyHDV_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\SWF_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\TIFF_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\Trivial_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\UCF_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\WAVE_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\XDCAMEX_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\XDCAM_Handler.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\AIFF\AIFFBehavior.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\AIFF\AIFFMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\AIFF\AIFFReconcile.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ASF_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ID3_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\Chunk.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\ChunkController.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\ChunkPath.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\IChunkBehavior.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IPTC_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ISOBaseMedia_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\MOOV_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\PNG_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\PSIR_FileWriter.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\PSIR_MemoryReader.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\QuickTime_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ReconcileIPTC.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ReconcileLegacy.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ReconcileTIFF.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\Reconcile_Impl.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\RIFF.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\RIFF_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\SWF_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\TIFF_FileWriter.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\TIFF_MemoryReader.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\TIFF_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\BEXTMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\CartMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\Cr8rMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\DISPMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\INFOMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\PrmLMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\WAVEBehavior.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\WAVEReconcile.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\XDCAM_Support.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\XMPScanner.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\HandlerRegistry.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\NativeMetadataSupport\IMetadata.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\NativeMetadataSupport\IReconcile.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\NativeMetadataSupport\MetadataSet.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\FileHandlerInstance.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\HostAPIImpl.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\Module.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\OS_Utils_WIN.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\PluginManager.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\XMPAtoms.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\WXMPFiles.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\XMPFiles.cpp" />
+    <ClCompile Include="..\..\XMPFiles\source\XMPFiles_Impl.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/vc/XMPFiles.vcxproj.filters b/build/vc/XMPFiles.vcxproj.filters
new file mode 100644
index 0000000..ec90ab4
--- /dev/null
+++ b/build/vc/XMPFiles.vcxproj.filters
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Common Code">
+      <UniqueIdentifier>{a6d7bf25-22a6-4a7a-b5e0-a644c324464b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\File Handlers">
+      <UniqueIdentifier>{36a54085-e119-4cd8-9669-bb2c038eecee}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Format Support">
+      <UniqueIdentifier>{573a9d8c-fa86-46b3-8be2-970fc1d3344e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Third Party">
+      <UniqueIdentifier>{d3a30be5-49bc-45aa-ada9-683e80085bc1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Third Party\zlib">
+      <UniqueIdentifier>{f2b21867-9f7a-4793-b6f9-cd6fd1207f45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Third Party\MD5">
+      <UniqueIdentifier>{2c1950fa-df67-496a-b237-b9cf9b66b927}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Common Code\NativeMetadataSupport">
+      <UniqueIdentifier>{2a090c3d-7715-4571-995d-2785fb499e7e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Common Code\PluginHandler">
+      <UniqueIdentifier>{7c5eb72b-51d9-4f8d-add4-02f21d567be0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Format Support\AIFF">
+      <UniqueIdentifier>{727f7f59-0647-41a7-8e97-654fb59d7cdd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Format Support\IFF">
+      <UniqueIdentifier>{3dec415f-bca5-4cb6-95a8-10f9ae8f3c07}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Format Support\WAVE">
+      <UniqueIdentifier>{0489930f-4229-4bc8-9c7b-d294a05f40c5}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\XMPFiles\source\HandlerRegistry.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\WXMPFiles.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\XMPFiles.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\XMPFiles_Impl.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\UnicodeConversions.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\XML_Node.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\XMP_LibUtils.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\deflate.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\inffast.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\inflate.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\inftrees.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\trees.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\uncompr.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\zutil.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\adler32.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\compress.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\crc32.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\TIFF_FileWriter.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\TIFF_MemoryReader.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\TIFF_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\XDCAM_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\XMPScanner.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ASF_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ID3_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IPTC_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ISOBaseMedia_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\MOOV_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\PNG_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\PSIR_FileWriter.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\PSIR_MemoryReader.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\QuickTime_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\Reconcile_Impl.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ReconcileIPTC.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ReconcileLegacy.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\ReconcileTIFF.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\RIFF.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\RIFF_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\SWF_Support.cpp">
+      <Filter>Source Files\Format Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\SonyHDV_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\SWF_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\TIFF_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\Trivial_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\UCF_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\WAVE_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\XDCAM_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\XDCAMEX_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\AIFF_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\ASF_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\AVCHD_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\Basic_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\FLV_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\InDesign_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\JPEG_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\MP3_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\MPEG2_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\MPEG4_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\P2_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\PNG_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\PostScript_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\PSD_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\RIFF_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FileHandlers\Scanner_Handler.cpp">
+      <Filter>Source Files\File Handlers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zlib\infback.c">
+      <Filter>Source Files\Third Party\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\NativeMetadataSupport\IMetadata.cpp">
+      <Filter>Source Files\Common Code\NativeMetadataSupport</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\NativeMetadataSupport\IReconcile.cpp">
+      <Filter>Source Files\Common Code\NativeMetadataSupport</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\NativeMetadataSupport\MetadataSet.cpp">
+      <Filter>Source Files\Common Code\NativeMetadataSupport</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\HostAPIImpl.cpp">
+      <Filter>Source Files\Common Code\PluginHandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\OS_Utils_WIN.cpp">
+      <Filter>Source Files\Common Code\PluginHandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\Module.cpp">
+      <Filter>Source Files\Common Code\PluginHandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\PluginManager.cpp">
+      <Filter>Source Files\Common Code\PluginHandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\XMPAtoms.cpp">
+      <Filter>Source Files\Common Code\PluginHandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\PluginHandler\FileHandlerInstance.cpp">
+      <Filter>Source Files\Common Code\PluginHandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\AIFF\AIFFBehavior.cpp">
+      <Filter>Source Files\Format Support\AIFF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\AIFF\AIFFMetadata.cpp">
+      <Filter>Source Files\Format Support\AIFF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\AIFF\AIFFReconcile.cpp">
+      <Filter>Source Files\Format Support\AIFF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\ChunkPath.cpp">
+      <Filter>Source Files\Format Support\IFF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\IChunkBehavior.cpp">
+      <Filter>Source Files\Format Support\IFF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\Chunk.cpp">
+      <Filter>Source Files\Format Support\IFF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\IFF\ChunkController.cpp">
+      <Filter>Source Files\Format Support\IFF</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\BEXTMetadata.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\CartMetadata.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\Cr8rMetadata.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\DISPMetadata.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\INFOMetadata.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\PrmLMetadata.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\WAVEReconcile.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\XMPFiles\source\FormatSupport\WAVE\WAVEBehavior.cpp">
+      <Filter>Source Files\Format Support\WAVE</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third-party\zuid\interfaces\MD5.cpp">
+      <Filter>Source Files\Third Party\MD5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\XIO.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\XMPFiles_IO.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\Host_IO-Win.cpp">
+      <Filter>Source Files\Common Code</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/build/vc9/XMPToolkitSDK.sln b/build/vc/XMPToolkitSDK.sln
index 2fac016..c75fc96 100644
--- a/build/vc9/XMPToolkitSDK.sln
+++ b/build/vc/XMPToolkitSDK.sln
@@ -1,35 +1,35 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPCore", "XMPCore.vcproj", "{C5BB1536-3776-4474-861D-B5923C610FE4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPFiles", "XMPFiles.vcproj", "{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|Win32.Build.0 = Debug|Win32
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|x64.ActiveCfg = Debug|x64
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|x64.Build.0 = Debug|x64
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|Win32.ActiveCfg = Release|Win32
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|Win32.Build.0 = Release|Win32
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|x64.ActiveCfg = Release|x64
-		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|x64.Build.0 = Release|x64
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|Win32.Build.0 = Debug|Win32
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|x64.ActiveCfg = Debug|x64
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|x64.Build.0 = Debug|x64
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|Win32.ActiveCfg = Release|Win32
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|Win32.Build.0 = Release|Win32
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|x64.ActiveCfg = Release|x64
-		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPCore", "XMPCore.vcxproj", "{C5BB1536-3776-4474-861D-B5923C610FE4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPFiles", "XMPFiles.vcxproj", "{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|Win32.Build.0 = Debug|Win32
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|x64.ActiveCfg = Debug|x64
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Debug|x64.Build.0 = Debug|x64
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|Win32.ActiveCfg = Release|Win32
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|Win32.Build.0 = Release|Win32
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|x64.ActiveCfg = Release|x64
+		{C5BB1536-3776-4474-861D-B5923C610FE4}.Release|x64.Build.0 = Release|x64
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|Win32.Build.0 = Debug|Win32
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|x64.ActiveCfg = Debug|x64
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Debug|x64.Build.0 = Debug|x64
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|Win32.ActiveCfg = Release|Win32
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|Win32.Build.0 = Release|Win32
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|x64.ActiveCfg = Release|x64
+		{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/build/vc9/expat_config.h b/build/vc/expat_config.h
index 945d0bd..945d0bd 100644
--- a/build/vc9/expat_config.h
+++ b/build/vc/expat_config.h
diff --git a/build/vc9/XMPCore.vcproj b/build/vc9/XMPCore.vcproj
deleted file mode 100644
index fd00bc2..0000000
--- a/build/vc9/XMPCore.vcproj
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="XMPCore"
-	ProjectGUID="{C5BB1536-3776-4474-861D-B5923C610FE4}"
-	RootNamespace="XMPCore"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\public\libraries\windows\debug\"
-			IntermediateDirectory="..\..\intermediate\windows\debug\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="0"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\common\;..\..\source\XMPCore\;&quot;..\..\third-party\expat\lib\&quot;;&quot;..\..\third-party\MD5\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;DEBUG=1;_DEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="1"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="..\..\intermediate\windows\debug\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\XMPCoreStaticDebug.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\public\libraries\windows_x64\debug\"
-			IntermediateDirectory="..\..\intermediate\windows_x64\debug\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="0"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\common\;..\..\source\XMPCore\;&quot;..\..\third-party\expat\lib\&quot;;&quot;..\..\third-party\MD5\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;DEBUG=1;_DEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="1"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="..\..\intermediate\windows_x64\debug\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\XMPCoreStaticDebug.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\public\libraries\windows\release\"
-			IntermediateDirectory="..\..\intermediate\windows\release\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\common\;..\..\source\XMPCore\;&quot;..\..\third-party\expat\lib\&quot;;&quot;..\..\third-party\MD5\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;NDEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="..\..\intermediate\windows\release\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\XMPCoreStaticRelease.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\public\libraries\windows_x64\release\"
-			IntermediateDirectory="..\..\intermediate\windows_x64\release\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\common\;..\..\source\XMPCore\;&quot;..\..\third-party\expat\lib\&quot;;&quot;..\..\third-party\MD5\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;HAVE_EXPAT_CONFIG_H=1;XML_STATIC=1;NDEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				DefaultCharIsUnsigned="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="..\..\intermediate\windows_x64\release\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\XMPCoreStaticRelease.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="Toolkit Core"
-				>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPCore_Impl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPIterator.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPMeta-GetSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPMeta-Parse.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPMeta-Serialize.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPMeta.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPUtils-FileInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\XMPUtils.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Utilities"
-				>
-				<File
-					RelativePath="..\..\source\XMPCore\ExpatAdapter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\third-party\MD5\MD5.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\ParseRDF.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\common\UnicodeConversions.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\common\XML_Node.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\common\XMP_LibUtils.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="XML Parser"
-				>
-				<File
-					RelativePath=".\expat_config.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\third-party\expat\lib\xmlparse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\third-party\expat\lib\xmlrole.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\third-party\expat\lib\xmltok.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ABI Wrappers"
-				>
-				<File
-					RelativePath="..\..\source\XMPCore\WXMPIterator.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\WXMPMeta.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPCore\WXMPUtils.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Third Party"
-				>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/vc9/XMPFiles.vcproj b/build/vc9/XMPFiles.vcproj
deleted file mode 100644
index 1aef066..0000000
--- a/build/vc9/XMPFiles.vcproj
+++ /dev/null
@@ -1,601 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="XMPFiles"
-	ProjectGUID="{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}"
-	RootNamespace="XMPFilesStatic"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\public\libraries\windows\debug\"
-			IntermediateDirectory="..\..\intermediate\windows\debug\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="true"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;DEBUG=1;_CRT_SECURE_NO_WARNINGS=1;_DEBUG=1"
-				StringPooling="true"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="..\..\intermediate\windows\debug\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/XMPFilesStaticDebug.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\public\libraries\windows_x64\debug\"
-			IntermediateDirectory="..\..\intermediate\windows_x64\debug\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="true"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;DEBUG=1;_DEBUG=1;_CRT_SECURE_NO_WARNINGS=1"
-				StringPooling="true"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="..\..\intermediate\windows_x64\debug\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="Advapi32.lib User32.lib $(NOINHERIT)"
-				OutputFile="$(OutDir)/XMPFilesStaticDebug.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\public\libraries\windows\release\"
-			IntermediateDirectory="..\..\intermediate\windows\release\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;NDEBUG=1;_CRT_SECURE_NO_WARNINGS=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/XMPFilesStaticRelease.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\public\libraries\windows_x64\release\"
-			IntermediateDirectory="..\..\intermediate\windows_x64\release\"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"
-				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;NDEBUG=1;_CRT_SECURE_NO_WARNINGS=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				ObjectFile="..\..\intermediate\windows_x64\release\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="Advapi32.lib User32.lib $(NOINHERIT)"
-				OutputFile="$(OutDir)/XMPFilesStaticRelease.lib"
-				IgnoreAllDefaultLibraries="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="Common Code"
-				>
-				<File
-					RelativePath="..\..\source\common\LargeFileAccess.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\common\UnicodeConversions.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\WXMPFiles.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\common\XML_Node.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\common\XMP_LibUtils.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\XMPFiles.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\XMPFiles_Impl.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="File Handlers"
-				>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\ASF_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\AVCHD_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\Basic_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\FLV_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\InDesign_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\JPEG_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\MP3_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\MPEG2_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\MPEG4_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\P2_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\PNG_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\PostScript_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\PSD_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\RIFF_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\Scanner_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\SonyHDV_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\SWF_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\TIFF_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\Trivial_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\UCF_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\XDCAM_Handler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FileHandlers\XDCAMEX_Handler.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Format Support"
-				>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\ASF_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\ID3_Support.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\IPTC_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\ISOBaseMedia_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\MOOV_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\PNG_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\PSIR_FileWriter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\PSIR_MemoryReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\QuickTime_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\Reconcile_Impl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\ReconcileIPTC.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\ReconcileLegacy.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\ReconcileTIFF.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\RIFF.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\RIFF_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\SWF_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\TIFF_FileWriter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\TIFF_MemoryReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\TIFF_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\XDCAM_Support.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\XMPFiles\FormatSupport\XMPScanner.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Third Party"
-				>
-				<Filter
-					Name="zlib"
-					>
-					<File
-						RelativePath="..\..\third-party\zlib\adler32.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\compress.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\crc32.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\deflate.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\infback.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\inffast.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\inflate.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\inftrees.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\trees.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\uncompr.c"
-						>
-					</File>
-					<File
-						RelativePath="..\..\third-party\zlib\zutil.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="MD5"
-					>
-					<File
-						RelativePath="..\..\third-party\MD5\MD5.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/xcode3/XMPToolkitSDK-Common.xcconfig b/build/xcode/XMPToolkitSDK-Common.xcconfig
index 959b3a6..2d8e9cc 100644
--- a/build/xcode3/XMPToolkitSDK-Common.xcconfig
+++ b/build/xcode/XMPToolkitSDK-Common.xcconfig
@@ -1,11 +1,8 @@
 ROOT = ./../..
-
-SOURCE_ROOT = ${ROOT}/source
 PUBLIC_ROOT = ${ROOT}/public
 
 EXPAT_ROOT = ${ROOT}/third-party/expat
 
-SRCROOT = ${SOURCE_ROOT}
 
 DSTROOT = 
 INSTALL_PATH = 
@@ -25,17 +22,19 @@ INFOPLIST_PREPROCESS =
 INFOPLIST_PREFIX_HEADER = 
 
 ARCHS = i386 x86_64
-MACOSX_DEPLOYMENT_TARGET = 10.5
-SDKROOT = /Developer/SDKs/MacOSX10.5.sdk
+MACOSX_DEPLOYMENT_TARGET = 10.6
+SDKROOT = macosx10.6
 
 SHARED_PRECOMPS_DIR =
 PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO
 GCC_PRECOMPILE_PREFIX_HEADER = NO
 
-HEADER_SEARCH_PATHS = . ../ ${PUBLIC_ROOT}/include ${SOURCE_ROOT}/XMPCore ${SOURCE_ROOT}/XMPFiles ${SOURCE_ROOT}/XMPFiles/FormatSupport ${SOURCE_ROOT}/common ${EXPAT_ROOT}/lib /Developer/Headers/FlatCarbon
+HEADER_SEARCH_PATHS = . ../ ${ROOT} ${PUBLIC_ROOT}/include ${ROOT}/XMPFilesPlugins/api/source
+
+COMMON_DEFINES[arch=x86_64] = MAC_ENV=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1 XMP_64=1 XMP_StaticBuild=1
+COMMON_DEFINES[arch=i386] = MAC_ENV=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1 XMP_64=0 XMP_StaticBuild=1
 
-COMMON_DEFINES[arch=x86_64] = MAC_ENV=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1 XMP_64=1
-COMMON_DEFINES[arch=i386] = MAC_ENV=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1 XMP_64=0
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
 
 GCC_CHAR_IS_UNSIGNED_CHAR = YES
 GCC_ENABLE_PASCAL_STRINGS = NO
diff --git a/build/xcode3/XMPToolkitSDK-Debug.xcconfig b/build/xcode/XMPToolkitSDK-Debug.xcconfig
index f1ecb32..f1ecb32 100644
--- a/build/xcode3/XMPToolkitSDK-Debug.xcconfig
+++ b/build/xcode/XMPToolkitSDK-Debug.xcconfig
diff --git a/build/xcode3/XMPToolkitSDK-Release.xcconfig b/build/xcode/XMPToolkitSDK-Release.xcconfig
index f74a4ca..f74a4ca 100644
--- a/build/xcode3/XMPToolkitSDK-Release.xcconfig
+++ b/build/xcode/XMPToolkitSDK-Release.xcconfig
diff --git a/build/xcode3/XMPToolkitSDK.xcodeproj/project.pbxproj b/build/xcode/XMPToolkitSDK.xcodeproj/project.pbxproj
index fd9a0df..9c452e1 100644
--- a/build/xcode3/XMPToolkitSDK.xcodeproj/project.pbxproj
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/project.pbxproj
@@ -3,26 +3,9 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 46;
 	objects = {
 
-/* Begin PBXAggregateTarget section */
-		DCF912BC09A3E6970055523F /* Build All */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = DCF912C109A3E6C60055523F /* Build configuration list for PBXAggregateTarget "Build All" */;
-			buildPhases = (
-			);
-			dependencies = (
-				DCF912BE09A3E6A40055523F /* PBXTargetDependency */,
-				DCF912C009A3E6A70055523F /* PBXTargetDependency */,
-				01FC6D920B7B7858008559A1 /* PBXTargetDependency */,
-				01FC6D900B7B7858008559A1 /* PBXTargetDependency */,
-			);
-			name = "Build All";
-			productName = "Build All";
-		};
-/* End PBXAggregateTarget section */
-
 /* Begin PBXBuildFile section */
 		0102D1C70B7B8471001AF6F7 /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014A2AA10B78FF1400A80B2A /* MD5.cpp */; };
 		0102D1C80B7B8472001AF6F7 /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014A2AA10B78FF1400A80B2A /* MD5.cpp */; };
@@ -150,14 +133,138 @@
 		2E1977280E38B99800E7002F /* XML_Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977260E38B99800E7002F /* XML_Node.cpp */; };
 		2E1977290E38B99800E7002F /* XML_Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977260E38B99800E7002F /* XML_Node.cpp */; };
 		2E19772A0E38B99800E7002F /* XML_Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977260E38B99800E7002F /* XML_Node.cpp */; };
-		2E19772D0E38B9DB00E7002F /* LargeFileAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E19772C0E38B9DB00E7002F /* LargeFileAccess.cpp */; };
-		2E19772E0E38B9DB00E7002F /* LargeFileAccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E19772C0E38B9DB00E7002F /* LargeFileAccess.cpp */; };
 		2E1977300E38B9ED00E7002F /* UnicodeConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E19772F0E38B9ED00E7002F /* UnicodeConversions.cpp */; };
 		2E1977310E38B9ED00E7002F /* UnicodeConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E19772F0E38B9ED00E7002F /* UnicodeConversions.cpp */; };
 		2E1977390E38BB5B00E7002F /* SWF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977380E38BB5B00E7002F /* SWF_Support.cpp */; };
 		2E19773A0E38BB5B00E7002F /* SWF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977380E38BB5B00E7002F /* SWF_Support.cpp */; };
-		2E1977D80E38CD5E00E7002F /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977D70E38CD5E00E7002F /* MD5.cpp */; };
-		2E1977D90E38CD5E00E7002F /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977D70E38CD5E00E7002F /* MD5.cpp */; };
+		2E48993614CECEB2000F92DD /* HandlerRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993514CECEB2000F92DD /* HandlerRegistry.cpp */; };
+		2E48993714CECEB2000F92DD /* HandlerRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993514CECEB2000F92DD /* HandlerRegistry.cpp */; };
+		2E48993814CECEB2000F92DD /* HandlerRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993514CECEB2000F92DD /* HandlerRegistry.cpp */; };
+		2E48993914CECEB2000F92DD /* HandlerRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993514CECEB2000F92DD /* HandlerRegistry.cpp */; };
+		2E48993C14CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993A14CEDBC7000F92DD /* AIFF_Handler.cpp */; };
+		2E48993D14CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993B14CEDBC7000F92DD /* WAVE_Handler.cpp */; };
+		2E48993E14CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993A14CEDBC7000F92DD /* AIFF_Handler.cpp */; };
+		2E48993F14CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993B14CEDBC7000F92DD /* WAVE_Handler.cpp */; };
+		2E48994014CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993A14CEDBC7000F92DD /* AIFF_Handler.cpp */; };
+		2E48994114CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993B14CEDBC7000F92DD /* WAVE_Handler.cpp */; };
+		2E48994214CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993A14CEDBC7000F92DD /* AIFF_Handler.cpp */; };
+		2E48994314CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48993B14CEDBC7000F92DD /* WAVE_Handler.cpp */; };
+		2E48994514CEDBDD000F92DD /* ID3_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994414CEDBDD000F92DD /* ID3_Support.cpp */; };
+		2E48994614CEDBDD000F92DD /* ID3_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994414CEDBDD000F92DD /* ID3_Support.cpp */; };
+		2E48994714CEDBDD000F92DD /* ID3_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994414CEDBDD000F92DD /* ID3_Support.cpp */; };
+		2E48994814CEDBDD000F92DD /* ID3_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994414CEDBDD000F92DD /* ID3_Support.cpp */; };
+		2E48994C14CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994914CEDBF3000F92DD /* AIFFBehavior.cpp */; };
+		2E48994D14CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994A14CEDBF3000F92DD /* AIFFMetadata.cpp */; };
+		2E48994E14CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994B14CEDBF3000F92DD /* AIFFReconcile.cpp */; };
+		2E48994F14CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994914CEDBF3000F92DD /* AIFFBehavior.cpp */; };
+		2E48995014CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994A14CEDBF3000F92DD /* AIFFMetadata.cpp */; };
+		2E48995114CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994B14CEDBF3000F92DD /* AIFFReconcile.cpp */; };
+		2E48995214CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994914CEDBF3000F92DD /* AIFFBehavior.cpp */; };
+		2E48995314CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994A14CEDBF3000F92DD /* AIFFMetadata.cpp */; };
+		2E48995414CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994B14CEDBF3000F92DD /* AIFFReconcile.cpp */; };
+		2E48995514CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994914CEDBF3000F92DD /* AIFFBehavior.cpp */; };
+		2E48995614CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994A14CEDBF3000F92DD /* AIFFMetadata.cpp */; };
+		2E48995714CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48994B14CEDBF3000F92DD /* AIFFReconcile.cpp */; };
+		2E48995C14CEDC04000F92DD /* Chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995814CEDC04000F92DD /* Chunk.cpp */; };
+		2E48995D14CEDC04000F92DD /* ChunkController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995914CEDC04000F92DD /* ChunkController.cpp */; };
+		2E48995E14CEDC04000F92DD /* ChunkPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995A14CEDC04000F92DD /* ChunkPath.cpp */; };
+		2E48995F14CEDC04000F92DD /* IChunkBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995B14CEDC04000F92DD /* IChunkBehavior.cpp */; };
+		2E48996014CEDC04000F92DD /* Chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995814CEDC04000F92DD /* Chunk.cpp */; };
+		2E48996114CEDC04000F92DD /* ChunkController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995914CEDC04000F92DD /* ChunkController.cpp */; };
+		2E48996214CEDC04000F92DD /* ChunkPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995A14CEDC04000F92DD /* ChunkPath.cpp */; };
+		2E48996314CEDC04000F92DD /* IChunkBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995B14CEDC04000F92DD /* IChunkBehavior.cpp */; };
+		2E48996414CEDC04000F92DD /* Chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995814CEDC04000F92DD /* Chunk.cpp */; };
+		2E48996514CEDC04000F92DD /* ChunkController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995914CEDC04000F92DD /* ChunkController.cpp */; };
+		2E48996614CEDC04000F92DD /* ChunkPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995A14CEDC04000F92DD /* ChunkPath.cpp */; };
+		2E48996714CEDC04000F92DD /* IChunkBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995B14CEDC04000F92DD /* IChunkBehavior.cpp */; };
+		2E48996814CEDC04000F92DD /* Chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995814CEDC04000F92DD /* Chunk.cpp */; };
+		2E48996914CEDC04000F92DD /* ChunkController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995914CEDC04000F92DD /* ChunkController.cpp */; };
+		2E48996A14CEDC04000F92DD /* ChunkPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995A14CEDC04000F92DD /* ChunkPath.cpp */; };
+		2E48996B14CEDC04000F92DD /* IChunkBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48995B14CEDC04000F92DD /* IChunkBehavior.cpp */; };
+		2E48997414CEDC24000F92DD /* BEXTMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996C14CEDC24000F92DD /* BEXTMetadata.cpp */; };
+		2E48997514CEDC24000F92DD /* CartMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996D14CEDC24000F92DD /* CartMetadata.cpp */; };
+		2E48997614CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996E14CEDC24000F92DD /* Cr8rMetadata.cpp */; };
+		2E48997714CEDC24000F92DD /* DISPMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996F14CEDC24000F92DD /* DISPMetadata.cpp */; };
+		2E48997814CEDC24000F92DD /* INFOMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997014CEDC24000F92DD /* INFOMetadata.cpp */; };
+		2E48997914CEDC24000F92DD /* PrmLMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997114CEDC24000F92DD /* PrmLMetadata.cpp */; };
+		2E48997A14CEDC24000F92DD /* WAVEBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997214CEDC24000F92DD /* WAVEBehavior.cpp */; };
+		2E48997B14CEDC24000F92DD /* WAVEReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997314CEDC24000F92DD /* WAVEReconcile.cpp */; };
+		2E48997C14CEDC24000F92DD /* BEXTMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996C14CEDC24000F92DD /* BEXTMetadata.cpp */; };
+		2E48997D14CEDC24000F92DD /* CartMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996D14CEDC24000F92DD /* CartMetadata.cpp */; };
+		2E48997E14CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996E14CEDC24000F92DD /* Cr8rMetadata.cpp */; };
+		2E48997F14CEDC24000F92DD /* DISPMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996F14CEDC24000F92DD /* DISPMetadata.cpp */; };
+		2E48998014CEDC24000F92DD /* INFOMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997014CEDC24000F92DD /* INFOMetadata.cpp */; };
+		2E48998114CEDC24000F92DD /* PrmLMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997114CEDC24000F92DD /* PrmLMetadata.cpp */; };
+		2E48998214CEDC24000F92DD /* WAVEBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997214CEDC24000F92DD /* WAVEBehavior.cpp */; };
+		2E48998314CEDC24000F92DD /* WAVEReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997314CEDC24000F92DD /* WAVEReconcile.cpp */; };
+		2E48998414CEDC24000F92DD /* BEXTMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996C14CEDC24000F92DD /* BEXTMetadata.cpp */; };
+		2E48998514CEDC24000F92DD /* CartMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996D14CEDC24000F92DD /* CartMetadata.cpp */; };
+		2E48998614CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996E14CEDC24000F92DD /* Cr8rMetadata.cpp */; };
+		2E48998714CEDC24000F92DD /* DISPMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996F14CEDC24000F92DD /* DISPMetadata.cpp */; };
+		2E48998814CEDC24000F92DD /* INFOMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997014CEDC24000F92DD /* INFOMetadata.cpp */; };
+		2E48998914CEDC24000F92DD /* PrmLMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997114CEDC24000F92DD /* PrmLMetadata.cpp */; };
+		2E48998A14CEDC24000F92DD /* WAVEBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997214CEDC24000F92DD /* WAVEBehavior.cpp */; };
+		2E48998B14CEDC24000F92DD /* WAVEReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997314CEDC24000F92DD /* WAVEReconcile.cpp */; };
+		2E48998C14CEDC24000F92DD /* BEXTMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996C14CEDC24000F92DD /* BEXTMetadata.cpp */; };
+		2E48998D14CEDC24000F92DD /* CartMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996D14CEDC24000F92DD /* CartMetadata.cpp */; };
+		2E48998E14CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996E14CEDC24000F92DD /* Cr8rMetadata.cpp */; };
+		2E48998F14CEDC24000F92DD /* DISPMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48996F14CEDC24000F92DD /* DISPMetadata.cpp */; };
+		2E48999014CEDC24000F92DD /* INFOMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997014CEDC24000F92DD /* INFOMetadata.cpp */; };
+		2E48999114CEDC24000F92DD /* PrmLMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997114CEDC24000F92DD /* PrmLMetadata.cpp */; };
+		2E48999214CEDC24000F92DD /* WAVEBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997214CEDC24000F92DD /* WAVEBehavior.cpp */; };
+		2E48999314CEDC24000F92DD /* WAVEReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48997314CEDC24000F92DD /* WAVEReconcile.cpp */; };
+		2E48999B14CEDC87000F92DD /* IMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999814CEDC87000F92DD /* IMetadata.cpp */; };
+		2E48999C14CEDC87000F92DD /* IReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999914CEDC87000F92DD /* IReconcile.cpp */; };
+		2E48999D14CEDC87000F92DD /* MetadataSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999A14CEDC87000F92DD /* MetadataSet.cpp */; };
+		2E48999E14CEDC87000F92DD /* IMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999814CEDC87000F92DD /* IMetadata.cpp */; };
+		2E48999F14CEDC87000F92DD /* IReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999914CEDC87000F92DD /* IReconcile.cpp */; };
+		2E4899A014CEDC87000F92DD /* MetadataSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999A14CEDC87000F92DD /* MetadataSet.cpp */; };
+		2E4899A114CEDC87000F92DD /* IMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999814CEDC87000F92DD /* IMetadata.cpp */; };
+		2E4899A214CEDC87000F92DD /* IReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999914CEDC87000F92DD /* IReconcile.cpp */; };
+		2E4899A314CEDC87000F92DD /* MetadataSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999A14CEDC87000F92DD /* MetadataSet.cpp */; };
+		2E4899A414CEDC87000F92DD /* IMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999814CEDC87000F92DD /* IMetadata.cpp */; };
+		2E4899A514CEDC87000F92DD /* IReconcile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999914CEDC87000F92DD /* IReconcile.cpp */; };
+		2E4899A614CEDC87000F92DD /* MetadataSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E48999A14CEDC87000F92DD /* MetadataSet.cpp */; };
+		2E4899AC14CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A814CEDD61000F92DD /* Host_IO-Mac.cpp */; };
+		2E4899AD14CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A914CEDD61000F92DD /* Host_IO-POSIX.cpp */; };
+		2E4899AE14CEDD61000F92DD /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AA14CEDD61000F92DD /* XIO.cpp */; };
+		2E4899AF14CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AB14CEDD61000F92DD /* XMPFiles_IO.cpp */; };
+		2E4899B014CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A814CEDD61000F92DD /* Host_IO-Mac.cpp */; };
+		2E4899B114CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A914CEDD61000F92DD /* Host_IO-POSIX.cpp */; };
+		2E4899B214CEDD61000F92DD /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AA14CEDD61000F92DD /* XIO.cpp */; };
+		2E4899B314CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AB14CEDD61000F92DD /* XMPFiles_IO.cpp */; };
+		2E4899B414CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A814CEDD61000F92DD /* Host_IO-Mac.cpp */; };
+		2E4899B514CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A914CEDD61000F92DD /* Host_IO-POSIX.cpp */; };
+		2E4899B614CEDD61000F92DD /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AA14CEDD61000F92DD /* XIO.cpp */; };
+		2E4899B714CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AB14CEDD61000F92DD /* XMPFiles_IO.cpp */; };
+		2E4899B814CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A814CEDD61000F92DD /* Host_IO-Mac.cpp */; };
+		2E4899B914CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899A914CEDD61000F92DD /* Host_IO-POSIX.cpp */; };
+		2E4899BA14CEDD61000F92DD /* XIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AA14CEDD61000F92DD /* XIO.cpp */; };
+		2E4899BB14CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4899AB14CEDD61000F92DD /* XMPFiles_IO.cpp */; };
+		2E4FC47714D00EB90085E444 /* FileHandlerInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47214D00EB90085E444 /* FileHandlerInstance.cpp */; };
+		2E4FC47814D00EB90085E444 /* HostAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47314D00EB90085E444 /* HostAPIImpl.cpp */; };
+		2E4FC47914D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47414D00EB90085E444 /* OS_Utils_Mac.cpp */; };
+		2E4FC47A14D00EB90085E444 /* PluginManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47514D00EB90085E444 /* PluginManager.cpp */; };
+		2E4FC47B14D00EB90085E444 /* XMPAtoms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47614D00EB90085E444 /* XMPAtoms.cpp */; };
+		2E4FC47C14D00EB90085E444 /* FileHandlerInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47214D00EB90085E444 /* FileHandlerInstance.cpp */; };
+		2E4FC47D14D00EB90085E444 /* HostAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47314D00EB90085E444 /* HostAPIImpl.cpp */; };
+		2E4FC47E14D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47414D00EB90085E444 /* OS_Utils_Mac.cpp */; };
+		2E4FC47F14D00EB90085E444 /* PluginManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47514D00EB90085E444 /* PluginManager.cpp */; };
+		2E4FC48014D00EB90085E444 /* XMPAtoms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47614D00EB90085E444 /* XMPAtoms.cpp */; };
+		2E4FC48114D00EB90085E444 /* FileHandlerInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47214D00EB90085E444 /* FileHandlerInstance.cpp */; };
+		2E4FC48214D00EB90085E444 /* HostAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47314D00EB90085E444 /* HostAPIImpl.cpp */; };
+		2E4FC48314D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47414D00EB90085E444 /* OS_Utils_Mac.cpp */; };
+		2E4FC48414D00EB90085E444 /* PluginManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47514D00EB90085E444 /* PluginManager.cpp */; };
+		2E4FC48514D00EB90085E444 /* XMPAtoms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47614D00EB90085E444 /* XMPAtoms.cpp */; };
+		2E4FC48614D00EB90085E444 /* FileHandlerInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47214D00EB90085E444 /* FileHandlerInstance.cpp */; };
+		2E4FC48714D00EB90085E444 /* HostAPIImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47314D00EB90085E444 /* HostAPIImpl.cpp */; };
+		2E4FC48814D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47414D00EB90085E444 /* OS_Utils_Mac.cpp */; };
+		2E4FC48914D00EB90085E444 /* PluginManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47514D00EB90085E444 /* PluginManager.cpp */; };
+		2E4FC48A14D00EB90085E444 /* XMPAtoms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC47614D00EB90085E444 /* XMPAtoms.cpp */; };
+		2E4FC49614D0100A0085E444 /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC49514D0100A0085E444 /* Module.cpp */; };
+		2E4FC49714D0100A0085E444 /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC49514D0100A0085E444 /* Module.cpp */; };
+		2E4FC49814D0100A0085E444 /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC49514D0100A0085E444 /* Module.cpp */; };
+		2E4FC49914D0100A0085E444 /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4FC49514D0100A0085E444 /* Module.cpp */; };
 		2EA24E9F0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */; };
 		2EA24EA00F9F750F00665AC4 /* ISOBaseMedia_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */; };
 		DC493270089A94CE003ADAAF /* XMPIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07601E46085F950A003FEB33 /* XMPIterator.cpp */; };
@@ -194,42 +301,11 @@
 		DCEDFE2609ACBECF00D86460 /* XMPUtils-FileInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCEDFE2409ACBECF00D86460 /* XMPUtils-FileInfo.cpp */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		01FC6D8F0B7B7858008559A1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 01FC6CF20B7B7514008559A1;
-			remoteInfo = "XMPFiles Release";
-		};
-		01FC6D910B7B7858008559A1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 01FC6CD40B7B6D65008559A1;
-			remoteInfo = "XMPFiles Debug";
-		};
-		DCF912BD09A3E6A40055523F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = DC49326B089A9441003ADAAF;
-			remoteInfo = "XMPCore Debug";
-		};
-		DCF912BF09A3E6A70055523F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = DC493293089A9726003ADAAF;
-			remoteInfo = "XMPCore Release";
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
 		011127FE0E5C549400114B41 /* ASF_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ASF_Handler.cpp; sourceTree = "<group>"; };
 		011128030E5C54A000114B41 /* ASF_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ASF_Support.cpp; sourceTree = "<group>"; };
 		014796510B776899007CF8F4 /* XMPCore_Impl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPCore_Impl.cpp; sourceTree = "<group>"; };
-		014A2AA10B78FF1400A80B2A /* MD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MD5.cpp; path = "../../third-party/MD5/MD5.cpp"; sourceTree = "<group>"; };
+		014A2AA10B78FF1400A80B2A /* MD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MD5.cpp; path = "../../third-party/zuid/interfaces/MD5.cpp"; sourceTree = "<group>"; };
 		014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RIFF_Handler.cpp; sourceTree = "<group>"; };
 		014AD4CA104FFA5800D3708E /* RIFF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RIFF.cpp; sourceTree = "<group>"; };
 		019024AC0E34DB86000FC1F0 /* AVCHD_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AVCHD_Handler.cpp; sourceTree = "<group>"; };
@@ -266,11 +342,11 @@
 		019025190E34DC7E000FC1F0 /* TIFF_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TIFF_Support.cpp; sourceTree = "<group>"; };
 		0190251A0E34DC7E000FC1F0 /* XMPScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMPScanner.cpp; sourceTree = "<group>"; };
 		01C07CD30E39E70200029382 /* SWF_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SWF_Handler.cpp; sourceTree = "<group>"; };
-		01FC6CEC0B7B6D65008559A1 /* libXMPFilesStaticDebug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPFilesStaticDebug.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		01FC6D0A0B7B7514008559A1 /* libXMPFilesStaticRelease.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPFilesStaticRelease.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		01FC6D840B7B77C1008559A1 /* WXMPFiles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WXMPFiles.cpp; path = ../../source/XMPFiles/WXMPFiles.cpp; sourceTree = "<group>"; };
-		01FC6D850B7B77C1008559A1 /* XMPFiles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XMPFiles.cpp; path = ../../source/XMPFiles/XMPFiles.cpp; sourceTree = "<group>"; };
-		01FC6D860B7B77C1008559A1 /* XMPFiles_Impl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XMPFiles_Impl.cpp; path = ../../source/XMPFiles/XMPFiles_Impl.cpp; sourceTree = "<group>"; };
+		01FC6CEC0B7B6D65008559A1 /* libXMPFilesStatic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPFilesStatic.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		01FC6D0A0B7B7514008559A1 /* libXMPFilesStatic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPFilesStatic.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		01FC6D840B7B77C1008559A1 /* WXMPFiles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WXMPFiles.cpp; path = ../XMPFiles/source/WXMPFiles.cpp; sourceTree = "<group>"; };
+		01FC6D850B7B77C1008559A1 /* XMPFiles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XMPFiles.cpp; path = ../XMPFiles/source/XMPFiles.cpp; sourceTree = "<group>"; };
+		01FC6D860B7B77C1008559A1 /* XMPFiles_Impl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XMPFiles_Impl.cpp; path = ../XMPFiles/source/XMPFiles_Impl.cpp; sourceTree = "<group>"; };
 		05015CD10FA0950F00060343 /* expat_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expat_config.h; sourceTree = "<group>"; };
 		0533F3950F9F886800583FA8 /* QuickTime_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuickTime_Support.cpp; sourceTree = "<group>"; };
 		05E9C38710C9562200164773 /* XMP_LibUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMP_LibUtils.cpp; sourceTree = "<group>"; };
@@ -280,13 +356,12 @@
 		07601E48085F950A003FEB33 /* XMPUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPUtils.cpp; sourceTree = "<group>"; };
 		07601E73085F9791003FEB33 /* ExpatAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ExpatAdapter.cpp; sourceTree = "<group>"; };
 		07601E75085F9791003FEB33 /* ParseRDF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ParseRDF.cpp; sourceTree = "<group>"; };
-		07601E76085F9791003FEB33 /* UnicodeConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = UnicodeConversions.cpp; path = ../common/UnicodeConversions.cpp; sourceTree = "<group>"; };
+		07601E76085F9791003FEB33 /* UnicodeConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = UnicodeConversions.cpp; path = ../../source/UnicodeConversions.cpp; sourceTree = "<group>"; };
 		07601E89085F9A39003FEB33 /* WXMPIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = WXMPIterator.cpp; sourceTree = "<group>"; };
 		07601E8A085F9A39003FEB33 /* WXMPMeta.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = WXMPMeta.cpp; sourceTree = "<group>"; };
 		07601E8B085F9A39003FEB33 /* WXMPUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = WXMPUtils.cpp; sourceTree = "<group>"; };
-		2E19771D0E38B74F00E7002F /* XML_Node.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = XML_Node.cpp; path = ../common/XML_Node.cpp; sourceTree = "<group>"; };
+		2E19771D0E38B74F00E7002F /* XML_Node.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = XML_Node.cpp; path = ../../source/XML_Node.cpp; sourceTree = "<group>"; };
 		2E1977260E38B99800E7002F /* XML_Node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XML_Node.cpp; sourceTree = "<group>"; };
-		2E19772C0E38B9DB00E7002F /* LargeFileAccess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LargeFileAccess.cpp; sourceTree = "<group>"; };
 		2E19772F0E38B9ED00E7002F /* UnicodeConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnicodeConversions.cpp; sourceTree = "<group>"; };
 		2E1977380E38BB5B00E7002F /* SWF_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SWF_Support.cpp; sourceTree = "<group>"; };
 		2E1977B20E38CC2500E7002F /* adler32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = adler32.c; path = "../../third-party/zlib/adler32.c"; sourceTree = "<group>"; };
@@ -300,13 +375,45 @@
 		2E1977BF0E38CCC700E7002F /* trees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trees.c; sourceTree = "<group>"; };
 		2E1977C00E38CCC700E7002F /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; };
 		2E1977C10E38CCC700E7002F /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
-		2E1977D70E38CD5E00E7002F /* MD5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MD5.cpp; path = MD5/MD5.cpp; sourceTree = "<group>"; };
+		2E1977D70E38CD5E00E7002F /* MD5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MD5.cpp; path = zuid/interfaces/MD5.cpp; sourceTree = "<group>"; };
+		2E48993514CECEB2000F92DD /* HandlerRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HandlerRegistry.cpp; path = ../XMPFiles/source/HandlerRegistry.cpp; sourceTree = "<group>"; };
+		2E48993A14CEDBC7000F92DD /* AIFF_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AIFF_Handler.cpp; sourceTree = "<group>"; };
+		2E48993B14CEDBC7000F92DD /* WAVE_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WAVE_Handler.cpp; sourceTree = "<group>"; };
+		2E48994414CEDBDD000F92DD /* ID3_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ID3_Support.cpp; sourceTree = "<group>"; };
+		2E48994914CEDBF3000F92DD /* AIFFBehavior.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AIFFBehavior.cpp; path = AIFF/AIFFBehavior.cpp; sourceTree = "<group>"; };
+		2E48994A14CEDBF3000F92DD /* AIFFMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AIFFMetadata.cpp; path = AIFF/AIFFMetadata.cpp; sourceTree = "<group>"; };
+		2E48994B14CEDBF3000F92DD /* AIFFReconcile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AIFFReconcile.cpp; path = AIFF/AIFFReconcile.cpp; sourceTree = "<group>"; };
+		2E48995814CEDC04000F92DD /* Chunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Chunk.cpp; path = IFF/Chunk.cpp; sourceTree = "<group>"; };
+		2E48995914CEDC04000F92DD /* ChunkController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChunkController.cpp; path = IFF/ChunkController.cpp; sourceTree = "<group>"; };
+		2E48995A14CEDC04000F92DD /* ChunkPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChunkPath.cpp; path = IFF/ChunkPath.cpp; sourceTree = "<group>"; };
+		2E48995B14CEDC04000F92DD /* IChunkBehavior.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IChunkBehavior.cpp; path = IFF/IChunkBehavior.cpp; sourceTree = "<group>"; };
+		2E48996C14CEDC24000F92DD /* BEXTMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BEXTMetadata.cpp; path = WAVE/BEXTMetadata.cpp; sourceTree = "<group>"; };
+		2E48996D14CEDC24000F92DD /* CartMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartMetadata.cpp; path = WAVE/CartMetadata.cpp; sourceTree = "<group>"; };
+		2E48996E14CEDC24000F92DD /* Cr8rMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Cr8rMetadata.cpp; path = WAVE/Cr8rMetadata.cpp; sourceTree = "<group>"; };
+		2E48996F14CEDC24000F92DD /* DISPMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DISPMetadata.cpp; path = WAVE/DISPMetadata.cpp; sourceTree = "<group>"; };
+		2E48997014CEDC24000F92DD /* INFOMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = INFOMetadata.cpp; path = WAVE/INFOMetadata.cpp; sourceTree = "<group>"; };
+		2E48997114CEDC24000F92DD /* PrmLMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PrmLMetadata.cpp; path = WAVE/PrmLMetadata.cpp; sourceTree = "<group>"; };
+		2E48997214CEDC24000F92DD /* WAVEBehavior.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WAVEBehavior.cpp; path = WAVE/WAVEBehavior.cpp; sourceTree = "<group>"; };
+		2E48997314CEDC24000F92DD /* WAVEReconcile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WAVEReconcile.cpp; path = WAVE/WAVEReconcile.cpp; sourceTree = "<group>"; };
+		2E48999814CEDC87000F92DD /* IMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IMetadata.cpp; sourceTree = "<group>"; };
+		2E48999914CEDC87000F92DD /* IReconcile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IReconcile.cpp; sourceTree = "<group>"; };
+		2E48999A14CEDC87000F92DD /* MetadataSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MetadataSet.cpp; sourceTree = "<group>"; };
+		2E4899A814CEDD61000F92DD /* Host_IO-Mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Host_IO-Mac.cpp"; sourceTree = "<group>"; };
+		2E4899A914CEDD61000F92DD /* Host_IO-POSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Host_IO-POSIX.cpp"; sourceTree = "<group>"; };
+		2E4899AA14CEDD61000F92DD /* XIO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XIO.cpp; sourceTree = "<group>"; };
+		2E4899AB14CEDD61000F92DD /* XMPFiles_IO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMPFiles_IO.cpp; sourceTree = "<group>"; };
+		2E4FC47214D00EB90085E444 /* FileHandlerInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileHandlerInstance.cpp; path = ../../XMPFiles/source/PluginHandler/FileHandlerInstance.cpp; sourceTree = "<group>"; };
+		2E4FC47314D00EB90085E444 /* HostAPIImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HostAPIImpl.cpp; path = ../../XMPFiles/source/PluginHandler/HostAPIImpl.cpp; sourceTree = "<group>"; };
+		2E4FC47414D00EB90085E444 /* OS_Utils_Mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OS_Utils_Mac.cpp; path = ../../XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp; sourceTree = "<group>"; };
+		2E4FC47514D00EB90085E444 /* PluginManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginManager.cpp; path = ../../XMPFiles/source/PluginHandler/PluginManager.cpp; sourceTree = "<group>"; };
+		2E4FC47614D00EB90085E444 /* XMPAtoms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XMPAtoms.cpp; path = ../../XMPFiles/source/PluginHandler/XMPAtoms.cpp; sourceTree = "<group>"; };
+		2E4FC49514D0100A0085E444 /* Module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Module.cpp; path = ../../XMPFiles/source/PluginHandler/Module.cpp; sourceTree = "<group>"; };
 		2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISOBaseMedia_Support.cpp; sourceTree = "<group>"; };
 		DC14FDD2089A8591004D5310 /* xmlparse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xmlparse.c; sourceTree = "<group>"; };
 		DC14FDD3089A8591004D5310 /* xmlrole.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xmlrole.c; sourceTree = "<group>"; };
 		DC14FDD4089A8591004D5310 /* xmltok.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xmltok.c; sourceTree = "<group>"; };
-		DC49326C089A9441003ADAAF /* libXMPCoreStaticDebug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPCoreStaticDebug.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		DC4932B0089A9726003ADAAF /* libXMPCoreStaticRelease.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPCoreStaticRelease.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		DC49326C089A9441003ADAAF /* libXMPCoreStatic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPCoreStatic.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		DC4932B0089A9726003ADAAF /* libXMPCoreStatic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXMPCoreStatic.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DC87E517089960DB000A7ADF /* XMPMeta-GetSet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "XMPMeta-GetSet.cpp"; sourceTree = "<group>"; };
 		DC87E518089960DB000A7ADF /* XMPMeta-Parse.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "XMPMeta-Parse.cpp"; sourceTree = "<group>"; };
 		DC87E519089960DB000A7ADF /* XMPMeta-Serialize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "XMPMeta-Serialize.cpp"; sourceTree = "<group>"; };
@@ -351,6 +458,8 @@
 		014A2AB10B79001E00A80B2A /* XMPFiles */ = {
 			isa = PBXGroup;
 			children = (
+				2E4FC47114D00E8C0085E444 /* PluginHandler */,
+				2E48999714CEDC70000F92DD /* NativeMetadataSupport */,
 				2E1977190E38B61B00E7002F /* common */,
 				01FC6CED0B7B7458008559A1 /* FileHandlers */,
 				01FC6CEE0B7B7462008559A1 /* FormatSupport */,
@@ -370,6 +479,8 @@
 		01FC6CED0B7B7458008559A1 /* FileHandlers */ = {
 			isa = PBXGroup;
 			children = (
+				2E48993A14CEDBC7000F92DD /* AIFF_Handler.cpp */,
+				2E48993B14CEDBC7000F92DD /* WAVE_Handler.cpp */,
 				014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */,
 				011127FE0E5C549400114B41 /* ASF_Handler.cpp */,
 				01C07CD30E39E70200029382 /* SWF_Handler.cpp */,
@@ -394,12 +505,16 @@
 				019024C20E34DB86000FC1F0 /* XDCAMEX_Handler.cpp */,
 			);
 			name = FileHandlers;
-			path = ../../source/XMPFiles/FileHandlers;
+			path = ../../XMPFiles/source/FileHandlers;
 			sourceTree = "<group>";
 		};
 		01FC6CEE0B7B7462008559A1 /* FormatSupport */ = {
 			isa = PBXGroup;
 			children = (
+				2E48999614CEDC5D000F92DD /* AIFF */,
+				2E48999514CEDC49000F92DD /* IFF */,
+				2E48999414CEDC3C000F92DD /* WAVE */,
+				2E48994414CEDBDD000F92DD /* ID3_Support.cpp */,
 				05E9C38C10C9565600164773 /* MOOV_Support.cpp */,
 				0533F3950F9F886800583FA8 /* QuickTime_Support.cpp */,
 				2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */,
@@ -422,7 +537,7 @@
 				0190251A0E34DC7E000FC1F0 /* XMPScanner.cpp */,
 			);
 			name = FormatSupport;
-			path = ../../source/XMPFiles/FormatSupport;
+			path = ../../XMPFiles/source/FormatSupport;
 			sourceTree = "<group>";
 		};
 		07601E35085F945B003FEB33 /* Build Files */ = {
@@ -466,7 +581,7 @@
 				07601E40085F949B003FEB33 /* Utilities */,
 			);
 			name = XMPCore;
-			path = ../../source/XMPCore;
+			path = ../../XMPCore/source;
 			sourceTree = "<group>";
 		};
 		0867D691FE84028FC02AAC07 /* AdobeXMP */ = {
@@ -483,8 +598,12 @@
 		2E1977190E38B61B00E7002F /* common */ = {
 			isa = PBXGroup;
 			children = (
+				2E4899A814CEDD61000F92DD /* Host_IO-Mac.cpp */,
+				2E4899A914CEDD61000F92DD /* Host_IO-POSIX.cpp */,
+				2E4899AA14CEDD61000F92DD /* XIO.cpp */,
+				2E4899AB14CEDD61000F92DD /* XMPFiles_IO.cpp */,
+				2E48993514CECEB2000F92DD /* HandlerRegistry.cpp */,
 				05E9C38710C9562200164773 /* XMP_LibUtils.cpp */,
-				2E19772C0E38B9DB00E7002F /* LargeFileAccess.cpp */,
 				2E19772F0E38B9ED00E7002F /* UnicodeConversions.cpp */,
 				01FC6D840B7B77C1008559A1 /* WXMPFiles.cpp */,
 				2E1977260E38B99800E7002F /* XML_Node.cpp */,
@@ -492,7 +611,7 @@
 				01FC6D860B7B77C1008559A1 /* XMPFiles_Impl.cpp */,
 			);
 			name = common;
-			path = ../../source/common;
+			path = ../../source;
 			sourceTree = "<group>";
 		};
 		2E19771A0E38B64D00E7002F /* Third Party */ = {
@@ -555,6 +674,66 @@
 			name = MD5;
 			sourceTree = "<group>";
 		};
+		2E48999414CEDC3C000F92DD /* WAVE */ = {
+			isa = PBXGroup;
+			children = (
+				2E48996C14CEDC24000F92DD /* BEXTMetadata.cpp */,
+				2E48996D14CEDC24000F92DD /* CartMetadata.cpp */,
+				2E48996E14CEDC24000F92DD /* Cr8rMetadata.cpp */,
+				2E48996F14CEDC24000F92DD /* DISPMetadata.cpp */,
+				2E48997014CEDC24000F92DD /* INFOMetadata.cpp */,
+				2E48997114CEDC24000F92DD /* PrmLMetadata.cpp */,
+				2E48997214CEDC24000F92DD /* WAVEBehavior.cpp */,
+				2E48997314CEDC24000F92DD /* WAVEReconcile.cpp */,
+			);
+			name = WAVE;
+			sourceTree = "<group>";
+		};
+		2E48999514CEDC49000F92DD /* IFF */ = {
+			isa = PBXGroup;
+			children = (
+				2E48995814CEDC04000F92DD /* Chunk.cpp */,
+				2E48995914CEDC04000F92DD /* ChunkController.cpp */,
+				2E48995A14CEDC04000F92DD /* ChunkPath.cpp */,
+				2E48995B14CEDC04000F92DD /* IChunkBehavior.cpp */,
+			);
+			name = IFF;
+			sourceTree = "<group>";
+		};
+		2E48999614CEDC5D000F92DD /* AIFF */ = {
+			isa = PBXGroup;
+			children = (
+				2E48994914CEDBF3000F92DD /* AIFFBehavior.cpp */,
+				2E48994A14CEDBF3000F92DD /* AIFFMetadata.cpp */,
+				2E48994B14CEDBF3000F92DD /* AIFFReconcile.cpp */,
+			);
+			name = AIFF;
+			sourceTree = "<group>";
+		};
+		2E48999714CEDC70000F92DD /* NativeMetadataSupport */ = {
+			isa = PBXGroup;
+			children = (
+				2E48999814CEDC87000F92DD /* IMetadata.cpp */,
+				2E48999914CEDC87000F92DD /* IReconcile.cpp */,
+				2E48999A14CEDC87000F92DD /* MetadataSet.cpp */,
+			);
+			name = NativeMetadataSupport;
+			path = ../../XMPFiles/source/NativeMetadataSupport;
+			sourceTree = "<group>";
+		};
+		2E4FC47114D00E8C0085E444 /* PluginHandler */ = {
+			isa = PBXGroup;
+			children = (
+				2E4FC49514D0100A0085E444 /* Module.cpp */,
+				2E4FC47214D00EB90085E444 /* FileHandlerInstance.cpp */,
+				2E4FC47314D00EB90085E444 /* HostAPIImpl.cpp */,
+				2E4FC47414D00EB90085E444 /* OS_Utils_Mac.cpp */,
+				2E4FC47514D00EB90085E444 /* PluginManager.cpp */,
+				2E4FC47614D00EB90085E444 /* XMPAtoms.cpp */,
+			);
+			name = PluginHandler;
+			sourceTree = "<group>";
+		};
 		DC14FDC2089A84F0004D5310 /* Expat */ = {
 			isa = PBXGroup;
 			children = (
@@ -569,10 +748,10 @@
 		DC3CC41908A4342900F44C7B /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				DC49326C089A9441003ADAAF /* libXMPCoreStaticDebug.a */,
-				DC4932B0089A9726003ADAAF /* libXMPCoreStaticRelease.a */,
-				01FC6CEC0B7B6D65008559A1 /* libXMPFilesStaticDebug.a */,
-				01FC6D0A0B7B7514008559A1 /* libXMPFilesStaticRelease.a */,
+				DC49326C089A9441003ADAAF /* libXMPCoreStatic.a */,
+				DC4932B0089A9726003ADAAF /* libXMPCoreStatic.a */,
+				01FC6CEC0B7B6D65008559A1 /* libXMPFilesStatic.a */,
+				01FC6D0A0B7B7514008559A1 /* libXMPFilesStatic.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -593,7 +772,7 @@
 			);
 			name = "XMPFiles Debug";
 			productName = "Debug-static";
-			productReference = 01FC6CEC0B7B6D65008559A1 /* libXMPFilesStaticDebug.a */;
+			productReference = 01FC6CEC0B7B6D65008559A1 /* libXMPFilesStatic.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		01FC6CF20B7B7514008559A1 /* XMPFiles Release */ = {
@@ -609,7 +788,7 @@
 			);
 			name = "XMPFiles Release";
 			productName = "Debug-static";
-			productReference = 01FC6D0A0B7B7514008559A1 /* libXMPFilesStaticRelease.a */;
+			productReference = 01FC6D0A0B7B7514008559A1 /* libXMPFilesStatic.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		DC49326B089A9441003ADAAF /* XMPCore Debug */ = {
@@ -625,7 +804,7 @@
 			);
 			name = "XMPCore Debug";
 			productName = "Debug-static";
-			productReference = DC49326C089A9441003ADAAF /* libXMPCoreStaticDebug.a */;
+			productReference = DC49326C089A9441003ADAAF /* libXMPCoreStatic.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		DC493293089A9726003ADAAF /* XMPCore Release */ = {
@@ -641,7 +820,7 @@
 			);
 			name = "XMPCore Release";
 			productName = "Debug-static";
-			productReference = DC4932B0089A9726003ADAAF /* libXMPCoreStaticRelease.a */;
+			productReference = DC4932B0089A9726003ADAAF /* libXMPCoreStatic.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -649,15 +828,24 @@
 /* Begin PBXProject section */
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
 			buildConfigurationList = 07601E2C085F9443003FEB33 /* Build configuration list for PBXProject "XMPToolkitSDK" */;
-			compatibilityVersion = "Xcode 3.0";
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* AdobeXMP */;
 			productRefGroup = 0867D691FE84028FC02AAC07 /* AdobeXMP */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				DCF912BC09A3E6970055523F /* Build All */,
 				DC49326B089A9441003ADAAF /* XMPCore Debug */,
 				DC493293089A9726003ADAAF /* XMPCore Release */,
 				01FC6CD40B7B6D65008559A1 /* XMPFiles Debug */,
@@ -709,10 +897,8 @@
 				0190253F0E34DC7E000FC1F0 /* TIFF_Support.cpp in Sources */,
 				019025400E34DC7E000FC1F0 /* XMPScanner.cpp in Sources */,
 				2E1977290E38B99800E7002F /* XML_Node.cpp in Sources */,
-				2E19772D0E38B9DB00E7002F /* LargeFileAccess.cpp in Sources */,
 				2E1977300E38B9ED00E7002F /* UnicodeConversions.cpp in Sources */,
 				2E1977390E38BB5B00E7002F /* SWF_Support.cpp in Sources */,
-				2E1977D80E38CD5E00E7002F /* MD5.cpp in Sources */,
 				01C07CA40E39E43E00029382 /* adler32.c in Sources */,
 				01C07CA50E39E43E00029382 /* compress.c in Sources */,
 				01C07CA60E39E43E00029382 /* crc32.c in Sources */,
@@ -733,6 +919,38 @@
 				014AD4CC104FFA5800D3708E /* RIFF.cpp in Sources */,
 				05E9C38A10C9562200164773 /* XMP_LibUtils.cpp in Sources */,
 				05E9C38D10C9565600164773 /* MOOV_Support.cpp in Sources */,
+				2E48993814CECEB2000F92DD /* HandlerRegistry.cpp in Sources */,
+				2E48994014CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */,
+				2E48994114CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */,
+				2E48994714CEDBDD000F92DD /* ID3_Support.cpp in Sources */,
+				2E48995214CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */,
+				2E48995314CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */,
+				2E48995414CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */,
+				2E48996414CEDC04000F92DD /* Chunk.cpp in Sources */,
+				2E48996514CEDC04000F92DD /* ChunkController.cpp in Sources */,
+				2E48996614CEDC04000F92DD /* ChunkPath.cpp in Sources */,
+				2E48996714CEDC04000F92DD /* IChunkBehavior.cpp in Sources */,
+				2E48998414CEDC24000F92DD /* BEXTMetadata.cpp in Sources */,
+				2E48998514CEDC24000F92DD /* CartMetadata.cpp in Sources */,
+				2E48998614CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */,
+				2E48998714CEDC24000F92DD /* DISPMetadata.cpp in Sources */,
+				2E48998814CEDC24000F92DD /* INFOMetadata.cpp in Sources */,
+				2E48998914CEDC24000F92DD /* PrmLMetadata.cpp in Sources */,
+				2E48998A14CEDC24000F92DD /* WAVEBehavior.cpp in Sources */,
+				2E48998B14CEDC24000F92DD /* WAVEReconcile.cpp in Sources */,
+				2E4899A114CEDC87000F92DD /* IMetadata.cpp in Sources */,
+				2E4899A214CEDC87000F92DD /* IReconcile.cpp in Sources */,
+				2E4899A314CEDC87000F92DD /* MetadataSet.cpp in Sources */,
+				2E4899B414CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */,
+				2E4899B514CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */,
+				2E4899B614CEDD61000F92DD /* XIO.cpp in Sources */,
+				2E4899B714CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */,
+				2E4FC47714D00EB90085E444 /* FileHandlerInstance.cpp in Sources */,
+				2E4FC47814D00EB90085E444 /* HostAPIImpl.cpp in Sources */,
+				2E4FC47914D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */,
+				2E4FC47A14D00EB90085E444 /* PluginManager.cpp in Sources */,
+				2E4FC47B14D00EB90085E444 /* XMPAtoms.cpp in Sources */,
+				2E4FC49614D0100A0085E444 /* Module.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -778,10 +996,8 @@
 				0190252C0E34DC7E000FC1F0 /* TIFF_Support.cpp in Sources */,
 				0190252D0E34DC7E000FC1F0 /* XMPScanner.cpp in Sources */,
 				2E19772A0E38B99800E7002F /* XML_Node.cpp in Sources */,
-				2E19772E0E38B9DB00E7002F /* LargeFileAccess.cpp in Sources */,
 				2E1977310E38B9ED00E7002F /* UnicodeConversions.cpp in Sources */,
 				2E19773A0E38BB5B00E7002F /* SWF_Support.cpp in Sources */,
-				2E1977D90E38CD5E00E7002F /* MD5.cpp in Sources */,
 				01C07CB10E39E44000029382 /* adler32.c in Sources */,
 				01C07CB20E39E44000029382 /* compress.c in Sources */,
 				01C07CB30E39E44000029382 /* crc32.c in Sources */,
@@ -802,6 +1018,38 @@
 				014AD4CD104FFA5800D3708E /* RIFF.cpp in Sources */,
 				05E9C38B10C9562200164773 /* XMP_LibUtils.cpp in Sources */,
 				05E9C38E10C9565600164773 /* MOOV_Support.cpp in Sources */,
+				2E48993914CECEB2000F92DD /* HandlerRegistry.cpp in Sources */,
+				2E48994214CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */,
+				2E48994314CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */,
+				2E48994814CEDBDD000F92DD /* ID3_Support.cpp in Sources */,
+				2E48995514CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */,
+				2E48995614CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */,
+				2E48995714CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */,
+				2E48996814CEDC04000F92DD /* Chunk.cpp in Sources */,
+				2E48996914CEDC04000F92DD /* ChunkController.cpp in Sources */,
+				2E48996A14CEDC04000F92DD /* ChunkPath.cpp in Sources */,
+				2E48996B14CEDC04000F92DD /* IChunkBehavior.cpp in Sources */,
+				2E48998C14CEDC24000F92DD /* BEXTMetadata.cpp in Sources */,
+				2E48998D14CEDC24000F92DD /* CartMetadata.cpp in Sources */,
+				2E48998E14CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */,
+				2E48998F14CEDC24000F92DD /* DISPMetadata.cpp in Sources */,
+				2E48999014CEDC24000F92DD /* INFOMetadata.cpp in Sources */,
+				2E48999114CEDC24000F92DD /* PrmLMetadata.cpp in Sources */,
+				2E48999214CEDC24000F92DD /* WAVEBehavior.cpp in Sources */,
+				2E48999314CEDC24000F92DD /* WAVEReconcile.cpp in Sources */,
+				2E4899A414CEDC87000F92DD /* IMetadata.cpp in Sources */,
+				2E4899A514CEDC87000F92DD /* IReconcile.cpp in Sources */,
+				2E4899A614CEDC87000F92DD /* MetadataSet.cpp in Sources */,
+				2E4899B814CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */,
+				2E4899B914CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */,
+				2E4899BA14CEDD61000F92DD /* XIO.cpp in Sources */,
+				2E4899BB14CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */,
+				2E4FC48614D00EB90085E444 /* FileHandlerInstance.cpp in Sources */,
+				2E4FC48714D00EB90085E444 /* HostAPIImpl.cpp in Sources */,
+				2E4FC48814D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */,
+				2E4FC48914D00EB90085E444 /* PluginManager.cpp in Sources */,
+				2E4FC48A14D00EB90085E444 /* XMPAtoms.cpp in Sources */,
+				2E4FC49914D0100A0085E444 /* Module.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -831,6 +1079,38 @@
 				014AD4C6104FFA4800D3708E /* RIFF_Handler.cpp in Sources */,
 				014AD4CB104FFA5800D3708E /* RIFF.cpp in Sources */,
 				05E9C38810C9562200164773 /* XMP_LibUtils.cpp in Sources */,
+				2E48993614CECEB2000F92DD /* HandlerRegistry.cpp in Sources */,
+				2E48993C14CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */,
+				2E48993D14CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */,
+				2E48994514CEDBDD000F92DD /* ID3_Support.cpp in Sources */,
+				2E48994C14CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */,
+				2E48994D14CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */,
+				2E48994E14CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */,
+				2E48995C14CEDC04000F92DD /* Chunk.cpp in Sources */,
+				2E48995D14CEDC04000F92DD /* ChunkController.cpp in Sources */,
+				2E48995E14CEDC04000F92DD /* ChunkPath.cpp in Sources */,
+				2E48995F14CEDC04000F92DD /* IChunkBehavior.cpp in Sources */,
+				2E48997414CEDC24000F92DD /* BEXTMetadata.cpp in Sources */,
+				2E48997514CEDC24000F92DD /* CartMetadata.cpp in Sources */,
+				2E48997614CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */,
+				2E48997714CEDC24000F92DD /* DISPMetadata.cpp in Sources */,
+				2E48997814CEDC24000F92DD /* INFOMetadata.cpp in Sources */,
+				2E48997914CEDC24000F92DD /* PrmLMetadata.cpp in Sources */,
+				2E48997A14CEDC24000F92DD /* WAVEBehavior.cpp in Sources */,
+				2E48997B14CEDC24000F92DD /* WAVEReconcile.cpp in Sources */,
+				2E48999B14CEDC87000F92DD /* IMetadata.cpp in Sources */,
+				2E48999C14CEDC87000F92DD /* IReconcile.cpp in Sources */,
+				2E48999D14CEDC87000F92DD /* MetadataSet.cpp in Sources */,
+				2E4899AC14CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */,
+				2E4899AD14CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */,
+				2E4899AE14CEDD61000F92DD /* XIO.cpp in Sources */,
+				2E4899AF14CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */,
+				2E4FC47C14D00EB90085E444 /* FileHandlerInstance.cpp in Sources */,
+				2E4FC47D14D00EB90085E444 /* HostAPIImpl.cpp in Sources */,
+				2E4FC47E14D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */,
+				2E4FC47F14D00EB90085E444 /* PluginManager.cpp in Sources */,
+				2E4FC48014D00EB90085E444 /* XMPAtoms.cpp in Sources */,
+				2E4FC49714D0100A0085E444 /* Module.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -860,40 +1140,49 @@
 				014AD4C9104FFA4800D3708E /* RIFF_Handler.cpp in Sources */,
 				014AD4CE104FFA5800D3708E /* RIFF.cpp in Sources */,
 				05E9C38910C9562200164773 /* XMP_LibUtils.cpp in Sources */,
+				2E48993714CECEB2000F92DD /* HandlerRegistry.cpp in Sources */,
+				2E48993E14CEDBC7000F92DD /* AIFF_Handler.cpp in Sources */,
+				2E48993F14CEDBC7000F92DD /* WAVE_Handler.cpp in Sources */,
+				2E48994614CEDBDD000F92DD /* ID3_Support.cpp in Sources */,
+				2E48994F14CEDBF3000F92DD /* AIFFBehavior.cpp in Sources */,
+				2E48995014CEDBF3000F92DD /* AIFFMetadata.cpp in Sources */,
+				2E48995114CEDBF3000F92DD /* AIFFReconcile.cpp in Sources */,
+				2E48996014CEDC04000F92DD /* Chunk.cpp in Sources */,
+				2E48996114CEDC04000F92DD /* ChunkController.cpp in Sources */,
+				2E48996214CEDC04000F92DD /* ChunkPath.cpp in Sources */,
+				2E48996314CEDC04000F92DD /* IChunkBehavior.cpp in Sources */,
+				2E48997C14CEDC24000F92DD /* BEXTMetadata.cpp in Sources */,
+				2E48997D14CEDC24000F92DD /* CartMetadata.cpp in Sources */,
+				2E48997E14CEDC24000F92DD /* Cr8rMetadata.cpp in Sources */,
+				2E48997F14CEDC24000F92DD /* DISPMetadata.cpp in Sources */,
+				2E48998014CEDC24000F92DD /* INFOMetadata.cpp in Sources */,
+				2E48998114CEDC24000F92DD /* PrmLMetadata.cpp in Sources */,
+				2E48998214CEDC24000F92DD /* WAVEBehavior.cpp in Sources */,
+				2E48998314CEDC24000F92DD /* WAVEReconcile.cpp in Sources */,
+				2E48999E14CEDC87000F92DD /* IMetadata.cpp in Sources */,
+				2E48999F14CEDC87000F92DD /* IReconcile.cpp in Sources */,
+				2E4899A014CEDC87000F92DD /* MetadataSet.cpp in Sources */,
+				2E4899B014CEDD61000F92DD /* Host_IO-Mac.cpp in Sources */,
+				2E4899B114CEDD61000F92DD /* Host_IO-POSIX.cpp in Sources */,
+				2E4899B214CEDD61000F92DD /* XIO.cpp in Sources */,
+				2E4899B314CEDD61000F92DD /* XMPFiles_IO.cpp in Sources */,
+				2E4FC48114D00EB90085E444 /* FileHandlerInstance.cpp in Sources */,
+				2E4FC48214D00EB90085E444 /* HostAPIImpl.cpp in Sources */,
+				2E4FC48314D00EB90085E444 /* OS_Utils_Mac.cpp in Sources */,
+				2E4FC48414D00EB90085E444 /* PluginManager.cpp in Sources */,
+				2E4FC48514D00EB90085E444 /* XMPAtoms.cpp in Sources */,
+				2E4FC49814D0100A0085E444 /* Module.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		01FC6D900B7B7858008559A1 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 01FC6CF20B7B7514008559A1 /* XMPFiles Release */;
-			targetProxy = 01FC6D8F0B7B7858008559A1 /* PBXContainerItemProxy */;
-		};
-		01FC6D920B7B7858008559A1 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 01FC6CD40B7B6D65008559A1 /* XMPFiles Debug */;
-			targetProxy = 01FC6D910B7B7858008559A1 /* PBXContainerItemProxy */;
-		};
-		DCF912BE09A3E6A40055523F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = DC49326B089A9441003ADAAF /* XMPCore Debug */;
-			targetProxy = DCF912BD09A3E6A40055523F /* PBXContainerItemProxy */;
-		};
-		DCF912C009A3E6A70055523F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = DC493293089A9726003ADAAF /* XMPCore Release */;
-			targetProxy = DCF912BF09A3E6A70055523F /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin XCBuildConfiguration section */
 		01FC6CEB0B7B6D65008559A1 /* Default */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DCE400F80951DAA90040D71F /* XMPToolkitSDK-Debug.xcconfig */;
 			buildSettings = {
-				PRODUCT_NAME = XMPFilesStaticDebug;
+				PRODUCT_NAME = XMPFilesStatic;
 			};
 			name = Default;
 		};
@@ -901,7 +1190,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DCE400F90951DAA90040D71F /* XMPToolkitSDK-Release.xcconfig */;
 			buildSettings = {
-				PRODUCT_NAME = XMPFilesStaticRelease;
+				PRODUCT_NAME = XMPFilesStatic;
 			};
 			name = Default;
 		};
@@ -916,7 +1205,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DCE400F80951DAA90040D71F /* XMPToolkitSDK-Debug.xcconfig */;
 			buildSettings = {
-				PRODUCT_NAME = XMPCoreStaticDebug;
+				PRODUCT_NAME = XMPCoreStatic;
 			};
 			name = Default;
 		};
@@ -924,14 +1213,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DCE400F90951DAA90040D71F /* XMPToolkitSDK-Release.xcconfig */;
 			buildSettings = {
-				PRODUCT_NAME = XMPCoreStaticRelease;
-			};
-			name = Default;
-		};
-		DCF912C209A3E6C60055523F /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "Build All";
+				PRODUCT_NAME = XMPCoreStatic;
 			};
 			name = Default;
 		};
@@ -978,14 +1260,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		DCF912C109A3E6C60055523F /* Build configuration list for PBXAggregateTarget "Build All" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DCF912C209A3E6C60055523F /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
diff --git a/build/xcode/XMPToolkitSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/build/xcode/XMPToolkitSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..25777df
--- /dev/null
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:XMPToolkitSDK.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/build/xcode/XMPToolkitSDK.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/build/xcode/XMPToolkitSDK.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..08de0be
--- /dev/null
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
+</dict>
+</plist>
diff --git a/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/Build All.xcscheme b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/Build All.xcscheme
new file mode 100644
index 0000000..919b1df
--- /dev/null
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/Build All.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DC49326B089A9441003ADAAF"
+               BuildableName = "libXMPCoreStatic.a"
+               BlueprintName = "XMPCore Debug"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DC493293089A9726003ADAAF"
+               BuildableName = "libXMPCoreStatic.a"
+               BlueprintName = "XMPCore Release"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "01FC6CD40B7B6D65008559A1"
+               BuildableName = "libXMPFilesStatic.a"
+               BlueprintName = "XMPFiles Debug"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "01FC6CF20B7B7514008559A1"
+               BuildableName = "libXMPFilesStatic.a"
+               BlueprintName = "XMPFiles Release"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Default">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Default">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Default"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPCore Debug.xcscheme b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPCore Debug.xcscheme
new file mode 100644
index 0000000..a035458
--- /dev/null
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPCore Debug.xcscheme
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DC49326B089A9441003ADAAF"
+               BuildableName = "libXMPCoreStatic.a"
+               BlueprintName = "XMPCore Debug"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Default">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Default">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Default"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPCore Release.xcscheme b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPCore Release.xcscheme
new file mode 100644
index 0000000..6b750af
--- /dev/null
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPCore Release.xcscheme
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DC493293089A9726003ADAAF"
+               BuildableName = "libXMPCoreStatic.a"
+               BlueprintName = "XMPCore Release"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Default">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Default">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Default"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPFiles Debug.xcscheme b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPFiles Debug.xcscheme
new file mode 100644
index 0000000..c047217
--- /dev/null
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPFiles Debug.xcscheme
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "01FC6CD40B7B6D65008559A1"
+               BuildableName = "libXMPFilesStatic.a"
+               BlueprintName = "XMPFiles Debug"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Default">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Default">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Default"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPFiles Release.xcscheme b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPFiles Release.xcscheme
new file mode 100644
index 0000000..72b9f31
--- /dev/null
+++ b/build/xcode/XMPToolkitSDK.xcodeproj/xcshareddata/xcschemes/XMPFiles Release.xcscheme
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "01FC6CF20B7B7514008559A1"
+               BuildableName = "libXMPFilesStatic.a"
+               BlueprintName = "XMPFiles Release"
+               ReferencedContainer = "container:XMPToolkitSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Default">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Default"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Default">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Default"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/build/xcode3/expat_config.h b/build/xcode/expat_config.h
index a21de6e..a21de6e 100644
--- a/build/xcode3/expat_config.h
+++ b/build/xcode/expat_config.h
author	Hubert Figuière <hub@figuiere.net>	2013-05-14 18:54:10 -0400
committer	Hubert Figuière <hub@figuiere.net>	2013-05-14 20:25:20 -0400
commit	f27e317d9f722d74895ad8ba0da1b3d3d81b0f76 (patch)
tree	e9ee3d18d09c9a1c2a3a90b84e53accb1a4ad793 /build
parent	82aa3670838622e6ee645ebecfe2abd93ec56836 (diff)
parent	81a4c6bcb1879cb321246590faca595e9746f8e5 (diff)