diff --git a/src/FlacDecoder.cpp b/src/FlacDecoder.cpp
index 78823f9..e91ba36 100644
--- a/src/FlacDecoder.cpp
+++ b/src/FlacDecoder.cpp
@@ -24,10 +24,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "FlacDecoder.h"
-#include "flac/all.h"
-#include "flac/stream_decoder.h"
+#include "FLAC/all.h"
+#include "FLAC/stream_decoder.h"
 
 #include "AudioDecoder.h"
+#include <cstring>
 
 using namespace nqr;
 
@@ -179,4 +180,4 @@ void FlacDecoder::LoadFromBuffer(AudioData * data, const std::vector<uint8_t> &
 std::vector<std::string> FlacDecoder::GetSupportedFileExtensions()
 {
     return {"flac"};
-}
\ No newline at end of file
+}
diff --git a/src/FlacDependencies.c b/src/FlacDependencies.c
index 772075a..0cb8523 100644
--- a/src/FlacDependencies.c
+++ b/src/FlacDependencies.c
@@ -77,25 +77,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     
 #define HAVE_LROUND 1
 
-#include "flac/all.h"
+#include "FLAC/all.h"
 
 #if defined(_MSC_VER)
-#include "flac/src/win_utf8_io.c"
+#include "FLAC/src/win_utf8_io.c"
 #endif
 
-#include "flac/src/bitmath.c"
-#include "flac/src/bitreader.c"
-#include "flac/src/bitwriter.c"
-#include "flac/src/cpu.c"
-#include "flac/src/crc.c"
-#include "flac/src/fixed.c"
-#include "flac/src/float.c"
-#include "flac/src/format.c"
-#include "flac/src/lpc.c"
-#include "flac/src/md5.c"
-#include "flac/src/memory.c"
-#include "flac/src/stream_decoder.c"
-#include "flac/src/window.c"
+#include "FLAC/src/bitmath.c"
+#include "FLAC/src/bitreader.c"
+#include "FLAC/src/bitwriter.c"
+#include "FLAC/src/cpu.c"
+#include "FLAC/src/crc.c"
+#include "FLAC/src/fixed.c"
+#include "FLAC/src/float.c"
+#include "FLAC/src/format.c"
+#include "FLAC/src/lpc.c"
+#include "FLAC/src/md5.c"
+#include "FLAC/src/memory.c"
+#include "FLAC/src/stream_decoder.c"
+#include "FLAC/src/window.c"
 
 #undef VERSION
 
@@ -105,4 +105,4 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if (_MSC_VER)
 #pragma warning (pop)
-#endif
\ No newline at end of file
+#endif
diff --git a/src/WavDecoder.cpp b/src/WavDecoder.cpp
index 6dace0f..6712db5 100644
--- a/src/WavDecoder.cpp
+++ b/src/WavDecoder.cpp
@@ -26,6 +26,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "WavDecoder.h"
 #include "RiffUtils.h"
 #include "IMA4Util.h"
+#include <cstring>
 
 using namespace nqr;
 
