diff --git a/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj b/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
index a77dec16a..e499706be 100644
--- a/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
+++ b/Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
@@ -102,6 +102,46 @@
 		832389501D2246C300482226 /* hca.c in Sources */ = {isa = PBXBuildFile; fileRef = 8323894F1D2246C300482226 /* hca.c */; };
 		832389521D224C0800482226 /* hca_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 832389511D224C0800482226 /* hca_decoder.c */; };
 		83256BC8286662840036D9C0 /* libmpg123.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83256BC7286662610036D9C0 /* libmpg123.0.dylib */; };
+		83256CBF28666C620036D9C0 /* l12tabs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9728666C620036D9C0 /* l12tabs.h */; };
+		83256CC028666C620036D9C0 /* synth_8bit.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9828666C620036D9C0 /* synth_8bit.h */; };
+		83256CC128666C620036D9C0 /* index.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9928666C620036D9C0 /* index.h */; };
+		83256CC228666C620036D9C0 /* synth_ntom.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9A28666C620036D9C0 /* synth_ntom.h */; };
+		83256CC328666C620036D9C0 /* reader.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9B28666C620036D9C0 /* reader.h */; };
+		83256CC428666C620036D9C0 /* debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9C28666C620036D9C0 /* debug.h */; };
+		83256CC528666C620036D9C0 /* mpg123.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9D28666C620036D9C0 /* mpg123.h */; };
+		83256CC628666C620036D9C0 /* dither.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9E28666C620036D9C0 /* dither.h */; };
+		83256CC728666C620036D9C0 /* optimize.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256C9F28666C620036D9C0 /* optimize.h */; };
+		83256CC828666C620036D9C0 /* getbits.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA028666C620036D9C0 /* getbits.h */; };
+		83256CC928666C620036D9C0 /* synth.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA128666C620036D9C0 /* synth.h */; };
+		83256CCA28666C620036D9C0 /* synths.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA228666C620036D9C0 /* synths.h */; };
+		83256CCB28666C620036D9C0 /* mangle.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA328666C620036D9C0 /* mangle.h */; };
+		83256CCC28666C620036D9C0 /* init_layer12.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA428666C620036D9C0 /* init_layer12.h */; };
+		83256CCD28666C620036D9C0 /* frame.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA528666C620036D9C0 /* frame.h */; };
+		83256CCE28666C620036D9C0 /* parse.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA628666C620036D9C0 /* parse.h */; };
+		83256CCF28666C620036D9C0 /* synth_sse3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA728666C620036D9C0 /* synth_sse3d.h */; };
+		83256CD028666C620036D9C0 /* l3bandgain.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA828666C620036D9C0 /* l3bandgain.h */; };
+		83256CD128666C620036D9C0 /* mpg123lib_intern.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CA928666C620036D9C0 /* mpg123lib_intern.h */; };
+		83256CD228666C620036D9C0 /* init_layer3.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CAA28666C620036D9C0 /* init_layer3.h */; };
+		83256CD328666C620036D9C0 /* getcpuflags.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CAB28666C620036D9C0 /* getcpuflags.h */; };
+		83256CD428666C620036D9C0 /* icy.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CAC28666C620036D9C0 /* icy.h */; };
+		83256CD528666C620036D9C0 /* fmt123.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CAD28666C620036D9C0 /* fmt123.h */; };
+		83256CD628666C620036D9C0 /* newhuffman.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CAE28666C620036D9C0 /* newhuffman.h */; };
+		83256CD728666C620036D9C0 /* synth_mono.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CAF28666C620036D9C0 /* synth_mono.h */; };
+		83256CD828666C620036D9C0 /* gapless.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB028666C620036D9C0 /* gapless.h */; };
+		83256CD928666C620036D9C0 /* costabs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB128666C620036D9C0 /* costabs.h */; };
+		83256CDA28666C620036D9C0 /* l2tables.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB228666C620036D9C0 /* l2tables.h */; };
+		83256CDB28666C620036D9C0 /* swap_bytes_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB328666C620036D9C0 /* swap_bytes_impl.h */; };
+		83256CDC28666C620036D9C0 /* icy2utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB428666C620036D9C0 /* icy2utf8.h */; };
+		83256CDD28666C620036D9C0 /* l3tabs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB528666C620036D9C0 /* l3tabs.h */; };
+		83256CDE28666C620036D9C0 /* dither_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB628666C620036D9C0 /* dither_impl.h */; };
+		83256CDF28666C620036D9C0 /* mpeghead.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB728666C620036D9C0 /* mpeghead.h */; };
+		83256CE028666C620036D9C0 /* huffman.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB828666C620036D9C0 /* huffman.h */; };
+		83256CE128666C620036D9C0 /* sample.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CB928666C620036D9C0 /* sample.h */; };
+		83256CE228666C620036D9C0 /* init_costabs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CBA28666C620036D9C0 /* init_costabs.h */; };
+		83256CE328666C620036D9C0 /* decode.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CBB28666C620036D9C0 /* decode.h */; };
+		83256CE428666C620036D9C0 /* abi_align.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CBC28666C620036D9C0 /* abi_align.h */; };
+		83256CE528666C620036D9C0 /* true.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CBD28666C620036D9C0 /* true.h */; };
+		83256CE628666C620036D9C0 /* id3.h in Headers */ = {isa = PBXBuildFile; fileRef = 83256CBE28666C620036D9C0 /* id3.h */; };
 		83269DD22399F5DE00F49FE3 /* nus3bank_streamfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 83269DD02399F5DD00F49FE3 /* nus3bank_streamfile.h */; };
 		83269DD32399F5DE00F49FE3 /* ivag.c in Sources */ = {isa = PBXBuildFile; fileRef = 83269DD12399F5DE00F49FE3 /* ivag.c */; };
 		83299FD01E7660C7003A3242 /* bik.c in Sources */ = {isa = PBXBuildFile; fileRef = 83299FCE1E7660C7003A3242 /* bik.c */; };
