diff --git a/cli/Makefile b/cli/Makefile
index b2019e44..5d4acf3f 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -15,7 +15,7 @@ endif
 
 # -DUSE_ALLOCA
 ifeq ($(TARGET_OS),Windows_NT)
-  CFLAGS += -DWIN32
+  CFLAGS += -DWIN32 -I../ext_includes/ffmpeg
 endif
 
 CFLAGS += $(DEF_CFLAGS) -DVAR_ARRAYS -I../ext_includes $(EXTRA_CFLAGS)
diff --git a/cli/vgmstream_cli.vcxproj b/cli/vgmstream_cli.vcxproj
index 7b8b9e6f..8fada8fd 100644
--- a/cli/vgmstream_cli.vcxproj
+++ b/cli/vgmstream_cli.vcxproj
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../ext_libs/Getopt;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_libs/Getopt;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;HAVE_JSON;_DEBUG;_WINDOWS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -96,7 +96,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..;../ext_libs/Getopt;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_libs/Getopt;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;HAVE_JSON;NDEBUG;_WINDOWS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -145,4 +145,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cmake/vgmstream.cmake b/cmake/vgmstream.cmake
index 17bfefb0..5aae4704 100644
--- a/cmake/vgmstream.cmake
+++ b/cmake/vgmstream.cmake
@@ -57,6 +57,7 @@ macro(setup_target TARGET)
 	if(USE_FFMPEG)
 		target_compile_definitions(${TARGET} PRIVATE VGM_USE_FFMPEG)
 		if(WIN32)