diff --git a/third_party/flac/all.h b/third_party/FLAC/all.h
similarity index 100%
rename from third_party/flac/all.h
rename to third_party/FLAC/all.h
diff --git a/third_party/flac/assert.h b/third_party/FLAC/assert.h
similarity index 100%
rename from third_party/flac/assert.h
rename to third_party/FLAC/assert.h
diff --git a/third_party/flac/callback.h b/third_party/FLAC/callback.h
similarity index 100%
rename from third_party/flac/callback.h
rename to third_party/FLAC/callback.h
diff --git a/third_party/flac/export.h b/third_party/FLAC/export.h
similarity index 100%
rename from third_party/flac/export.h
rename to third_party/FLAC/export.h
diff --git a/third_party/flac/format.h b/third_party/FLAC/format.h
similarity index 100%
rename from third_party/flac/format.h
rename to third_party/FLAC/format.h
diff --git a/third_party/flac/metadata.h b/third_party/FLAC/metadata.h
similarity index 100%
rename from third_party/flac/metadata.h
rename to third_party/FLAC/metadata.h
diff --git a/third_party/flac/ordinals.h b/third_party/FLAC/ordinals.h
similarity index 100%
rename from third_party/flac/ordinals.h
rename to third_party/FLAC/ordinals.h
diff --git a/third_party/flac/src/bitmath.c b/third_party/FLAC/src/bitmath.c
similarity index 100%
rename from third_party/flac/src/bitmath.c
rename to third_party/FLAC/src/bitmath.c
diff --git a/third_party/flac/src/bitreader.c b/third_party/FLAC/src/bitreader.c
similarity index 100%
rename from third_party/flac/src/bitreader.c
rename to third_party/FLAC/src/bitreader.c
diff --git a/third_party/flac/src/bitwriter.c b/third_party/FLAC/src/bitwriter.c
similarity index 100%
rename from third_party/flac/src/bitwriter.c
rename to third_party/FLAC/src/bitwriter.c
diff --git a/third_party/flac/src/cpu.c b/third_party/FLAC/src/cpu.c
similarity index 100%
rename from third_party/flac/src/cpu.c
rename to third_party/FLAC/src/cpu.c
diff --git a/third_party/flac/src/crc.c b/third_party/FLAC/src/crc.c
similarity index 100%
rename from third_party/flac/src/crc.c
rename to third_party/FLAC/src/crc.c
diff --git a/third_party/flac/src/fixed.c b/third_party/FLAC/src/fixed.c
similarity index 100%
rename from third_party/flac/src/fixed.c
rename to third_party/FLAC/src/fixed.c
diff --git a/third_party/flac/src/fixed_intrin_sse2.c b/third_party/FLAC/src/fixed_intrin_sse2.c
similarity index 100%
rename from third_party/flac/src/fixed_intrin_sse2.c
rename to third_party/FLAC/src/fixed_intrin_sse2.c
diff --git a/third_party/flac/src/fixed_intrin_ssse3.c b/third_party/FLAC/src/fixed_intrin_ssse3.c
similarity index 100%
rename from third_party/flac/src/fixed_intrin_ssse3.c
rename to third_party/FLAC/src/fixed_intrin_ssse3.c
diff --git a/third_party/flac/src/float.c b/third_party/FLAC/src/float.c
similarity index 100%
rename from third_party/flac/src/float.c
rename to third_party/FLAC/src/float.c
diff --git a/third_party/flac/src/format.c b/third_party/FLAC/src/format.c
similarity index 100%
rename from third_party/flac/src/format.c
rename to third_party/FLAC/src/format.c
diff --git a/third_party/flac/src/ia32/cpu_asm.nasm b/third_party/FLAC/src/ia32/cpu_asm.nasm
similarity index 100%
rename from third_party/flac/src/ia32/cpu_asm.nasm
rename to third_party/FLAC/src/ia32/cpu_asm.nasm
diff --git a/third_party/flac/src/ia32/fixed_asm.nasm b/third_party/FLAC/src/ia32/fixed_asm.nasm
similarity index 100%
rename from third_party/flac/src/ia32/fixed_asm.nasm
rename to third_party/FLAC/src/ia32/fixed_asm.nasm
diff --git a/third_party/flac/src/ia32/lpc_asm.nasm b/third_party/FLAC/src/ia32/lpc_asm.nasm
similarity index 100%
rename from third_party/flac/src/ia32/lpc_asm.nasm
rename to third_party/FLAC/src/ia32/lpc_asm.nasm
diff --git a/third_party/flac/src/ia32/nasm.h b/third_party/FLAC/src/ia32/nasm.h
similarity index 100%
rename from third_party/flac/src/ia32/nasm.h
rename to third_party/FLAC/src/ia32/nasm.h
diff --git a/third_party/flac/src/include/private/all.h b/third_party/FLAC/src/include/private/all.h
similarity index 100%
rename from third_party/flac/src/include/private/all.h
rename to third_party/FLAC/src/include/private/all.h
diff --git a/third_party/flac/src/include/private/bitmath.h b/third_party/FLAC/src/include/private/bitmath.h
similarity index 100%
rename from third_party/flac/src/include/private/bitmath.h
rename to third_party/FLAC/src/include/private/bitmath.h
diff --git a/third_party/flac/src/include/private/bitreader.h b/third_party/FLAC/src/include/private/bitreader.h
similarity index 100%
rename from third_party/flac/src/include/private/bitreader.h
rename to third_party/FLAC/src/include/private/bitreader.h
diff --git a/third_party/flac/src/include/private/bitwriter.h b/third_party/FLAC/src/include/private/bitwriter.h
similarity index 100%
rename from third_party/flac/src/include/private/bitwriter.h
rename to third_party/FLAC/src/include/private/bitwriter.h
diff --git a/third_party/flac/src/include/private/cpu.h b/third_party/FLAC/src/include/private/cpu.h
similarity index 100%
rename from third_party/flac/src/include/private/cpu.h
rename to third_party/FLAC/src/include/private/cpu.h
diff --git a/third_party/flac/src/include/private/crc.h b/third_party/FLAC/src/include/private/crc.h
similarity index 100%
rename from third_party/flac/src/include/private/crc.h
rename to third_party/FLAC/src/include/private/crc.h
diff --git a/third_party/flac/src/include/private/fixed.h b/third_party/FLAC/src/include/private/fixed.h
similarity index 100%
rename from third_party/flac/src/include/private/fixed.h
rename to third_party/FLAC/src/include/private/fixed.h
diff --git a/third_party/flac/src/include/private/float.h b/third_party/FLAC/src/include/private/float.h
similarity index 100%
rename from third_party/flac/src/include/private/float.h
rename to third_party/FLAC/src/include/private/float.h
diff --git a/third_party/flac/src/include/private/format.h b/third_party/FLAC/src/include/private/format.h
similarity index 100%
rename from third_party/flac/src/include/private/format.h
rename to third_party/FLAC/src/include/private/format.h
diff --git a/third_party/flac/src/include/private/lpc.h b/third_party/FLAC/src/include/private/lpc.h
similarity index 100%
rename from third_party/flac/src/include/private/lpc.h
rename to third_party/FLAC/src/include/private/lpc.h
diff --git a/third_party/flac/src/include/private/macros.h b/third_party/FLAC/src/include/private/macros.h
similarity index 100%
rename from third_party/flac/src/include/private/macros.h
rename to third_party/FLAC/src/include/private/macros.h
diff --git a/third_party/flac/src/include/private/md5.h b/third_party/FLAC/src/include/private/md5.h
similarity index 100%
rename from third_party/flac/src/include/private/md5.h
rename to third_party/FLAC/src/include/private/md5.h
diff --git a/third_party/flac/src/include/private/memory.h b/third_party/FLAC/src/include/private/memory.h
similarity index 100%
rename from third_party/flac/src/include/private/memory.h
rename to third_party/FLAC/src/include/private/memory.h
diff --git a/third_party/flac/src/include/private/metadata.h b/third_party/FLAC/src/include/private/metadata.h
similarity index 100%
rename from third_party/flac/src/include/private/metadata.h
rename to third_party/FLAC/src/include/private/metadata.h
diff --git a/third_party/flac/src/include/private/ogg_decoder_aspect.h b/third_party/FLAC/src/include/private/ogg_decoder_aspect.h
similarity index 100%
rename from third_party/flac/src/include/private/ogg_decoder_aspect.h
rename to third_party/FLAC/src/include/private/ogg_decoder_aspect.h
diff --git a/third_party/flac/src/include/private/ogg_encoder_aspect.h b/third_party/FLAC/src/include/private/ogg_encoder_aspect.h
similarity index 100%
rename from third_party/flac/src/include/private/ogg_encoder_aspect.h
rename to third_party/FLAC/src/include/private/ogg_encoder_aspect.h
diff --git a/third_party/flac/src/include/private/ogg_helper.h b/third_party/FLAC/src/include/private/ogg_helper.h
similarity index 100%
rename from third_party/flac/src/include/private/ogg_helper.h
rename to third_party/FLAC/src/include/private/ogg_helper.h
diff --git a/third_party/flac/src/include/private/ogg_mapping.h b/third_party/FLAC/src/include/private/ogg_mapping.h
similarity index 100%
rename from third_party/flac/src/include/private/ogg_mapping.h
rename to third_party/FLAC/src/include/private/ogg_mapping.h
diff --git a/third_party/flac/src/include/private/stream_encoder.h b/third_party/FLAC/src/include/private/stream_encoder.h
similarity index 100%
rename from third_party/flac/src/include/private/stream_encoder.h
rename to third_party/FLAC/src/include/private/stream_encoder.h
diff --git a/third_party/flac/src/include/private/stream_encoder_framing.h b/third_party/FLAC/src/include/private/stream_encoder_framing.h
similarity index 100%
rename from third_party/flac/src/include/private/stream_encoder_framing.h
rename to third_party/FLAC/src/include/private/stream_encoder_framing.h
diff --git a/third_party/flac/src/include/private/window.h b/third_party/FLAC/src/include/private/window.h
similarity index 100%
rename from third_party/flac/src/include/private/window.h
rename to third_party/FLAC/src/include/private/window.h
diff --git a/third_party/flac/src/include/protected/all.h b/third_party/FLAC/src/include/protected/all.h
similarity index 100%
rename from third_party/flac/src/include/protected/all.h
rename to third_party/FLAC/src/include/protected/all.h
diff --git a/third_party/flac/src/include/protected/stream_decoder.h b/third_party/FLAC/src/include/protected/stream_decoder.h
similarity index 100%
rename from third_party/flac/src/include/protected/stream_decoder.h
rename to third_party/FLAC/src/include/protected/stream_decoder.h
diff --git a/third_party/flac/src/include/protected/stream_encoder.h b/third_party/FLAC/src/include/protected/stream_encoder.h
similarity index 100%
rename from third_party/flac/src/include/protected/stream_encoder.h
rename to third_party/FLAC/src/include/protected/stream_encoder.h
diff --git a/third_party/flac/src/include/share/alloc.h b/third_party/FLAC/src/include/share/alloc.h
similarity index 100%
rename from third_party/flac/src/include/share/alloc.h
rename to third_party/FLAC/src/include/share/alloc.h
diff --git a/third_party/flac/src/include/share/compat.h b/third_party/FLAC/src/include/share/compat.h
similarity index 100%
rename from third_party/flac/src/include/share/compat.h
rename to third_party/FLAC/src/include/share/compat.h
diff --git a/third_party/flac/src/include/share/endswap.h b/third_party/FLAC/src/include/share/endswap.h
similarity index 100%
rename from third_party/flac/src/include/share/endswap.h
rename to third_party/FLAC/src/include/share/endswap.h
diff --git a/third_party/flac/src/include/share/getopt.h b/third_party/FLAC/src/include/share/getopt.h
similarity index 100%
rename from third_party/flac/src/include/share/getopt.h
rename to third_party/FLAC/src/include/share/getopt.h
diff --git a/third_party/flac/src/include/share/macros.h b/third_party/FLAC/src/include/share/macros.h
similarity index 100%
rename from third_party/flac/src/include/share/macros.h
rename to third_party/FLAC/src/include/share/macros.h
diff --git a/third_party/flac/src/include/share/private.h b/third_party/FLAC/src/include/share/private.h
similarity index 100%
rename from third_party/flac/src/include/share/private.h
rename to third_party/FLAC/src/include/share/private.h
diff --git a/third_party/flac/src/include/share/safe_str.h b/third_party/FLAC/src/include/share/safe_str.h
similarity index 100%
rename from third_party/flac/src/include/share/safe_str.h
rename to third_party/FLAC/src/include/share/safe_str.h
diff --git a/third_party/flac/src/include/share/utf8.h b/third_party/FLAC/src/include/share/utf8.h
similarity index 100%
rename from third_party/flac/src/include/share/utf8.h
rename to third_party/FLAC/src/include/share/utf8.h
diff --git a/third_party/flac/src/include/share/win_utf8_io.h b/third_party/FLAC/src/include/share/win_utf8_io.h
similarity index 100%
rename from third_party/flac/src/include/share/win_utf8_io.h
rename to third_party/FLAC/src/include/share/win_utf8_io.h
diff --git a/third_party/flac/src/lpc.c b/third_party/FLAC/src/lpc.c
similarity index 100%
rename from third_party/flac/src/lpc.c
rename to third_party/FLAC/src/lpc.c
diff --git a/third_party/flac/src/lpc_intrin_avx2.c b/third_party/FLAC/src/lpc_intrin_avx2.c
similarity index 100%
rename from third_party/flac/src/lpc_intrin_avx2.c
rename to third_party/FLAC/src/lpc_intrin_avx2.c
diff --git a/third_party/flac/src/lpc_intrin_sse.c b/third_party/FLAC/src/lpc_intrin_sse.c
similarity index 100%
rename from third_party/flac/src/lpc_intrin_sse.c
rename to third_party/FLAC/src/lpc_intrin_sse.c
diff --git a/third_party/flac/src/lpc_intrin_sse2.c b/third_party/FLAC/src/lpc_intrin_sse2.c
similarity index 100%
rename from third_party/flac/src/lpc_intrin_sse2.c
rename to third_party/FLAC/src/lpc_intrin_sse2.c
diff --git a/third_party/flac/src/lpc_intrin_sse41.c b/third_party/FLAC/src/lpc_intrin_sse41.c
similarity index 100%
rename from third_party/flac/src/lpc_intrin_sse41.c
rename to third_party/FLAC/src/lpc_intrin_sse41.c
diff --git a/third_party/flac/src/md5.c b/third_party/FLAC/src/md5.c
similarity index 100%
rename from third_party/flac/src/md5.c
rename to third_party/FLAC/src/md5.c
diff --git a/third_party/flac/src/memory.c b/third_party/FLAC/src/memory.c
similarity index 100%
rename from third_party/flac/src/memory.c
rename to third_party/FLAC/src/memory.c
diff --git a/third_party/flac/src/metadata_iterators.c b/third_party/FLAC/src/metadata_iterators.c
similarity index 100%
rename from third_party/flac/src/metadata_iterators.c
rename to third_party/FLAC/src/metadata_iterators.c
diff --git a/third_party/flac/src/metadata_object.c b/third_party/FLAC/src/metadata_object.c
similarity index 100%
rename from third_party/flac/src/metadata_object.c
rename to third_party/FLAC/src/metadata_object.c
diff --git a/third_party/flac/src/ogg_decoder_aspect.c b/third_party/FLAC/src/ogg_decoder_aspect.c
similarity index 100%
rename from third_party/flac/src/ogg_decoder_aspect.c
rename to third_party/FLAC/src/ogg_decoder_aspect.c
diff --git a/third_party/flac/src/ogg_encoder_aspect.c b/third_party/FLAC/src/ogg_encoder_aspect.c
similarity index 100%
rename from third_party/flac/src/ogg_encoder_aspect.c
rename to third_party/FLAC/src/ogg_encoder_aspect.c
diff --git a/third_party/flac/src/ogg_helper.c b/third_party/FLAC/src/ogg_helper.c
similarity index 100%
rename from third_party/flac/src/ogg_helper.c
rename to third_party/FLAC/src/ogg_helper.c
diff --git a/third_party/flac/src/ogg_mapping.c b/third_party/FLAC/src/ogg_mapping.c
similarity index 100%
rename from third_party/flac/src/ogg_mapping.c
rename to third_party/FLAC/src/ogg_mapping.c
diff --git a/third_party/flac/src/stream_decoder.c b/third_party/FLAC/src/stream_decoder.c
similarity index 100%
rename from third_party/flac/src/stream_decoder.c
rename to third_party/FLAC/src/stream_decoder.c
diff --git a/third_party/flac/src/stream_encoder.c b/third_party/FLAC/src/stream_encoder.c
similarity index 100%
rename from third_party/flac/src/stream_encoder.c
rename to third_party/FLAC/src/stream_encoder.c
diff --git a/third_party/flac/src/stream_encoder_framing.c b/third_party/FLAC/src/stream_encoder_framing.c
similarity index 100%
rename from third_party/flac/src/stream_encoder_framing.c
rename to third_party/FLAC/src/stream_encoder_framing.c
diff --git a/third_party/flac/src/stream_encoder_intrin_avx2.c b/third_party/FLAC/src/stream_encoder_intrin_avx2.c
similarity index 100%
rename from third_party/flac/src/stream_encoder_intrin_avx2.c
rename to third_party/FLAC/src/stream_encoder_intrin_avx2.c
diff --git a/third_party/flac/src/stream_encoder_intrin_sse2.c b/third_party/FLAC/src/stream_encoder_intrin_sse2.c
similarity index 100%
rename from third_party/flac/src/stream_encoder_intrin_sse2.c
rename to third_party/FLAC/src/stream_encoder_intrin_sse2.c
diff --git a/third_party/flac/src/stream_encoder_intrin_ssse3.c b/third_party/FLAC/src/stream_encoder_intrin_ssse3.c
similarity index 100%
rename from third_party/flac/src/stream_encoder_intrin_ssse3.c
rename to third_party/FLAC/src/stream_encoder_intrin_ssse3.c
diff --git a/third_party/flac/src/win_utf8_io.c b/third_party/FLAC/src/win_utf8_io.c
similarity index 100%
rename from third_party/flac/src/win_utf8_io.c
rename to third_party/FLAC/src/win_utf8_io.c
diff --git a/third_party/flac/src/window.c b/third_party/FLAC/src/window.c
similarity index 100%
rename from third_party/flac/src/window.c
rename to third_party/FLAC/src/window.c
diff --git a/third_party/flac/stream_decoder.h b/third_party/FLAC/stream_decoder.h
similarity index 100%
rename from third_party/flac/stream_decoder.h
rename to third_party/FLAC/stream_decoder.h
diff --git a/third_party/flac/stream_encoder.h b/third_party/FLAC/stream_encoder.h
similarity index 100%
rename from third_party/flac/stream_encoder.h
rename to third_party/FLAC/stream_encoder.h