@@ -884,47 +924,47 @@
 		8322ECE6240268BA009E9429 /* raw_al.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raw_al.c; sourceTree = "<group>"; };
 		8323894F1D2246C300482226 /* hca.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hca.c; sourceTree = "<group>"; };
 		832389511D224C0800482226 /* hca_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hca_decoder.c; sourceTree = "<group>"; };
-		83256B9D286662610036D9C0 /* l12tabs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = l12tabs.h; sourceTree = "<group>"; };
-		83256B9E286662610036D9C0 /* synth_8bit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = synth_8bit.h; sourceTree = "<group>"; };
-		83256B9F286662610036D9C0 /* index.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = index.h; sourceTree = "<group>"; };
-		83256BA0286662610036D9C0 /* synth_ntom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = synth_ntom.h; sourceTree = "<group>"; };
-		83256BA1286662610036D9C0 /* reader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
-		83256BA2286662610036D9C0 /* debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		83256BA3286662610036D9C0 /* mpg123.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpg123.h; sourceTree = "<group>"; };
-		83256BA4286662610036D9C0 /* dither.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = "<group>"; };
-		83256BA5286662610036D9C0 /* optimize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = optimize.h; sourceTree = "<group>"; };
-		83256BA6286662610036D9C0 /* getbits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = getbits.h; sourceTree = "<group>"; };
-		83256BA7286662610036D9C0 /* synth.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = synth.h; sourceTree = "<group>"; };
-		83256BA8286662610036D9C0 /* synths.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = synths.h; sourceTree = "<group>"; };
-		83256BA9286662610036D9C0 /* mangle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mangle.h; sourceTree = "<group>"; };
-		83256BAA286662610036D9C0 /* init_layer12.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = init_layer12.h; sourceTree = "<group>"; };
-		83256BAB286662610036D9C0 /* frame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = frame.h; sourceTree = "<group>"; };
-		83256BAC286662610036D9C0 /* parse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = parse.h; sourceTree = "<group>"; };
-		83256BAD286662610036D9C0 /* synth_sse3d.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = synth_sse3d.h; sourceTree = "<group>"; };
-		83256BAE286662610036D9C0 /* l3bandgain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = l3bandgain.h; sourceTree = "<group>"; };
-		83256BAF286662610036D9C0 /* mpg123lib_intern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpg123lib_intern.h; sourceTree = "<group>"; };
-		83256BB0286662610036D9C0 /* init_layer3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = init_layer3.h; sourceTree = "<group>"; };
-		83256BB1286662610036D9C0 /* getcpuflags.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = getcpuflags.h; sourceTree = "<group>"; };
-		83256BB2286662610036D9C0 /* icy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = icy.h; sourceTree = "<group>"; };
-		83256BB3286662610036D9C0 /* fmt123.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fmt123.h; sourceTree = "<group>"; };
-		83256BB4286662610036D9C0 /* newhuffman.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newhuffman.h; sourceTree = "<group>"; };
-		83256BB5286662610036D9C0 /* synth_mono.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = synth_mono.h; sourceTree = "<group>"; };
-		83256BB6286662610036D9C0 /* gapless.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gapless.h; sourceTree = "<group>"; };
-		83256BB7286662610036D9C0 /* costabs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = costabs.h; sourceTree = "<group>"; };
-		83256BB8286662610036D9C0 /* l2tables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = l2tables.h; sourceTree = "<group>"; };
-		83256BB9286662610036D9C0 /* swap_bytes_impl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = swap_bytes_impl.h; sourceTree = "<group>"; };
-		83256BBA286662610036D9C0 /* icy2utf8.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = icy2utf8.h; sourceTree = "<group>"; };
-		83256BBB286662610036D9C0 /* l3tabs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = l3tabs.h; sourceTree = "<group>"; };
-		83256BBC286662610036D9C0 /* dither_impl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dither_impl.h; sourceTree = "<group>"; };
-		83256BBD286662610036D9C0 /* mpeghead.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpeghead.h; sourceTree = "<group>"; };
-		83256BBE286662610036D9C0 /* huffman.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = huffman.h; sourceTree = "<group>"; };
-		83256BBF286662610036D9C0 /* sample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };
-		83256BC0286662610036D9C0 /* init_costabs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = init_costabs.h; sourceTree = "<group>"; };
-		83256BC1286662610036D9C0 /* decode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = decode.h; sourceTree = "<group>"; };
-		83256BC2286662610036D9C0 /* abi_align.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = abi_align.h; sourceTree = "<group>"; };
-		83256BC3286662610036D9C0 /* true.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = true.h; sourceTree = "<group>"; };
-		83256BC4286662610036D9C0 /* id3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = id3.h; sourceTree = "<group>"; };
 		83256BC7286662610036D9C0 /* libmpg123.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libmpg123.0.dylib; sourceTree = "<group>"; };
+		83256C9728666C620036D9C0 /* l12tabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l12tabs.h; sourceTree = "<group>"; };
+		83256C9828666C620036D9C0 /* synth_8bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_8bit.h; sourceTree = "<group>"; };
+		83256C9928666C620036D9C0 /* index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = index.h; sourceTree = "<group>"; };
+		83256C9A28666C620036D9C0 /* synth_ntom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_ntom.h; sourceTree = "<group>"; };
+		83256C9B28666C620036D9C0 /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
+		83256C9C28666C620036D9C0 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
+		83256C9D28666C620036D9C0 /* mpg123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123.h; sourceTree = "<group>"; };
+		83256C9E28666C620036D9C0 /* dither.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = "<group>"; };
+		83256C9F28666C620036D9C0 /* optimize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = optimize.h; sourceTree = "<group>"; };
+		83256CA028666C620036D9C0 /* getbits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getbits.h; sourceTree = "<group>"; };
+		83256CA128666C620036D9C0 /* synth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth.h; sourceTree = "<group>"; };
+		83256CA228666C620036D9C0 /* synths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synths.h; sourceTree = "<group>"; };
+		83256CA328666C620036D9C0 /* mangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mangle.h; sourceTree = "<group>"; };
+		83256CA428666C620036D9C0 /* init_layer12.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_layer12.h; sourceTree = "<group>"; };
+		83256CA528666C620036D9C0 /* frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frame.h; sourceTree = "<group>"; };
+		83256CA628666C620036D9C0 /* parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse.h; sourceTree = "<group>"; };
+		83256CA728666C620036D9C0 /* synth_sse3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_sse3d.h; sourceTree = "<group>"; };
+		83256CA828666C620036D9C0 /* l3bandgain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l3bandgain.h; sourceTree = "<group>"; };
+		83256CA928666C620036D9C0 /* mpg123lib_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123lib_intern.h; sourceTree = "<group>"; };
+		83256CAA28666C620036D9C0 /* init_layer3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_layer3.h; sourceTree = "<group>"; };
+		83256CAB28666C620036D9C0 /* getcpuflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getcpuflags.h; sourceTree = "<group>"; };
+		83256CAC28666C620036D9C0 /* icy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy.h; sourceTree = "<group>"; };
+		83256CAD28666C620036D9C0 /* fmt123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmt123.h; sourceTree = "<group>"; };
+		83256CAE28666C620036D9C0 /* newhuffman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newhuffman.h; sourceTree = "<group>"; };
+		83256CAF28666C620036D9C0 /* synth_mono.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_mono.h; sourceTree = "<group>"; };
+		83256CB028666C620036D9C0 /* gapless.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gapless.h; sourceTree = "<group>"; };
+		83256CB128666C620036D9C0 /* costabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = costabs.h; sourceTree = "<group>"; };
+		83256CB228666C620036D9C0 /* l2tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l2tables.h; sourceTree = "<group>"; };
+		83256CB328666C620036D9C0 /* swap_bytes_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swap_bytes_impl.h; sourceTree = "<group>"; };
+		83256CB428666C620036D9C0 /* icy2utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy2utf8.h; sourceTree = "<group>"; };
+		83256CB528666C620036D9C0 /* l3tabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l3tabs.h; sourceTree = "<group>"; };
+		83256CB628666C620036D9C0 /* dither_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither_impl.h; sourceTree = "<group>"; };
+		83256CB728666C620036D9C0 /* mpeghead.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeghead.h; sourceTree = "<group>"; };
+		83256CB828666C620036D9C0 /* huffman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = huffman.h; sourceTree = "<group>"; };
+		83256CB928666C620036D9C0 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };
+		83256CBA28666C620036D9C0 /* init_costabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_costabs.h; sourceTree = "<group>"; };
+		83256CBB28666C620036D9C0 /* decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode.h; sourceTree = "<group>"; };
+		83256CBC28666C620036D9C0 /* abi_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = abi_align.h; sourceTree = "<group>"; };
+		83256CBD28666C620036D9C0 /* true.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = true.h; sourceTree = "<group>"; };
+		83256CBE28666C620036D9C0 /* id3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = id3.h; sourceTree = "<group>"; };
 		83269DD02399F5DD00F49FE3 /* nus3bank_streamfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nus3bank_streamfile.h; sourceTree = "<group>"; };
 		83269DD12399F5DE00F49FE3 /* ivag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ivag.c; sourceTree = "<group>"; };
 		83299FCE1E7660C7003A3242 /* bik.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bik.c; sourceTree = "<group>"; };
@@ -1559,58 +1599,11 @@
 		83256B9B286662610036D9C0 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				83256B9C286662610036D9C0 /* libmpg123 */,