+			target_include_directories(${TARGET} PRIVATE ${VGM_SOURCE_DIR}/ext_includes/ffmpeg)
 			if(LINK)
 				add_dependencies(${TARGET} ffmpeg)
 				target_link_libraries(${TARGET}
diff --git a/ext_includes/libavcodec/ac3_parser.h b/ext_includes/ffmpeg/libavcodec/ac3_parser.h
similarity index 100%
rename from ext_includes/libavcodec/ac3_parser.h
rename to ext_includes/ffmpeg/libavcodec/ac3_parser.h
diff --git a/ext_includes/libavcodec/adts_parser.h b/ext_includes/ffmpeg/libavcodec/adts_parser.h
similarity index 100%
rename from ext_includes/libavcodec/adts_parser.h
rename to ext_includes/ffmpeg/libavcodec/adts_parser.h
diff --git a/ext_includes/libavcodec/avcodec.h b/ext_includes/ffmpeg/libavcodec/avcodec.h
similarity index 100%
rename from ext_includes/libavcodec/avcodec.h
rename to ext_includes/ffmpeg/libavcodec/avcodec.h
diff --git a/ext_includes/libavcodec/avdct.h b/ext_includes/ffmpeg/libavcodec/avdct.h
similarity index 100%
rename from ext_includes/libavcodec/avdct.h
rename to ext_includes/ffmpeg/libavcodec/avdct.h
diff --git a/ext_includes/libavcodec/avfft.h b/ext_includes/ffmpeg/libavcodec/avfft.h
similarity index 100%
rename from ext_includes/libavcodec/avfft.h
rename to ext_includes/ffmpeg/libavcodec/avfft.h
diff --git a/ext_includes/libavcodec/d3d11va.h b/ext_includes/ffmpeg/libavcodec/d3d11va.h
similarity index 100%
rename from ext_includes/libavcodec/d3d11va.h
rename to ext_includes/ffmpeg/libavcodec/d3d11va.h
diff --git a/ext_includes/libavcodec/dirac.h b/ext_includes/ffmpeg/libavcodec/dirac.h
similarity index 100%
rename from ext_includes/libavcodec/dirac.h
rename to ext_includes/ffmpeg/libavcodec/dirac.h
diff --git a/ext_includes/libavcodec/dv_profile.h b/ext_includes/ffmpeg/libavcodec/dv_profile.h
similarity index 100%
rename from ext_includes/libavcodec/dv_profile.h
rename to ext_includes/ffmpeg/libavcodec/dv_profile.h
diff --git a/ext_includes/libavcodec/dxva2.h b/ext_includes/ffmpeg/libavcodec/dxva2.h
similarity index 100%
rename from ext_includes/libavcodec/dxva2.h
rename to ext_includes/ffmpeg/libavcodec/dxva2.h
diff --git a/ext_includes/libavcodec/jni.h b/ext_includes/ffmpeg/libavcodec/jni.h
similarity index 100%
rename from ext_includes/libavcodec/jni.h
rename to ext_includes/ffmpeg/libavcodec/jni.h
diff --git a/ext_includes/libavcodec/mediacodec.h b/ext_includes/ffmpeg/libavcodec/mediacodec.h
similarity index 100%
rename from ext_includes/libavcodec/mediacodec.h
rename to ext_includes/ffmpeg/libavcodec/mediacodec.h
diff --git a/ext_includes/libavcodec/qsv.h b/ext_includes/ffmpeg/libavcodec/qsv.h
similarity index 100%
rename from ext_includes/libavcodec/qsv.h
rename to ext_includes/ffmpeg/libavcodec/qsv.h
diff --git a/ext_includes/libavcodec/vaapi.h b/ext_includes/ffmpeg/libavcodec/vaapi.h
similarity index 100%
rename from ext_includes/libavcodec/vaapi.h
rename to ext_includes/ffmpeg/libavcodec/vaapi.h
diff --git a/ext_includes/libavcodec/vdpau.h b/ext_includes/ffmpeg/libavcodec/vdpau.h
similarity index 100%
rename from ext_includes/libavcodec/vdpau.h
rename to ext_includes/ffmpeg/libavcodec/vdpau.h
diff --git a/ext_includes/libavcodec/version.h b/ext_includes/ffmpeg/libavcodec/version.h
similarity index 100%
rename from ext_includes/libavcodec/version.h
rename to ext_includes/ffmpeg/libavcodec/version.h
diff --git a/ext_includes/libavcodec/videotoolbox.h b/ext_includes/ffmpeg/libavcodec/videotoolbox.h
similarity index 100%
rename from ext_includes/libavcodec/videotoolbox.h
rename to ext_includes/ffmpeg/libavcodec/videotoolbox.h
diff --git a/ext_includes/libavcodec/vorbis_parser.h b/ext_includes/ffmpeg/libavcodec/vorbis_parser.h
similarity index 100%
rename from ext_includes/libavcodec/vorbis_parser.h
rename to ext_includes/ffmpeg/libavcodec/vorbis_parser.h
diff --git a/ext_includes/libavcodec/xvmc.h b/ext_includes/ffmpeg/libavcodec/xvmc.h
similarity index 100%
rename from ext_includes/libavcodec/xvmc.h
rename to ext_includes/ffmpeg/libavcodec/xvmc.h
diff --git a/ext_includes/libavformat/avformat.h b/ext_includes/ffmpeg/libavformat/avformat.h
similarity index 100%
rename from ext_includes/libavformat/avformat.h
rename to ext_includes/ffmpeg/libavformat/avformat.h
diff --git a/ext_includes/libavformat/avio.h b/ext_includes/ffmpeg/libavformat/avio.h
similarity index 100%
rename from ext_includes/libavformat/avio.h
rename to ext_includes/ffmpeg/libavformat/avio.h
diff --git a/ext_includes/libavformat/version.h b/ext_includes/ffmpeg/libavformat/version.h
similarity index 100%
rename from ext_includes/libavformat/version.h
rename to ext_includes/ffmpeg/libavformat/version.h
diff --git a/ext_includes/libavutil/adler32.h b/ext_includes/ffmpeg/libavutil/adler32.h
similarity index 100%
rename from ext_includes/libavutil/adler32.h
rename to ext_includes/ffmpeg/libavutil/adler32.h
diff --git a/ext_includes/libavutil/aes.h b/ext_includes/ffmpeg/libavutil/aes.h
similarity index 100%
rename from ext_includes/libavutil/aes.h
rename to ext_includes/ffmpeg/libavutil/aes.h
diff --git a/ext_includes/libavutil/aes_ctr.h b/ext_includes/ffmpeg/libavutil/aes_ctr.h
similarity index 100%
rename from ext_includes/libavutil/aes_ctr.h
rename to ext_includes/ffmpeg/libavutil/aes_ctr.h
diff --git a/ext_includes/libavutil/attributes.h b/ext_includes/ffmpeg/libavutil/attributes.h
similarity index 100%
rename from ext_includes/libavutil/attributes.h
rename to ext_includes/ffmpeg/libavutil/attributes.h
diff --git a/ext_includes/libavutil/audio_fifo.h b/ext_includes/ffmpeg/libavutil/audio_fifo.h
similarity index 100%
rename from ext_includes/libavutil/audio_fifo.h
rename to ext_includes/ffmpeg/libavutil/audio_fifo.h
diff --git a/ext_includes/libavutil/avassert.h b/ext_includes/ffmpeg/libavutil/avassert.h
similarity index 100%
rename from ext_includes/libavutil/avassert.h
rename to ext_includes/ffmpeg/libavutil/avassert.h
diff --git a/ext_includes/libavutil/avconfig.h b/ext_includes/ffmpeg/libavutil/avconfig.h
similarity index 100%
rename from ext_includes/libavutil/avconfig.h
rename to ext_includes/ffmpeg/libavutil/avconfig.h
diff --git a/ext_includes/libavutil/avstring.h b/ext_includes/ffmpeg/libavutil/avstring.h
similarity index 100%
rename from ext_includes/libavutil/avstring.h
rename to ext_includes/ffmpeg/libavutil/avstring.h
diff --git a/ext_includes/libavutil/avutil.h b/ext_includes/ffmpeg/libavutil/avutil.h
similarity index 100%
rename from ext_includes/libavutil/avutil.h
rename to ext_includes/ffmpeg/libavutil/avutil.h
diff --git a/ext_includes/libavutil/base64.h b/ext_includes/ffmpeg/libavutil/base64.h
similarity index 100%
rename from ext_includes/libavutil/base64.h
rename to ext_includes/ffmpeg/libavutil/base64.h
diff --git a/ext_includes/libavutil/blowfish.h b/ext_includes/ffmpeg/libavutil/blowfish.h
similarity index 100%
rename from ext_includes/libavutil/blowfish.h
rename to ext_includes/ffmpeg/libavutil/blowfish.h
diff --git a/ext_includes/libavutil/bprint.h b/ext_includes/ffmpeg/libavutil/bprint.h
similarity index 100%
rename from ext_includes/libavutil/bprint.h
rename to ext_includes/ffmpeg/libavutil/bprint.h
diff --git a/ext_includes/libavutil/bswap.h b/ext_includes/ffmpeg/libavutil/bswap.h
similarity index 100%
rename from ext_includes/libavutil/bswap.h
rename to ext_includes/ffmpeg/libavutil/bswap.h
diff --git a/ext_includes/libavutil/buffer.h b/ext_includes/ffmpeg/libavutil/buffer.h
similarity index 100%
rename from ext_includes/libavutil/buffer.h
rename to ext_includes/ffmpeg/libavutil/buffer.h
diff --git a/ext_includes/libavutil/camellia.h b/ext_includes/ffmpeg/libavutil/camellia.h
similarity index 100%
rename from ext_includes/libavutil/camellia.h
rename to ext_includes/ffmpeg/libavutil/camellia.h
diff --git a/ext_includes/libavutil/cast5.h b/ext_includes/ffmpeg/libavutil/cast5.h
similarity index 100%
rename from ext_includes/libavutil/cast5.h
rename to ext_includes/ffmpeg/libavutil/cast5.h
diff --git a/ext_includes/libavutil/channel_layout.h b/ext_includes/ffmpeg/libavutil/channel_layout.h
similarity index 100%
rename from ext_includes/libavutil/channel_layout.h
rename to ext_includes/ffmpeg/libavutil/channel_layout.h
diff --git a/ext_includes/libavutil/common.h b/ext_includes/ffmpeg/libavutil/common.h
similarity index 100%
rename from ext_includes/libavutil/common.h
rename to ext_includes/ffmpeg/libavutil/common.h
diff --git a/ext_includes/libavutil/cpu.h b/ext_includes/ffmpeg/libavutil/cpu.h
similarity index 100%
rename from ext_includes/libavutil/cpu.h
rename to ext_includes/ffmpeg/libavutil/cpu.h
diff --git a/ext_includes/libavutil/crc.h b/ext_includes/ffmpeg/libavutil/crc.h
similarity index 100%
rename from ext_includes/libavutil/crc.h
rename to ext_includes/ffmpeg/libavutil/crc.h
diff --git a/ext_includes/libavutil/des.h b/ext_includes/ffmpeg/libavutil/des.h
similarity index 100%
rename from ext_includes/libavutil/des.h
rename to ext_includes/ffmpeg/libavutil/des.h
diff --git a/ext_includes/libavutil/dict.h b/ext_includes/ffmpeg/libavutil/dict.h
similarity index 100%
rename from ext_includes/libavutil/dict.h
rename to ext_includes/ffmpeg/libavutil/dict.h
diff --git a/ext_includes/libavutil/display.h b/ext_includes/ffmpeg/libavutil/display.h
similarity index 100%
rename from ext_includes/libavutil/display.h
rename to ext_includes/ffmpeg/libavutil/display.h
diff --git a/ext_includes/libavutil/downmix_info.h b/ext_includes/ffmpeg/libavutil/downmix_info.h
similarity index 100%
rename from ext_includes/libavutil/downmix_info.h
rename to ext_includes/ffmpeg/libavutil/downmix_info.h
diff --git a/ext_includes/libavutil/encryption_info.h b/ext_includes/ffmpeg/libavutil/encryption_info.h
similarity index 100%
rename from ext_includes/libavutil/encryption_info.h
rename to ext_includes/ffmpeg/libavutil/encryption_info.h
diff --git a/ext_includes/libavutil/error.h b/ext_includes/ffmpeg/libavutil/error.h
similarity index 100%
rename from ext_includes/libavutil/error.h
rename to ext_includes/ffmpeg/libavutil/error.h
diff --git a/ext_includes/libavutil/eval.h b/ext_includes/ffmpeg/libavutil/eval.h
similarity index 100%
rename from ext_includes/libavutil/eval.h
rename to ext_includes/ffmpeg/libavutil/eval.h
diff --git a/ext_includes/libavutil/ffversion.h b/ext_includes/ffmpeg/libavutil/ffversion.h
similarity index 100%
rename from ext_includes/libavutil/ffversion.h
rename to ext_includes/ffmpeg/libavutil/ffversion.h
diff --git a/ext_includes/libavutil/fifo.h b/ext_includes/ffmpeg/libavutil/fifo.h
similarity index 100%
rename from ext_includes/libavutil/fifo.h
rename to ext_includes/ffmpeg/libavutil/fifo.h
diff --git a/ext_includes/libavutil/file.h b/ext_includes/ffmpeg/libavutil/file.h
similarity index 100%
rename from ext_includes/libavutil/file.h
rename to ext_includes/ffmpeg/libavutil/file.h
diff --git a/ext_includes/libavutil/frame.h b/ext_includes/ffmpeg/libavutil/frame.h
similarity index 100%
rename from ext_includes/libavutil/frame.h
rename to ext_includes/ffmpeg/libavutil/frame.h
diff --git a/ext_includes/libavutil/hash.h b/ext_includes/ffmpeg/libavutil/hash.h
similarity index 100%
rename from ext_includes/libavutil/hash.h
rename to ext_includes/ffmpeg/libavutil/hash.h
diff --git a/ext_includes/libavutil/hdr_dynamic_metadata.h b/ext_includes/ffmpeg/libavutil/hdr_dynamic_metadata.h
similarity index 100%
rename from ext_includes/libavutil/hdr_dynamic_metadata.h
rename to ext_includes/ffmpeg/libavutil/hdr_dynamic_metadata.h
diff --git a/ext_includes/libavutil/hmac.h b/ext_includes/ffmpeg/libavutil/hmac.h
similarity index 100%
rename from ext_includes/libavutil/hmac.h
rename to ext_includes/ffmpeg/libavutil/hmac.h
diff --git a/ext_includes/libavutil/hwcontext.h b/ext_includes/ffmpeg/libavutil/hwcontext.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext.h
rename to ext_includes/ffmpeg/libavutil/hwcontext.h
diff --git a/ext_includes/libavutil/hwcontext_cuda.h b/ext_includes/ffmpeg/libavutil/hwcontext_cuda.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_cuda.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_cuda.h
diff --git a/ext_includes/libavutil/hwcontext_d3d11va.h b/ext_includes/ffmpeg/libavutil/hwcontext_d3d11va.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_d3d11va.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_d3d11va.h
diff --git a/ext_includes/libavutil/hwcontext_drm.h b/ext_includes/ffmpeg/libavutil/hwcontext_drm.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_drm.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_drm.h
diff --git a/ext_includes/libavutil/hwcontext_dxva2.h b/ext_includes/ffmpeg/libavutil/hwcontext_dxva2.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_dxva2.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_dxva2.h
diff --git a/ext_includes/libavutil/hwcontext_mediacodec.h b/ext_includes/ffmpeg/libavutil/hwcontext_mediacodec.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_mediacodec.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_mediacodec.h
diff --git a/ext_includes/libavutil/hwcontext_qsv.h b/ext_includes/ffmpeg/libavutil/hwcontext_qsv.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_qsv.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_qsv.h
diff --git a/ext_includes/libavutil/hwcontext_vaapi.h b/ext_includes/ffmpeg/libavutil/hwcontext_vaapi.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_vaapi.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_vaapi.h
diff --git a/ext_includes/libavutil/hwcontext_vdpau.h b/ext_includes/ffmpeg/libavutil/hwcontext_vdpau.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_vdpau.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_vdpau.h
diff --git a/ext_includes/libavutil/hwcontext_videotoolbox.h b/ext_includes/ffmpeg/libavutil/hwcontext_videotoolbox.h
similarity index 100%
rename from ext_includes/libavutil/hwcontext_videotoolbox.h
rename to ext_includes/ffmpeg/libavutil/hwcontext_videotoolbox.h
diff --git a/ext_includes/libavutil/imgutils.h b/ext_includes/ffmpeg/libavutil/imgutils.h
similarity index 100%
rename from ext_includes/libavutil/imgutils.h
rename to ext_includes/ffmpeg/libavutil/imgutils.h
diff --git a/ext_includes/libavutil/intfloat.h b/ext_includes/ffmpeg/libavutil/intfloat.h
similarity index 100%
rename from ext_includes/libavutil/intfloat.h
rename to ext_includes/ffmpeg/libavutil/intfloat.h
diff --git a/ext_includes/libavutil/intreadwrite.h b/ext_includes/ffmpeg/libavutil/intreadwrite.h
similarity index 100%
rename from ext_includes/libavutil/intreadwrite.h
rename to ext_includes/ffmpeg/libavutil/intreadwrite.h
diff --git a/ext_includes/libavutil/lfg.h b/ext_includes/ffmpeg/libavutil/lfg.h
similarity index 100%
rename from ext_includes/libavutil/lfg.h
rename to ext_includes/ffmpeg/libavutil/lfg.h
diff --git a/ext_includes/libavutil/log.h b/ext_includes/ffmpeg/libavutil/log.h
similarity index 100%
rename from ext_includes/libavutil/log.h
rename to ext_includes/ffmpeg/libavutil/log.h
diff --git a/ext_includes/libavutil/macros.h b/ext_includes/ffmpeg/libavutil/macros.h
similarity index 100%
rename from ext_includes/libavutil/macros.h
rename to ext_includes/ffmpeg/libavutil/macros.h
diff --git a/ext_includes/libavutil/mastering_display_metadata.h b/ext_includes/ffmpeg/libavutil/mastering_display_metadata.h
similarity index 100%
rename from ext_includes/libavutil/mastering_display_metadata.h
rename to ext_includes/ffmpeg/libavutil/mastering_display_metadata.h
diff --git a/ext_includes/libavutil/mathematics.h b/ext_includes/ffmpeg/libavutil/mathematics.h
similarity index 100%
rename from ext_includes/libavutil/mathematics.h
rename to ext_includes/ffmpeg/libavutil/mathematics.h
diff --git a/ext_includes/libavutil/md5.h b/ext_includes/ffmpeg/libavutil/md5.h
similarity index 100%
rename from ext_includes/libavutil/md5.h
rename to ext_includes/ffmpeg/libavutil/md5.h
diff --git a/ext_includes/libavutil/mem.h b/ext_includes/ffmpeg/libavutil/mem.h
similarity index 100%
rename from ext_includes/libavutil/mem.h
rename to ext_includes/ffmpeg/libavutil/mem.h
diff --git a/ext_includes/libavutil/motion_vector.h b/ext_includes/ffmpeg/libavutil/motion_vector.h
similarity index 100%
rename from ext_includes/libavutil/motion_vector.h
rename to ext_includes/ffmpeg/libavutil/motion_vector.h
diff --git a/ext_includes/libavutil/murmur3.h b/ext_includes/ffmpeg/libavutil/murmur3.h
similarity index 100%
rename from ext_includes/libavutil/murmur3.h
rename to ext_includes/ffmpeg/libavutil/murmur3.h
diff --git a/ext_includes/libavutil/opt.h b/ext_includes/ffmpeg/libavutil/opt.h
similarity index 100%
rename from ext_includes/libavutil/opt.h
rename to ext_includes/ffmpeg/libavutil/opt.h
diff --git a/ext_includes/libavutil/parseutils.h b/ext_includes/ffmpeg/libavutil/parseutils.h
similarity index 100%
rename from ext_includes/libavutil/parseutils.h
rename to ext_includes/ffmpeg/libavutil/parseutils.h
diff --git a/ext_includes/libavutil/pixdesc.h b/ext_includes/ffmpeg/libavutil/pixdesc.h
similarity index 100%
rename from ext_includes/libavutil/pixdesc.h
rename to ext_includes/ffmpeg/libavutil/pixdesc.h
diff --git a/ext_includes/libavutil/pixelutils.h b/ext_includes/ffmpeg/libavutil/pixelutils.h
similarity index 100%
rename from ext_includes/libavutil/pixelutils.h
rename to ext_includes/ffmpeg/libavutil/pixelutils.h
diff --git a/ext_includes/libavutil/pixfmt.h b/ext_includes/ffmpeg/libavutil/pixfmt.h
similarity index 100%
rename from ext_includes/libavutil/pixfmt.h
rename to ext_includes/ffmpeg/libavutil/pixfmt.h
diff --git a/ext_includes/libavutil/random_seed.h b/ext_includes/ffmpeg/libavutil/random_seed.h
similarity index 100%
rename from ext_includes/libavutil/random_seed.h
rename to ext_includes/ffmpeg/libavutil/random_seed.h
diff --git a/ext_includes/libavutil/rational.h b/ext_includes/ffmpeg/libavutil/rational.h
similarity index 100%
rename from ext_includes/libavutil/rational.h
rename to ext_includes/ffmpeg/libavutil/rational.h
diff --git a/ext_includes/libavutil/rc4.h b/ext_includes/ffmpeg/libavutil/rc4.h
similarity index 100%
rename from ext_includes/libavutil/rc4.h
rename to ext_includes/ffmpeg/libavutil/rc4.h
diff --git a/ext_includes/libavutil/replaygain.h b/ext_includes/ffmpeg/libavutil/replaygain.h
similarity index 100%
rename from ext_includes/libavutil/replaygain.h
rename to ext_includes/ffmpeg/libavutil/replaygain.h
diff --git a/ext_includes/libavutil/ripemd.h b/ext_includes/ffmpeg/libavutil/ripemd.h
similarity index 100%
rename from ext_includes/libavutil/ripemd.h
rename to ext_includes/ffmpeg/libavutil/ripemd.h
diff --git a/ext_includes/libavutil/samplefmt.h b/ext_includes/ffmpeg/libavutil/samplefmt.h
similarity index 100%
rename from ext_includes/libavutil/samplefmt.h
rename to ext_includes/ffmpeg/libavutil/samplefmt.h
diff --git a/ext_includes/libavutil/sha.h b/ext_includes/ffmpeg/libavutil/sha.h
similarity index 100%
rename from ext_includes/libavutil/sha.h
rename to ext_includes/ffmpeg/libavutil/sha.h
diff --git a/ext_includes/libavutil/sha512.h b/ext_includes/ffmpeg/libavutil/sha512.h
similarity index 100%
rename from ext_includes/libavutil/sha512.h
rename to ext_includes/ffmpeg/libavutil/sha512.h
diff --git a/ext_includes/libavutil/spherical.h b/ext_includes/ffmpeg/libavutil/spherical.h
similarity index 100%
rename from ext_includes/libavutil/spherical.h
rename to ext_includes/ffmpeg/libavutil/spherical.h
diff --git a/ext_includes/libavutil/stereo3d.h b/ext_includes/ffmpeg/libavutil/stereo3d.h
similarity index 100%
rename from ext_includes/libavutil/stereo3d.h
rename to ext_includes/ffmpeg/libavutil/stereo3d.h
diff --git a/ext_includes/libavutil/tea.h b/ext_includes/ffmpeg/libavutil/tea.h
similarity index 100%
rename from ext_includes/libavutil/tea.h
rename to ext_includes/ffmpeg/libavutil/tea.h
diff --git a/ext_includes/libavutil/threadmessage.h b/ext_includes/ffmpeg/libavutil/threadmessage.h
similarity index 100%
rename from ext_includes/libavutil/threadmessage.h
rename to ext_includes/ffmpeg/libavutil/threadmessage.h
diff --git a/ext_includes/libavutil/time.h b/ext_includes/ffmpeg/libavutil/time.h
similarity index 100%
rename from ext_includes/libavutil/time.h
rename to ext_includes/ffmpeg/libavutil/time.h
diff --git a/ext_includes/libavutil/timecode.h b/ext_includes/ffmpeg/libavutil/timecode.h
similarity index 100%
rename from ext_includes/libavutil/timecode.h
rename to ext_includes/ffmpeg/libavutil/timecode.h
diff --git a/ext_includes/libavutil/timestamp.h b/ext_includes/ffmpeg/libavutil/timestamp.h
similarity index 100%
rename from ext_includes/libavutil/timestamp.h
rename to ext_includes/ffmpeg/libavutil/timestamp.h
diff --git a/ext_includes/libavutil/tree.h b/ext_includes/ffmpeg/libavutil/tree.h
similarity index 100%
rename from ext_includes/libavutil/tree.h
rename to ext_includes/ffmpeg/libavutil/tree.h
diff --git a/ext_includes/libavutil/twofish.h b/ext_includes/ffmpeg/libavutil/twofish.h
similarity index 100%
rename from ext_includes/libavutil/twofish.h
rename to ext_includes/ffmpeg/libavutil/twofish.h
diff --git a/ext_includes/libavutil/version.h b/ext_includes/ffmpeg/libavutil/version.h
similarity index 100%
rename from ext_includes/libavutil/version.h
rename to ext_includes/ffmpeg/libavutil/version.h
diff --git a/ext_includes/libavutil/xtea.h b/ext_includes/ffmpeg/libavutil/xtea.h
similarity index 100%
rename from ext_includes/libavutil/xtea.h
rename to ext_includes/ffmpeg/libavutil/xtea.h
diff --git a/ext_includes/libswresample/swresample.h b/ext_includes/ffmpeg/libswresample/swresample.h
similarity index 100%
rename from ext_includes/libswresample/swresample.h
rename to ext_includes/ffmpeg/libswresample/swresample.h
diff --git a/ext_includes/libswresample/version.h b/ext_includes/ffmpeg/libswresample/version.h
similarity index 100%
rename from ext_includes/libswresample/version.h
rename to ext_includes/ffmpeg/libswresample/version.h
diff --git a/ext_libs/CMakeLists.txt b/ext_libs/CMakeLists.txt
index bceb0af0..61d6c892 100644
--- a/ext_libs/CMakeLists.txt
+++ b/ext_libs/CMakeLists.txt
@@ -54,10 +54,10 @@ if(MSVC)
 			COMMAND lib
 			ARGS /def:${CMAKE_CURRENT_SOURCE_DIR}/swresample-vgmstream-3.def /machine:x86 /out:${CMAKE_CURRENT_BINARY_DIR}/swresample.lib
 			DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/swresample-vgmstream-3.def)