+				83256C9628666C620036D9C0 /* mpg123 */,
 			);
 			path = include;
 			sourceTree = "<group>";
 		};
-		83256B9C286662610036D9C0 /* libmpg123 */ = {
-			isa = PBXGroup;
-			children = (
-				83256B9D286662610036D9C0 /* l12tabs.h */,
-				83256B9E286662610036D9C0 /* synth_8bit.h */,
-				83256B9F286662610036D9C0 /* index.h */,
-				83256BA0286662610036D9C0 /* synth_ntom.h */,
-				83256BA1286662610036D9C0 /* reader.h */,
-				83256BA2286662610036D9C0 /* debug.h */,
-				83256BA3286662610036D9C0 /* mpg123.h */,
-				83256BA4286662610036D9C0 /* dither.h */,
-				83256BA5286662610036D9C0 /* optimize.h */,
-				83256BA6286662610036D9C0 /* getbits.h */,
-				83256BA7286662610036D9C0 /* synth.h */,
-				83256BA8286662610036D9C0 /* synths.h */,
-				83256BA9286662610036D9C0 /* mangle.h */,
-				83256BAA286662610036D9C0 /* init_layer12.h */,
-				83256BAB286662610036D9C0 /* frame.h */,
-				83256BAC286662610036D9C0 /* parse.h */,
-				83256BAD286662610036D9C0 /* synth_sse3d.h */,
-				83256BAE286662610036D9C0 /* l3bandgain.h */,
-				83256BAF286662610036D9C0 /* mpg123lib_intern.h */,
-				83256BB0286662610036D9C0 /* init_layer3.h */,
-				83256BB1286662610036D9C0 /* getcpuflags.h */,
-				83256BB2286662610036D9C0 /* icy.h */,
-				83256BB3286662610036D9C0 /* fmt123.h */,
-				83256BB4286662610036D9C0 /* newhuffman.h */,
-				83256BB5286662610036D9C0 /* synth_mono.h */,
-				83256BB6286662610036D9C0 /* gapless.h */,
-				83256BB7286662610036D9C0 /* costabs.h */,
-				83256BB8286662610036D9C0 /* l2tables.h */,
-				83256BB9286662610036D9C0 /* swap_bytes_impl.h */,
-				83256BBA286662610036D9C0 /* icy2utf8.h */,
-				83256BBB286662610036D9C0 /* l3tabs.h */,
-				83256BBC286662610036D9C0 /* dither_impl.h */,
-				83256BBD286662610036D9C0 /* mpeghead.h */,
-				83256BBE286662610036D9C0 /* huffman.h */,
-				83256BBF286662610036D9C0 /* sample.h */,
-				83256BC0286662610036D9C0 /* init_costabs.h */,
-				83256BC1286662610036D9C0 /* decode.h */,
-				83256BC2286662610036D9C0 /* abi_align.h */,
-				83256BC3286662610036D9C0 /* true.h */,
-				83256BC4286662610036D9C0 /* id3.h */,
-			);
-			path = libmpg123;
-			sourceTree = "<group>";
-		};
 		83256BC6286662610036D9C0 /* lib */ = {
 			isa = PBXGroup;
 			children = (
@@ -1619,6 +1612,53 @@
 			path = lib;
 			sourceTree = "<group>";
 		};
+		83256C9628666C620036D9C0 /* mpg123 */ = {
+			isa = PBXGroup;
+			children = (
+				83256C9728666C620036D9C0 /* l12tabs.h */,
+				83256C9828666C620036D9C0 /* synth_8bit.h */,
+				83256C9928666C620036D9C0 /* index.h */,
+				83256C9A28666C620036D9C0 /* synth_ntom.h */,
+				83256C9B28666C620036D9C0 /* reader.h */,
+				83256C9C28666C620036D9C0 /* debug.h */,
+				83256C9D28666C620036D9C0 /* mpg123.h */,
+				83256C9E28666C620036D9C0 /* dither.h */,
+				83256C9F28666C620036D9C0 /* optimize.h */,
+				83256CA028666C620036D9C0 /* getbits.h */,
+				83256CA128666C620036D9C0 /* synth.h */,
+				83256CA228666C620036D9C0 /* synths.h */,
+				83256CA328666C620036D9C0 /* mangle.h */,
+				83256CA428666C620036D9C0 /* init_layer12.h */,
+				83256CA528666C620036D9C0 /* frame.h */,
+				83256CA628666C620036D9C0 /* parse.h */,
+				83256CA728666C620036D9C0 /* synth_sse3d.h */,
+				83256CA828666C620036D9C0 /* l3bandgain.h */,
+				83256CA928666C620036D9C0 /* mpg123lib_intern.h */,
+				83256CAA28666C620036D9C0 /* init_layer3.h */,
+				83256CAB28666C620036D9C0 /* getcpuflags.h */,
+				83256CAC28666C620036D9C0 /* icy.h */,
+				83256CAD28666C620036D9C0 /* fmt123.h */,
+				83256CAE28666C620036D9C0 /* newhuffman.h */,
+				83256CAF28666C620036D9C0 /* synth_mono.h */,
+				83256CB028666C620036D9C0 /* gapless.h */,
+				83256CB128666C620036D9C0 /* costabs.h */,
+				83256CB228666C620036D9C0 /* l2tables.h */,
+				83256CB328666C620036D9C0 /* swap_bytes_impl.h */,
+				83256CB428666C620036D9C0 /* icy2utf8.h */,
+				83256CB528666C620036D9C0 /* l3tabs.h */,
+				83256CB628666C620036D9C0 /* dither_impl.h */,
+				83256CB728666C620036D9C0 /* mpeghead.h */,
+				83256CB828666C620036D9C0 /* huffman.h */,
+				83256CB928666C620036D9C0 /* sample.h */,
+				83256CBA28666C620036D9C0 /* init_costabs.h */,
+				83256CBB28666C620036D9C0 /* decode.h */,
+				83256CBC28666C620036D9C0 /* abi_align.h */,
+				83256CBD28666C620036D9C0 /* true.h */,
+				83256CBE28666C620036D9C0 /* id3.h */,
+			);
+			path = mpg123;
+			sourceTree = "<group>";
+		};
 		835FC6C223F62AEE006960FA /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -2435,12 +2475,18 @@
 				83D26A8226E66DC2001A9475 /* chunks.h in Headers */,
 				836F705518BDC2190095E648 /* streamtypes.h in Headers */,
 				836F6F3518BDC2190095E648 /* nwa_decoder.h in Headers */,
+				83256CC328666C620036D9C0 /* reader.h in Headers */,
+				83256CCA28666C620036D9C0 /* synths.h in Headers */,
 				83031EC9243C50A800C3F3E0 /* circus_decoder_lzxpcm.h in Headers */,
 				8346D97A25BF838C00D1A8B0 /* idtech_streamfile.h in Headers */,
 				8346D98425BF83B300D1A8B0 /* coding_utils_samples.h in Headers */,
+				83256CE228666C620036D9C0 /* init_costabs.h in Headers */,
 				83D26A8326E66DC2001A9475 /* log.h in Headers */,
 				83C7282222BC893D00678B4A /* mta2_streamfile.h in Headers */,
+				83256CC628666C620036D9C0 /* dither.h in Headers */,
 				83AA7F802519C042004C5298 /* sab_streamfile.h in Headers */,
+				83256CE028666C620036D9C0 /* huffman.h in Headers */,
+				83256CC928666C620036D9C0 /* synth.h in Headers */,
 				836F46B8282087A6005B9B87 /* cri_utf.h in Headers */,
 				83A21F87201D8981000F04B9 /* fsb_keys.h in Headers */,
 				83E7FD6325EF2B0C00683FD2 /* tac_decoder_lib_data.h in Headers */,
@@ -2449,20 +2495,29 @@
 				834FE0EC215C79ED000A5D3D /* kma9_streamfile.h in Headers */,
 				83E7FD6225EF2B0C00683FD2 /* tac_decoder_lib_ops.h in Headers */,
 				83AF2CCC26226BA500538240 /* encrypted_bgm_streamfile.h in Headers */,
+				83256CCE28666C620036D9C0 /* parse.h in Headers */,
+				83256CD328666C620036D9C0 /* getcpuflags.h in Headers */,
 				8349A90F1FE6258200E26435 /* aix_streamfile.h in Headers */,
 				83B46FD52707FB9A00847FC9 /* endianness.h in Headers */,
 				836F705718BDC2190095E648 /* util.h in Headers */,
 				83C7282722BC8C1500678B4A /* plugins.h in Headers */,
+				83256CC128666C620036D9C0 /* index.h in Headers */,
 				834FE0ED215C79ED000A5D3D /* fsb_interleave_streamfile.h in Headers */,
 				8351F32E2212B57000A606E4 /* ubi_bao_streamfile.h in Headers */,
 				8349A9111FE6258200E26435 /* bar_streamfile.h in Headers */,
+				83256CE128666C620036D9C0 /* sample.h in Headers */,
 				83D2007A248DDB770048BD24 /* fsb_encrypted_streamfile.h in Headers */,
 				836F6F2718BDC2190095E648 /* g72x_state.h in Headers */,
+				83256CE628666C620036D9C0 /* id3.h in Headers */,
 				83C7282822BC8C1500678B4A /* mixing.h in Headers */,
 				832BF82C21E0514B006F50F1 /* hca_keys_awb.h in Headers */,
 				839933602591E8C1001855AF /* ubi_sb_garbage_streamfile.h in Headers */,
+				83256CDE28666C620036D9C0 /* dither_impl.h in Headers */,
 				8306B0E020984590000302D4 /* ppst_streamfile.h in Headers */,
+				83256CC228666C620036D9C0 /* synth_ntom.h in Headers */,
+				83256CCD28666C620036D9C0 /* frame.h in Headers */,
 				83AA7F722519BFEA004C5298 /* vorbis_bitreader.h in Headers */,
+				83256CD628666C620036D9C0 /* newhuffman.h in Headers */,
 				834FE0BA215C798C000A5D3D /* ea_mt_decoder_utk.h in Headers */,
 				83B46FD12707FB2100847FC9 /* at3plus_decoder.h in Headers */,
 				835C883722CC17BE001B4B3F /* ogg_vorbis_streamfile.h in Headers */,
@@ -2473,16 +2528,23 @@
 				83031EDB243C510500C3F3E0 /* xnb_lz4mg.h in Headers */,
 				836F705418BDC2190095E648 /* streamfile.h in Headers */,
 				835B9B922730BF2D00F87EE3 /* hca_bf.h in Headers */,
+				83256CDD28666C620036D9C0 /* l3tabs.h in Headers */,
 				83A3F0761E3AD8B900D6A794 /* stack_alloc.h in Headers */,
 				8373342723F60CDC00DE14DC /* lrmd_streamfile.h in Headers */,
 				83C7281122BC893D00678B4A /* 9tav_streamfile.h in Headers */,
+				83256CD928666C620036D9C0 /* costabs.h in Headers */,
 				83C7280F22BC893D00678B4A /* xwb_xsb.h in Headers */,
 				8315868B26F586F900803A3A /* m2_psb.h in Headers */,
 				83AA7F732519BFEA004C5298 /* mpeg_bitreader.h in Headers */,
+				83256CD428666C620036D9C0 /* icy.h in Headers */,
+				83256CDC28666C620036D9C0 /* icy2utf8.h in Headers */,
 				832FC36F278FAE3E0056A860 /* encrypted_mc161_streamfile.h in Headers */,
+				83256CD228666C620036D9C0 /* init_layer3.h in Headers */,
+				83256CD128666C620036D9C0 /* mpg123lib_intern.h in Headers */,
 				83C7281622BC893D00678B4A /* xwma_konami_streamfile.h in Headers */,
 				839E21E81F2EDAF100EE54D7 /* mpeg_decoder.h in Headers */,
 				839E21E51F2EDAF100EE54D7 /* vorbis_custom_decoder.h in Headers */,
+				83256CC028666C620036D9C0 /* synth_8bit.h in Headers */,
 				837CEADB23487E8300E62A4A /* bgw_streamfile.h in Headers */,
 				837CEB0323487F2C00E62A4A /* xavs_streamfile.h in Headers */,
 				836F705918BDC2190095E648 /* vgmstream.h in Headers */,
@@ -2491,16 +2553,20 @@
 				8306B0DE20984590000302D4 /* awc_xma_streamfile.h in Headers */,
 				83031EC5243C50A800C3F3E0 /* circus_decoder_lib_data.h in Headers */,
 				834FE0B5215C798C000A5D3D /* acm_decoder_libacm.h in Headers */,
+				83256CE528666C620036D9C0 /* true.h in Headers */,
 				839E21E61F2EDAF100EE54D7 /* vorbis_custom_data_wwise.h in Headers */,
 				83AA7F8A2519C076004C5298 /* decode.h in Headers */,
 				8346D98725BF83B300D1A8B0 /* compresswave_decoder_lib.h in Headers */,
+				83256CDB28666C620036D9C0 /* swap_bytes_impl.h in Headers */,
 				8373342D23F60CDC00DE14DC /* bnsf_keys.h in Headers */,
 				834FE103215C79ED000A5D3D /* ea_schl_streamfile.h in Headers */,
+				83256CC528666C620036D9C0 /* mpg123.h in Headers */,
 				83F0AA6021E2028C004BBC04 /* vsv_streamfile.h in Headers */,
 				83FBD506235D31F800D35BCD /* riff_ogg_streamfile.h in Headers */,
 				8339B327280FDF4B0076F74B /* text_reader.h in Headers */,
 				836F6F9A18BDC2190095E648 /* meta.h in Headers */,
 				83A8BAE625667AA8000F5F3F /* ps2_enth_streamfile.h in Headers */,
+				83256CE428666C620036D9C0 /* abi_align.h in Headers */,
 				8306B0D820984590000302D4 /* ea_eaac_streamfile.h in Headers */,
 				837CEB0523487F2C00E62A4A /* sqex_sead_streamfile.h in Headers */,
 				83031ED9243C510500C3F3E0 /* ubi_lyn_streamfile.h in Headers */,
@@ -2513,17 +2579,31 @@
 				83FC417026D32FF5009A2022 /* hca_decoder_clhca.h in Headers */,
 				8373341623F60C7B00DE14DC /* g7221_decoder_aes.h in Headers */,
 				8373341923F60C7B00DE14DC /* g7221_decoder_lib_data.h in Headers */,
+				83256CCC28666C620036D9C0 /* init_layer12.h in Headers */,
 				83AFABBD23795202002F3947 /* ea_eaac_opus_streamfile.h in Headers */,
+				83256CBF28666C620036D9C0 /* l12tabs.h in Headers */,
+				83256CCF28666C620036D9C0 /* synth_sse3d.h in Headers */,
+				83256CD528666C620036D9C0 /* fmt123.h in Headers */,
 				83031EDA243C510500C3F3E0 /* mul_streamfile.h in Headers */,
+				83256CDF28666C620036D9C0 /* mpeghead.h in Headers */,
+				83256CD028666C620036D9C0 /* l3bandgain.h in Headers */,
 				83C7281822BC893D00678B4A /* sfh_streamfile.h in Headers */,
+				83256CD828666C620036D9C0 /* gapless.h in Headers */,
 				834FE0EF215C79ED000A5D3D /* xvag_streamfile.h in Headers */,
+				83256CC428666C620036D9C0 /* debug.h in Headers */,
 				83031EC4243C50A800C3F3E0 /* circus_decoder_miniz.h in Headers */,
+				83256CCB28666C620036D9C0 /* mangle.h in Headers */,
+				83256CD728666C620036D9C0 /* synth_mono.h in Headers */,
 				8349A91B1FE6258200E26435 /* adx_keys.h in Headers */,
 				836F6F4D18BDC2190095E648 /* layout.h in Headers */,
 				83269DD22399F5DE00F49FE3 /* nus3bank_streamfile.h in Headers */,
 				83AA5D251F6E2F9C0020821C /* hca_keys.h in Headers */,
 				83031EC7243C50A800C3F3E0 /* circus_decoder_lib.h in Headers */,
+				83256CDA28666C620036D9C0 /* l2tables.h in Headers */,
+				83256CC828666C620036D9C0 /* getbits.h in Headers */,
+				83256CC728666C620036D9C0 /* optimize.h in Headers */,
 				83031ED3243C50DF00C3F3E0 /* fsb5_streamfile.h in Headers */,
+				83256CE328666C620036D9C0 /* decode.h in Headers */,
 				836F6F2318BDC2190095E648 /* coding.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3424,6 +3504,7 @@
 					../../ThirdParty/vorbis/include,
 					../../ThirdParty/ogg/include,
 					../../ThirdParty/speex/include,
+					../../ThirdParty/mpg123/include,
 				);
 				INFOPLIST_FILE = "vgmstream/libvgmstream-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
@@ -3458,6 +3539,7 @@
 					../../ThirdParty/vorbis/include,
 					../../ThirdParty/ogg/include,
 					../../ThirdParty/speex/include,
+					../../ThirdParty/mpg123/include,
 				);
 				INFOPLIST_FILE = "vgmstream/libvgmstream-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
diff --git a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
index 2f68f3166..4dd17b016 100644
--- a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
+++ b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
@@ -39,47 +39,47 @@
 		83256B4928665A5D0036D9C0 /* libopenmpt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopenmpt.a; sourceTree = "<group>"; };
 		83256B4C28665B0A0036D9C0 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		83256B4D28665B540036D9C0 /* libvorbisfile.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.3.dylib; path = ../../ThirdParty/vorbis/lib/libvorbisfile.3.dylib; sourceTree = "<group>"; };
-		83256B6D286662360036D9C0 /* l12tabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l12tabs.h; sourceTree = "<group>"; };
-		83256B6E286662360036D9C0 /* synth_8bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_8bit.h; sourceTree = "<group>"; };
-		83256B6F286662360036D9C0 /* index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = index.h; sourceTree = "<group>"; };
-		83256B70286662360036D9C0 /* synth_ntom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_ntom.h; sourceTree = "<group>"; };
-		83256B71286662360036D9C0 /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
-		83256B72286662360036D9C0 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		83256B73286662360036D9C0 /* mpg123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123.h; sourceTree = "<group>"; };
-		83256B74286662360036D9C0 /* dither.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = "<group>"; };
-		83256B75286662360036D9C0 /* optimize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = optimize.h; sourceTree = "<group>"; };
-		83256B76286662360036D9C0 /* getbits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getbits.h; sourceTree = "<group>"; };
-		83256B77286662360036D9C0 /* synth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth.h; sourceTree = "<group>"; };
-		83256B78286662360036D9C0 /* synths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synths.h; sourceTree = "<group>"; };
-		83256B79286662360036D9C0 /* mangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mangle.h; sourceTree = "<group>"; };
-		83256B7A286662360036D9C0 /* init_layer12.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_layer12.h; sourceTree = "<group>"; };
-		83256B7B286662360036D9C0 /* frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frame.h; sourceTree = "<group>"; };
-		83256B7C286662360036D9C0 /* parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse.h; sourceTree = "<group>"; };
-		83256B7D286662360036D9C0 /* synth_sse3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_sse3d.h; sourceTree = "<group>"; };
-		83256B7E286662360036D9C0 /* l3bandgain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l3bandgain.h; sourceTree = "<group>"; };
-		83256B7F286662360036D9C0 /* mpg123lib_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123lib_intern.h; sourceTree = "<group>"; };
-		83256B80286662360036D9C0 /* init_layer3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_layer3.h; sourceTree = "<group>"; };
-		83256B81286662360036D9C0 /* getcpuflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getcpuflags.h; sourceTree = "<group>"; };
-		83256B82286662360036D9C0 /* icy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy.h; sourceTree = "<group>"; };
-		83256B83286662360036D9C0 /* fmt123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmt123.h; sourceTree = "<group>"; };
-		83256B84286662360036D9C0 /* newhuffman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newhuffman.h; sourceTree = "<group>"; };
-		83256B85286662360036D9C0 /* synth_mono.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_mono.h; sourceTree = "<group>"; };
-		83256B86286662360036D9C0 /* gapless.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gapless.h; sourceTree = "<group>"; };
-		83256B87286662360036D9C0 /* costabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = costabs.h; sourceTree = "<group>"; };
-		83256B88286662360036D9C0 /* l2tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l2tables.h; sourceTree = "<group>"; };
-		83256B89286662360036D9C0 /* swap_bytes_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swap_bytes_impl.h; sourceTree = "<group>"; };
-		83256B8A286662360036D9C0 /* icy2utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy2utf8.h; sourceTree = "<group>"; };
-		83256B8B286662360036D9C0 /* l3tabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l3tabs.h; sourceTree = "<group>"; };
-		83256B8C286662360036D9C0 /* dither_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither_impl.h; sourceTree = "<group>"; };
-		83256B8D286662360036D9C0 /* mpeghead.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeghead.h; sourceTree = "<group>"; };
-		83256B8E286662360036D9C0 /* huffman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = huffman.h; sourceTree = "<group>"; };
-		83256B8F286662360036D9C0 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };
-		83256B90286662360036D9C0 /* init_costabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_costabs.h; sourceTree = "<group>"; };
-		83256B91286662360036D9C0 /* decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode.h; sourceTree = "<group>"; };
-		83256B92286662360036D9C0 /* abi_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = abi_align.h; sourceTree = "<group>"; };
-		83256B93286662360036D9C0 /* true.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = true.h; sourceTree = "<group>"; };
-		83256B94286662360036D9C0 /* id3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = id3.h; sourceTree = "<group>"; };
 		83256B97286662360036D9C0 /* libmpg123.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libmpg123.0.dylib; sourceTree = "<group>"; };
+		83256CE828666C7F0036D9C0 /* l12tabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l12tabs.h; sourceTree = "<group>"; };
+		83256CE928666C7F0036D9C0 /* synth_8bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_8bit.h; sourceTree = "<group>"; };
+		83256CEA28666C7F0036D9C0 /* index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = index.h; sourceTree = "<group>"; };
+		83256CEB28666C7F0036D9C0 /* synth_ntom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_ntom.h; sourceTree = "<group>"; };
+		83256CEC28666C7F0036D9C0 /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
+		83256CED28666C7F0036D9C0 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
+		83256CEE28666C7F0036D9C0 /* mpg123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123.h; sourceTree = "<group>"; };
+		83256CEF28666C7F0036D9C0 /* dither.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = "<group>"; };
+		83256CF028666C7F0036D9C0 /* optimize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = optimize.h; sourceTree = "<group>"; };
+		83256CF128666C7F0036D9C0 /* getbits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getbits.h; sourceTree = "<group>"; };
+		83256CF228666C7F0036D9C0 /* synth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth.h; sourceTree = "<group>"; };
+		83256CF328666C7F0036D9C0 /* synths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synths.h; sourceTree = "<group>"; };
+		83256CF428666C7F0036D9C0 /* mangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mangle.h; sourceTree = "<group>"; };
+		83256CF528666C7F0036D9C0 /* init_layer12.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_layer12.h; sourceTree = "<group>"; };
+		83256CF628666C7F0036D9C0 /* frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frame.h; sourceTree = "<group>"; };
+		83256CF728666C7F0036D9C0 /* parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse.h; sourceTree = "<group>"; };
+		83256CF828666C7F0036D9C0 /* synth_sse3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_sse3d.h; sourceTree = "<group>"; };
+		83256CF928666C7F0036D9C0 /* l3bandgain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l3bandgain.h; sourceTree = "<group>"; };
+		83256CFA28666C7F0036D9C0 /* mpg123lib_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123lib_intern.h; sourceTree = "<group>"; };
+		83256CFB28666C7F0036D9C0 /* init_layer3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_layer3.h; sourceTree = "<group>"; };
+		83256CFC28666C7F0036D9C0 /* getcpuflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getcpuflags.h; sourceTree = "<group>"; };
+		83256CFD28666C7F0036D9C0 /* icy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy.h; sourceTree = "<group>"; };
+		83256CFE28666C7F0036D9C0 /* fmt123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fmt123.h; sourceTree = "<group>"; };
+		83256CFF28666C7F0036D9C0 /* newhuffman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newhuffman.h; sourceTree = "<group>"; };
+		83256D0028666C7F0036D9C0 /* synth_mono.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_mono.h; sourceTree = "<group>"; };
+		83256D0128666C7F0036D9C0 /* gapless.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gapless.h; sourceTree = "<group>"; };
+		83256D0228666C7F0036D9C0 /* costabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = costabs.h; sourceTree = "<group>"; };
+		83256D0328666C7F0036D9C0 /* l2tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l2tables.h; sourceTree = "<group>"; };
+		83256D0428666C7F0036D9C0 /* swap_bytes_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swap_bytes_impl.h; sourceTree = "<group>"; };
+		83256D0528666C7F0036D9C0 /* icy2utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy2utf8.h; sourceTree = "<group>"; };
+		83256D0628666C7F0036D9C0 /* l3tabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l3tabs.h; sourceTree = "<group>"; };
+		83256D0728666C7F0036D9C0 /* dither_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither_impl.h; sourceTree = "<group>"; };
+		83256D0828666C7F0036D9C0 /* mpeghead.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeghead.h; sourceTree = "<group>"; };
+		83256D0928666C7F0036D9C0 /* huffman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = huffman.h; sourceTree = "<group>"; };
+		83256D0A28666C7F0036D9C0 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };
+		83256D0B28666C7F0036D9C0 /* init_costabs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = init_costabs.h; sourceTree = "<group>"; };
+		83256D0C28666C7F0036D9C0 /* decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode.h; sourceTree = "<group>"; };
+		83256D0D28666C7F0036D9C0 /* abi_align.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = abi_align.h; sourceTree = "<group>"; };
+		83256D0E28666C7F0036D9C0 /* true.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = true.h; sourceTree = "<group>"; };
+		83256D0F28666C7F0036D9C0 /* id3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = id3.h; sourceTree = "<group>"; };
 		8372349A277AA1F600CD0A77 /* OMPTVersionCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OMPTVersionCheck.h; path = OpenMPT/OMPTVersionCheck.h; sourceTree = "<group>"; };
 		8372349B277AA23F00CD0A77 /* OMPTVersionCheck.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OMPTVersionCheck.m; path = OpenMPT/OMPTVersionCheck.m; sourceTree = "<group>"; };
 		83747C182862DB2F0021245F /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
@@ -173,58 +173,11 @@
 		83256B6B286662360036D9C0 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				83256B6C286662360036D9C0 /* libmpg123 */,
+				83256CE728666C7F0036D9C0 /* mpg123 */,
 			);
 			path = include;
 			sourceTree = "<group>";
 		};
-		83256B6C286662360036D9C0 /* libmpg123 */ = {
-			isa = PBXGroup;
-			children = (
-				83256B6D286662360036D9C0 /* l12tabs.h */,
-				83256B6E286662360036D9C0 /* synth_8bit.h */,
-				83256B6F286662360036D9C0 /* index.h */,
-				83256B70286662360036D9C0 /* synth_ntom.h */,
-				83256B71286662360036D9C0 /* reader.h */,
-				83256B72286662360036D9C0 /* debug.h */,
-				83256B73286662360036D9C0 /* mpg123.h */,
-				83256B74286662360036D9C0 /* dither.h */,
-				83256B75286662360036D9C0 /* optimize.h */,
-				83256B76286662360036D9C0 /* getbits.h */,
-				83256B77286662360036D9C0 /* synth.h */,
-				83256B78286662360036D9C0 /* synths.h */,
-				83256B79286662360036D9C0 /* mangle.h */,
-				83256B7A286662360036D9C0 /* init_layer12.h */,
-				83256B7B286662360036D9C0 /* frame.h */,
-				83256B7C286662360036D9C0 /* parse.h */,
-				83256B7D286662360036D9C0 /* synth_sse3d.h */,
-				83256B7E286662360036D9C0 /* l3bandgain.h */,
-				83256B7F286662360036D9C0 /* mpg123lib_intern.h */,
-				83256B80286662360036D9C0 /* init_layer3.h */,
-				83256B81286662360036D9C0 /* getcpuflags.h */,
-				83256B82286662360036D9C0 /* icy.h */,
-				83256B83286662360036D9C0 /* fmt123.h */,
-				83256B84286662360036D9C0 /* newhuffman.h */,
-				83256B85286662360036D9C0 /* synth_mono.h */,
-				83256B86286662360036D9C0 /* gapless.h */,
-				83256B87286662360036D9C0 /* costabs.h */,
-				83256B88286662360036D9C0 /* l2tables.h */,
-				83256B89286662360036D9C0 /* swap_bytes_impl.h */,
-				83256B8A286662360036D9C0 /* icy2utf8.h */,
-				83256B8B286662360036D9C0 /* l3tabs.h */,
-				83256B8C286662360036D9C0 /* dither_impl.h */,
-				83256B8D286662360036D9C0 /* mpeghead.h */,
-				83256B8E286662360036D9C0 /* huffman.h */,
-				83256B8F286662360036D9C0 /* sample.h */,
-				83256B90286662360036D9C0 /* init_costabs.h */,
-				83256B91286662360036D9C0 /* decode.h */,
-				83256B92286662360036D9C0 /* abi_align.h */,
-				83256B93286662360036D9C0 /* true.h */,
-				83256B94286662360036D9C0 /* id3.h */,
-			);
-			path = libmpg123;
-			sourceTree = "<group>";
-		};
 		83256B96286662360036D9C0 /* lib */ = {
 			isa = PBXGroup;
 			children = (
@@ -233,6 +186,53 @@
 			path = lib;
 			sourceTree = "<group>";
 		};
+		83256CE728666C7F0036D9C0 /* mpg123 */ = {
+			isa = PBXGroup;
+			children = (
+				83256CE828666C7F0036D9C0 /* l12tabs.h */,
+				83256CE928666C7F0036D9C0 /* synth_8bit.h */,
+				83256CEA28666C7F0036D9C0 /* index.h */,
+				83256CEB28666C7F0036D9C0 /* synth_ntom.h */,
+				83256CEC28666C7F0036D9C0 /* reader.h */,
+				83256CED28666C7F0036D9C0 /* debug.h */,
+				83256CEE28666C7F0036D9C0 /* mpg123.h */,
+				83256CEF28666C7F0036D9C0 /* dither.h */,
+				83256CF028666C7F0036D9C0 /* optimize.h */,
+				83256CF128666C7F0036D9C0 /* getbits.h */,
+				83256CF228666C7F0036D9C0 /* synth.h */,
+				83256CF328666C7F0036D9C0 /* synths.h */,
+				83256CF428666C7F0036D9C0 /* mangle.h */,
+				83256CF528666C7F0036D9C0 /* init_layer12.h */,
+				83256CF628666C7F0036D9C0 /* frame.h */,
+				83256CF728666C7F0036D9C0 /* parse.h */,
+				83256CF828666C7F0036D9C0 /* synth_sse3d.h */,
+				83256CF928666C7F0036D9C0 /* l3bandgain.h */,
+				83256CFA28666C7F0036D9C0 /* mpg123lib_intern.h */,
+				83256CFB28666C7F0036D9C0 /* init_layer3.h */,
+				83256CFC28666C7F0036D9C0 /* getcpuflags.h */,
+				83256CFD28666C7F0036D9C0 /* icy.h */,
+				83256CFE28666C7F0036D9C0 /* fmt123.h */,
+				83256CFF28666C7F0036D9C0 /* newhuffman.h */,
+				83256D0028666C7F0036D9C0 /* synth_mono.h */,
+				83256D0128666C7F0036D9C0 /* gapless.h */,
+				83256D0228666C7F0036D9C0 /* costabs.h */,
+				83256D0328666C7F0036D9C0 /* l2tables.h */,
+				83256D0428666C7F0036D9C0 /* swap_bytes_impl.h */,
+				83256D0528666C7F0036D9C0 /* icy2utf8.h */,
+				83256D0628666C7F0036D9C0 /* l3tabs.h */,
+				83256D0728666C7F0036D9C0 /* dither_impl.h */,
+				83256D0828666C7F0036D9C0 /* mpeghead.h */,
+				83256D0928666C7F0036D9C0 /* huffman.h */,
+				83256D0A28666C7F0036D9C0 /* sample.h */,
+				83256D0B28666C7F0036D9C0 /* init_costabs.h */,
+				83256D0C28666C7F0036D9C0 /* decode.h */,
+				83256D0D28666C7F0036D9C0 /* abi_align.h */,
+				83256D0E28666C7F0036D9C0 /* true.h */,
+				83256D0F28666C7F0036D9C0 /* id3.h */,
+			);
+			path = mpg123;
+			sourceTree = "<group>";
+		};
 		83747C172862DB2F0021245F /* Xcode-config */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/ThirdParty/mpg123/include/libmpg123/abi_align.h b/ThirdParty/mpg123/include/mpg123/abi_align.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/abi_align.h
rename to ThirdParty/mpg123/include/mpg123/abi_align.h
diff --git a/ThirdParty/mpg123/include/libmpg123/costabs.h b/ThirdParty/mpg123/include/mpg123/costabs.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/costabs.h
rename to ThirdParty/mpg123/include/mpg123/costabs.h
diff --git a/ThirdParty/mpg123/include/libmpg123/debug.h b/ThirdParty/mpg123/include/mpg123/debug.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/debug.h
rename to ThirdParty/mpg123/include/mpg123/debug.h
diff --git a/ThirdParty/mpg123/include/libmpg123/decode.h b/ThirdParty/mpg123/include/mpg123/decode.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/decode.h
rename to ThirdParty/mpg123/include/mpg123/decode.h
diff --git a/ThirdParty/mpg123/include/libmpg123/dither.h b/ThirdParty/mpg123/include/mpg123/dither.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/dither.h
rename to ThirdParty/mpg123/include/mpg123/dither.h
diff --git a/ThirdParty/mpg123/include/libmpg123/dither_impl.h b/ThirdParty/mpg123/include/mpg123/dither_impl.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/dither_impl.h
rename to ThirdParty/mpg123/include/mpg123/dither_impl.h
diff --git a/ThirdParty/mpg123/include/libmpg123/fmt123.h b/ThirdParty/mpg123/include/mpg123/fmt123.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/fmt123.h
rename to ThirdParty/mpg123/include/mpg123/fmt123.h
diff --git a/ThirdParty/mpg123/include/libmpg123/frame.h b/ThirdParty/mpg123/include/mpg123/frame.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/frame.h
rename to ThirdParty/mpg123/include/mpg123/frame.h
diff --git a/ThirdParty/mpg123/include/libmpg123/gapless.h b/ThirdParty/mpg123/include/mpg123/gapless.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/gapless.h
rename to ThirdParty/mpg123/include/mpg123/gapless.h
diff --git a/ThirdParty/mpg123/include/libmpg123/getbits.h b/ThirdParty/mpg123/include/mpg123/getbits.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/getbits.h
rename to ThirdParty/mpg123/include/mpg123/getbits.h
diff --git a/ThirdParty/mpg123/include/libmpg123/getcpuflags.h b/ThirdParty/mpg123/include/mpg123/getcpuflags.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/getcpuflags.h
rename to ThirdParty/mpg123/include/mpg123/getcpuflags.h
diff --git a/ThirdParty/mpg123/include/libmpg123/huffman.h b/ThirdParty/mpg123/include/mpg123/huffman.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/huffman.h
rename to ThirdParty/mpg123/include/mpg123/huffman.h
diff --git a/ThirdParty/mpg123/include/libmpg123/icy.h b/ThirdParty/mpg123/include/mpg123/icy.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/icy.h
rename to ThirdParty/mpg123/include/mpg123/icy.h
diff --git a/ThirdParty/mpg123/include/libmpg123/icy2utf8.h b/ThirdParty/mpg123/include/mpg123/icy2utf8.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/icy2utf8.h
rename to ThirdParty/mpg123/include/mpg123/icy2utf8.h
diff --git a/ThirdParty/mpg123/include/libmpg123/id3.h b/ThirdParty/mpg123/include/mpg123/id3.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/id3.h
rename to ThirdParty/mpg123/include/mpg123/id3.h
diff --git a/ThirdParty/mpg123/include/libmpg123/index.h b/ThirdParty/mpg123/include/mpg123/index.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/index.h
rename to ThirdParty/mpg123/include/mpg123/index.h
diff --git a/ThirdParty/mpg123/include/libmpg123/init_costabs.h b/ThirdParty/mpg123/include/mpg123/init_costabs.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/init_costabs.h
rename to ThirdParty/mpg123/include/mpg123/init_costabs.h
diff --git a/ThirdParty/mpg123/include/libmpg123/init_layer12.h b/ThirdParty/mpg123/include/mpg123/init_layer12.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/init_layer12.h
rename to ThirdParty/mpg123/include/mpg123/init_layer12.h
diff --git a/ThirdParty/mpg123/include/libmpg123/init_layer3.h b/ThirdParty/mpg123/include/mpg123/init_layer3.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/init_layer3.h
rename to ThirdParty/mpg123/include/mpg123/init_layer3.h
diff --git a/ThirdParty/mpg123/include/libmpg123/l12tabs.h b/ThirdParty/mpg123/include/mpg123/l12tabs.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/l12tabs.h
rename to ThirdParty/mpg123/include/mpg123/l12tabs.h
diff --git a/ThirdParty/mpg123/include/libmpg123/l2tables.h b/ThirdParty/mpg123/include/mpg123/l2tables.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/l2tables.h
rename to ThirdParty/mpg123/include/mpg123/l2tables.h
diff --git a/ThirdParty/mpg123/include/libmpg123/l3bandgain.h b/ThirdParty/mpg123/include/mpg123/l3bandgain.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/l3bandgain.h
rename to ThirdParty/mpg123/include/mpg123/l3bandgain.h
diff --git a/ThirdParty/mpg123/include/libmpg123/l3tabs.h b/ThirdParty/mpg123/include/mpg123/l3tabs.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/l3tabs.h
rename to ThirdParty/mpg123/include/mpg123/l3tabs.h
diff --git a/ThirdParty/mpg123/include/libmpg123/mangle.h b/ThirdParty/mpg123/include/mpg123/mangle.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/mangle.h
rename to ThirdParty/mpg123/include/mpg123/mangle.h
diff --git a/ThirdParty/mpg123/include/libmpg123/mpeghead.h b/ThirdParty/mpg123/include/mpg123/mpeghead.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/mpeghead.h
rename to ThirdParty/mpg123/include/mpg123/mpeghead.h
diff --git a/ThirdParty/mpg123/include/libmpg123/mpg123.h b/ThirdParty/mpg123/include/mpg123/mpg123.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/mpg123.h
rename to ThirdParty/mpg123/include/mpg123/mpg123.h
diff --git a/ThirdParty/mpg123/include/libmpg123/mpg123lib_intern.h b/ThirdParty/mpg123/include/mpg123/mpg123lib_intern.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/mpg123lib_intern.h
rename to ThirdParty/mpg123/include/mpg123/mpg123lib_intern.h
diff --git a/ThirdParty/mpg123/include/libmpg123/newhuffman.h b/ThirdParty/mpg123/include/mpg123/newhuffman.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/newhuffman.h
rename to ThirdParty/mpg123/include/mpg123/newhuffman.h
diff --git a/ThirdParty/mpg123/include/libmpg123/optimize.h b/ThirdParty/mpg123/include/mpg123/optimize.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/optimize.h
rename to ThirdParty/mpg123/include/mpg123/optimize.h
diff --git a/ThirdParty/mpg123/include/libmpg123/parse.h b/ThirdParty/mpg123/include/mpg123/parse.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/parse.h
rename to ThirdParty/mpg123/include/mpg123/parse.h
diff --git a/ThirdParty/mpg123/include/libmpg123/reader.h b/ThirdParty/mpg123/include/mpg123/reader.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/reader.h
rename to ThirdParty/mpg123/include/mpg123/reader.h
diff --git a/ThirdParty/mpg123/include/libmpg123/sample.h b/ThirdParty/mpg123/include/mpg123/sample.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/sample.h
rename to ThirdParty/mpg123/include/mpg123/sample.h
diff --git a/ThirdParty/mpg123/include/libmpg123/swap_bytes_impl.h b/ThirdParty/mpg123/include/mpg123/swap_bytes_impl.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/swap_bytes_impl.h
rename to ThirdParty/mpg123/include/mpg123/swap_bytes_impl.h
diff --git a/ThirdParty/mpg123/include/libmpg123/synth.h b/ThirdParty/mpg123/include/mpg123/synth.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/synth.h
rename to ThirdParty/mpg123/include/mpg123/synth.h
diff --git a/ThirdParty/mpg123/include/libmpg123/synth_8bit.h b/ThirdParty/mpg123/include/mpg123/synth_8bit.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/synth_8bit.h
rename to ThirdParty/mpg123/include/mpg123/synth_8bit.h
diff --git a/ThirdParty/mpg123/include/libmpg123/synth_mono.h b/ThirdParty/mpg123/include/mpg123/synth_mono.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/synth_mono.h
rename to ThirdParty/mpg123/include/mpg123/synth_mono.h
diff --git a/ThirdParty/mpg123/include/libmpg123/synth_ntom.h b/ThirdParty/mpg123/include/mpg123/synth_ntom.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/synth_ntom.h
rename to ThirdParty/mpg123/include/mpg123/synth_ntom.h
diff --git a/ThirdParty/mpg123/include/libmpg123/synth_sse3d.h b/ThirdParty/mpg123/include/mpg123/synth_sse3d.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/synth_sse3d.h
rename to ThirdParty/mpg123/include/mpg123/synth_sse3d.h
diff --git a/ThirdParty/mpg123/include/libmpg123/synths.h b/ThirdParty/mpg123/include/mpg123/synths.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/synths.h
rename to ThirdParty/mpg123/include/mpg123/synths.h
diff --git a/ThirdParty/mpg123/include/libmpg123/true.h b/ThirdParty/mpg123/include/mpg123/true.h
similarity index 100%
rename from ThirdParty/mpg123/include/libmpg123/true.h
rename to ThirdParty/mpg123/include/mpg123/true.h