-		file(GLOB AVCODEC_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libavcodec/*.h")
-		file(GLOB AVFORMAT_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libavformat/*.h")
-		file(GLOB AVUTIL_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libavutil/*.h")
-		file(GLOB SWRESAMPLE_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libswresample/*.h")
+		file(GLOB AVCODEC_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libavcodec/*.h")
+		file(GLOB AVFORMAT_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libavformat/*.h")
+		file(GLOB AVUTIL_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libavutil/*.h")
+		file(GLOB SWRESAMPLE_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libswresample/*.h")
 		add_custom_target(ffmpeg
 			DEPENDS
 				${CMAKE_CURRENT_BINARY_DIR}/avcodec.lib
@@ -69,10 +69,10 @@ if(MSVC)
 				${AVFORMAT_HEADERS}
 				${AVUTIL_HEADERS}
 				${SWRESAMPLE_HEADERS})
-		source_group("Header Files\\libavcodec" FILES ${AVCODEC_HEADERS})
-		source_group("Header Files\\libavformat" FILES ${AVFORMAT_HEADERS})
-		source_group("Header Files\\libavutil" FILES ${AVUTIL_HEADERS})
-		source_group("Header Files\\libswresample" FILES ${SWRESAMPLE_HEADERS})
+		source_group("Header Files\\ffmpeg\\libavcodec" FILES ${AVCODEC_HEADERS})
+		source_group("Header Files\\ffmpeg\\libavformat" FILES ${AVFORMAT_HEADERS})
+		source_group("Header Files\\ffmpeg\\libavutil" FILES ${AVUTIL_HEADERS})
+		source_group("Header Files\\ffmpeg\\libswresample" FILES ${SWRESAMPLE_HEADERS})
 	endif()
 
 	if(USE_ATRAC9)
diff --git a/fb2k/foo_input_vgmstream.vcproj b/fb2k/foo_input_vgmstream.vcproj
index 99d419d9..7342db99 100644
--- a/fb2k/foo_input_vgmstream.vcproj
+++ b/fb2k/foo_input_vgmstream.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../ext_includes"
+				AdditionalIncludeDirectories="../ext_includes;../ext_includes/ffmpeg;"
 				PreprocessorDefinitions="WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G719;VGM_USE_G7221;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../ext_includes"
+				AdditionalIncludeDirectories="../ext_includes;../ext_includes/ffmpeg;"
 				PreprocessorDefinitions="WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G719;VGM_USE_G7221;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/fb2k/foo_input_vgmstream.vcxproj b/fb2k/foo_input_vgmstream.vcxproj
index 00fa179f..af1926c9 100644
--- a/fb2k/foo_input_vgmstream.vcxproj
+++ b/fb2k/foo_input_vgmstream.vcxproj
@@ -70,7 +70,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../ext_includes;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -96,7 +96,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..;../ext_includes;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -175,4 +175,4 @@
       <UserProperties RESOURCE_FILE="foo_input_vgmstream.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index d17b0c44..a4f4b582 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../ext_includes"
+				AdditionalIncludeDirectories="../ext_includes;../ext_includes/ffmpeg"
 				PreprocessorDefinitions="WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;USE_ALLOCA;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../ext_includes"
+				AdditionalIncludeDirectories="../ext_includes;../ext_includes/ffmpeg"
 				PreprocessorDefinitions="WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;USE_ALLOCA;NDEBUG;_LIB;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index 5773a53b..cf8eecd4 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -58,7 +58,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;USE_ALLOCA;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -71,7 +71,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;USE_ALLOCA;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -704,4 +704,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/winamp/in_vgmstream.vcxproj b/winamp/in_vgmstream.vcxproj
index b823ebbd..358dd99b 100644
--- a/winamp/in_vgmstream.vcxproj
+++ b/winamp/in_vgmstream.vcxproj
@@ -70,7 +70,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;VGM_WINAMP_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -97,7 +97,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;VGM_WINAMP_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -154,4 +154,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/xmplay/xmp-vgmstream.vcxproj b/xmplay/xmp-vgmstream.vcxproj
index 19d1dc99..53fe161a 100644
--- a/xmplay/xmp-vgmstream.vcxproj
+++ b/xmplay/xmp-vgmstream.vcxproj
@@ -61,7 +61,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -85,7 +85,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -140,4 +140,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>