diff --git a/linux/Makefile.am b/linux/Makefile.am
index 88320f92..1bfab7f6 100644
--- a/linux/Makefile.am
+++ b/linux/Makefile.am
@@ -40,7 +40,6 @@ ccextractor_SOURCES = \
 				../src/thirdparty/gpacmp4/media_odf.c \
 				../src/thirdparty/gpacmp4/meta.c \
 				../src/thirdparty/gpacmp4/movie_fragments.c \
-				../src/thirdparty/gpacmp4/mp4.c \
 				../src/thirdparty/gpacmp4/odf_code.c \
 				../src/thirdparty/gpacmp4/odf_codec.c \
 				../src/thirdparty/gpacmp4/odf_command.c \
@@ -206,6 +205,7 @@ ccextractor_SOURCES = \
 				../src/lib_ccx/list.h \
 				../src/lib_ccx/matroska.c \
 				../src/lib_ccx/matroska.h \
+				../src/lib_ccx/mp4.c \
 				../src/lib_ccx/myth.c \
 				../src/lib_ccx/networking.c \
 				../src/lib_ccx/networking.h \
@@ -259,17 +259,17 @@ ccextractor_SOURCES = \
 				../src/thirdparty/protobuf-c/protobuf-c.c \
 				../src/thirdparty/protobuf-c/protobuf-c.h \
 				../src/thirdparty/zvbi/bcd.h \
-				../src/thirdparty/zvbi/bit_slicer.c \
-				../src/thirdparty/zvbi/bit_slicer.h \
-				../src/thirdparty/zvbi/decoder.c \
-				../src/thirdparty/zvbi/macros.h \
-				../src/thirdparty/zvbi/misc.h \
-				../src/thirdparty/zvbi/raw_decoder.c \
-				../src/thirdparty/zvbi/raw_decoder.h \
-				../src/thirdparty/zvbi/sampling_par.c \
-				../src/thirdparty/zvbi/sampling_par.h \
-				../src/thirdparty/zvbi/sliced.h \
-				../src/thirdparty/zvbi/zvbi_decoder.h \
+				../src/lib_ccx/zvbi/bit_slicer.c \
+				../src/lib_ccx/zvbi/bit_slicer.h \
+				../src/lib_ccx/zvbi/decoder.c \
+				../src/lib_ccx/zvbi/macros.h \
+				../src/lib_ccx/zvbi/misc.h \
+				../src/lib_ccx/zvbi/raw_decoder.c \
+				../src/lib_ccx/zvbi/raw_decoder.h \
+				../src/lib_ccx/zvbi/sampling_par.c \
+				../src/lib_ccx/zvbi/sampling_par.h \
+				../src/lib_ccx/zvbi/sliced.h \
+				../src/lib_ccx/zvbi/zvbi_decoder.h \
 				../src/wrappers/wrapper.c \
 				../src/wrappers/wrapper.h \
                                 ../src/freetype/* \
diff --git a/linux/build b/linux/build
index 5f7cf93b..54a10660 100755
--- a/linux/build
+++ b/linux/build
@@ -5,10 +5,9 @@ if [ "$bit_os"=="64" ]
 then
     BLD_FLAGS="$BLD_FLAGS -DGPAC_64_BITS"
 fi
-BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng -I../src/thirdparty/zlib -I../src/thirdparty/zvbi -I../src/thirdparty/lib_hash -I../src/thirdparty/protobuf-c -I../src/thirdparty -I../src/thirdparty/freetype/include"
+BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng -I../src/thirdparty/zlib -I../src/lib_ccx/zvbi -I../src/thirdparty/lib_hash -I../src/thirdparty/protobuf-c -I../src/thirdparty -I../src/thirdparty/freetype/include"
 SRC_LIBPNG="$(find ../src/thirdparty/libpng/ -name '*.c')"
 SRC_ZLIB="$(find ../src/thirdparty/zlib/ -name '*.c')"
-SRC_ZVBI="$(find ../src/thirdparty/zvbi/ -name '*.c')"
 SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')"
 SRC_GPAC="$(find ../src/thirdparty/gpacmp4/ -name '*.c')"
 SRC_HASH="$(find ../src/thirdparty/lib_hash/ -name '*.c')"
@@ -56,7 +55,7 @@ SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c
         ../src/thirdparty/freetype/type42/type42.c
         ../src/thirdparty/freetype/winfonts/winfnt.c"
 API_WRAPPERS="$(find ../src/wrappers/ -name '*.c')"
-BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC $API_WRAPPERS $SRC_FREETYPE"
+BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC $API_WRAPPERS $SRC_FREETYPE"
 BLD_LINKER="$BLD_LINKER -lm -zmuldefs -l tesseract -l lept"
 
 echo "Running pre-build script..."
diff --git a/mac/Makefile.am b/mac/Makefile.am
index 491f4c70..789168b9 100644
--- a/mac/Makefile.am
+++ b/mac/Makefile.am
@@ -40,7 +40,6 @@ ccextractor_SOURCES = \
 				../src/thirdparty/gpacmp4/media_odf.c \
 				../src/thirdparty/gpacmp4/meta.c \
 				../src/thirdparty/gpacmp4/movie_fragments.c \
-				../src/thirdparty/gpacmp4/mp4.c \
 				../src/thirdparty/gpacmp4/odf_code.c \
 				../src/thirdparty/gpacmp4/odf_codec.c \
 				../src/thirdparty/gpacmp4/odf_command.c \
@@ -205,6 +204,7 @@ ccextractor_SOURCES = \
 				../src/lib_ccx/list.h \
 				../src/lib_ccx/matroska.c \
 				../src/lib_ccx/matroska.h \
+				../src/lib_ccx/mp4.c \
 				../src/lib_ccx/myth.c \
 				../src/lib_ccx/networking.c \
 				../src/lib_ccx/networking.h \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d02ea34..86298d7d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,10 +48,10 @@ endif()
 
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/lib_ccx)
+include_directories(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/gpacmp4)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/zvbi)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash)
 include_directories(${PROJECT_SOURCE_DIR}/wrappers)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng)
@@ -62,7 +62,7 @@ aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash/ SOURCEFILE)
 aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/ SOURCEFILE)
 aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/ SOURCEFILE)
 aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/zlib/ SOURCEFILE)
-aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/zvbi/ SOURCEFILE)
+aux_source_directory(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi/ SOURCEFILE)
 aux_source_directory(${PROJECT_SOURCE_DIR}/wrappers/ SOURCEFILE)
 
 set(UTF8PROC_SOURCE ${PROJECT_SOURCE_DIR}/thirdparty/utf8proc/utf8proc.c)
diff --git a/src/lib_ccx/ccx_decoders_vbi.h b/src/lib_ccx/ccx_decoders_vbi.h
index 17c04f55..8d9e009b 100644
--- a/src/lib_ccx/ccx_decoders_vbi.h
+++ b/src/lib_ccx/ccx_decoders_vbi.h
@@ -1,7 +1,7 @@
 #ifndef CCX_DECODER_VBI
 #define CCX_DECODER_VBI
 
-#include <zvbi_decoder.h>
+#include <zvbi/zvbi_decoder.h>
 #define VBI_DEBUG
 
 #include "ccx_decoders_structs.h"
diff --git a/src/lib_ccx/ccx_encoders_g608.c b/src/lib_ccx/ccx_encoders_g608.c
index bd23ec6c..ff457dfd 100644
--- a/src/lib_ccx/ccx_encoders_g608.c
+++ b/src/lib_ccx/ccx_encoders_g608.c
@@ -1,5 +1,5 @@
 #include "lib_ccx.h"
-#include "../ccextractor.h"
+//#include "../ccextractor.h"
 #include "ccx_encoders_common.h"
 #include "ccx_encoders_helpers.h"
 
diff --git a/src/thirdparty/gpacmp4/mp4.c b/src/lib_ccx/mp4.c
similarity index 100%
rename from src/thirdparty/gpacmp4/mp4.c
rename to src/lib_ccx/mp4.c
diff --git a/src/thirdparty/zvbi/bcd.h b/src/lib_ccx/zvbi/bcd.h
similarity index 100%
rename from src/thirdparty/zvbi/bcd.h
rename to src/lib_ccx/zvbi/bcd.h
diff --git a/src/thirdparty/zvbi/bit_slicer.c b/src/lib_ccx/zvbi/bit_slicer.c
similarity index 100%
rename from src/thirdparty/zvbi/bit_slicer.c
rename to src/lib_ccx/zvbi/bit_slicer.c
diff --git a/src/thirdparty/zvbi/bit_slicer.h b/src/lib_ccx/zvbi/bit_slicer.h
similarity index 100%
rename from src/thirdparty/zvbi/bit_slicer.h
rename to src/lib_ccx/zvbi/bit_slicer.h
diff --git a/src/thirdparty/zvbi/decoder.c b/src/lib_ccx/zvbi/decoder.c
similarity index 100%
rename from src/thirdparty/zvbi/decoder.c
rename to src/lib_ccx/zvbi/decoder.c
diff --git a/src/thirdparty/zvbi/macros.h b/src/lib_ccx/zvbi/macros.h
similarity index 100%
rename from src/thirdparty/zvbi/macros.h
rename to src/lib_ccx/zvbi/macros.h
diff --git a/src/thirdparty/zvbi/misc.h b/src/lib_ccx/zvbi/misc.h
similarity index 100%
rename from src/thirdparty/zvbi/misc.h
rename to src/lib_ccx/zvbi/misc.h
diff --git a/src/thirdparty/zvbi/raw_decoder.c b/src/lib_ccx/zvbi/raw_decoder.c
similarity index 100%
rename from src/thirdparty/zvbi/raw_decoder.c
rename to src/lib_ccx/zvbi/raw_decoder.c
diff --git a/src/thirdparty/zvbi/raw_decoder.h b/src/lib_ccx/zvbi/raw_decoder.h
similarity index 100%
rename from src/thirdparty/zvbi/raw_decoder.h
rename to src/lib_ccx/zvbi/raw_decoder.h
diff --git a/src/thirdparty/zvbi/sampling_par.c b/src/lib_ccx/zvbi/sampling_par.c
similarity index 100%
rename from src/thirdparty/zvbi/sampling_par.c
rename to src/lib_ccx/zvbi/sampling_par.c
diff --git a/src/thirdparty/zvbi/sampling_par.h b/src/lib_ccx/zvbi/sampling_par.h
similarity index 100%
rename from src/thirdparty/zvbi/sampling_par.h
rename to src/lib_ccx/zvbi/sampling_par.h
diff --git a/src/thirdparty/zvbi/sliced.h b/src/lib_ccx/zvbi/sliced.h
similarity index 100%
rename from src/thirdparty/zvbi/sliced.h
rename to src/lib_ccx/zvbi/sliced.h
diff --git a/src/thirdparty/zvbi/zvbi_decoder.h b/src/lib_ccx/zvbi/zvbi_decoder.h
similarity index 100%
rename from src/thirdparty/zvbi/zvbi_decoder.h
rename to src/lib_ccx/zvbi/zvbi_decoder.h
diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj
index ec462ab6..25803b60 100644
--- a/windows/ccextractor.vcxproj
+++ b/windows/ccextractor.vcxproj
@@ -115,14 +115,14 @@
     <ClInclude Include="..\src\thirdparty\zlib\zconf.h" />
     <ClInclude Include="..\src\thirdparty\zlib\zlib.h" />
     <ClInclude Include="..\src\thirdparty\zlib\zutil.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\bcd.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\bit_slicer.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\macros.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\misc.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\raw_decoder.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\sampling_par.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\sliced.h" />
-    <ClInclude Include="..\src\thirdparty\zvbi\zvbi_decoder.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\bcd.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\bit_slicer.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\macros.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\misc.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\raw_decoder.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\sampling_par.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\sliced.h" />
+    <ClInclude Include="..\src\lib_ccx\zvbi\zvbi_decoder.h" />
     <ClInclude Include="..\src\thirdparty\win_spec_incld\inttypes.h" />
     <ClInclude Include="..\src\thirdparty\win_spec_incld\stdint.h" />
     <ClInclude Include="..\src\thirdparty\freetype\include\ft2build.h" />
@@ -172,7 +172,7 @@
     <ClCompile Include="..\src\thirdparty\gpacmp4\media_odf.c" />
     <ClCompile Include="..\src\thirdparty\gpacmp4\meta.c" />
     <ClCompile Include="..\src\thirdparty\gpacmp4\movie_fragments.c" />
-    <ClCompile Include="..\src\thirdparty\gpacmp4\mp4.c" />
+    <ClCompile Include="..\src\lib_ccx\mp4.c" />
     <ClCompile Include="..\src\thirdparty\gpacmp4\odf_code.c" />
     <ClCompile Include="..\src\thirdparty\gpacmp4\odf_codec.c" />
     <ClCompile Include="..\src\thirdparty\gpacmp4\odf_command.c" />
@@ -283,10 +283,10 @@
     <ClCompile Include="..\src\thirdparty\zlib\inftrees.c" />
     <ClCompile Include="..\src\thirdparty\zlib\trees.c" />
     <ClCompile Include="..\src\thirdparty\zlib\zutil.c" />
-    <ClCompile Include="..\src\thirdparty\zvbi\bit_slicer.c" />
-    <ClCompile Include="..\src\thirdparty\zvbi\decoder.c" />
-    <ClCompile Include="..\src\thirdparty\zvbi\raw_decoder.c" />
-    <ClCompile Include="..\src\thirdparty\zvbi\sampling_par.c" />
+    <ClCompile Include="..\src\lib_ccx\zvbi\bit_slicer.c" />
+    <ClCompile Include="..\src\lib_ccx\zvbi\decoder.c" />
+    <ClCompile Include="..\src\lib_ccx\zvbi\raw_decoder.c" />
+    <ClCompile Include="..\src\lib_ccx\zvbi\sampling_par.c" />
     <ClCompile Include="..\src\thirdparty\freetype\autofit\autofit.c" />
     <ClCompile Include="..\src\thirdparty\freetype\bdf\bdf.c" />
     <ClCompile Include="..\src\thirdparty\freetype\cff\cff.c" />
@@ -448,7 +448,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\thirdparty\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\libpng;..\src\thirdparty;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\libpng;..\src\thirdparty;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -481,7 +481,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/thirdparty/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -500,7 +500,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Full|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\thirdparty\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\;..\src\thirdparty\libpng;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\;..\src\thirdparty\libpng;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SEGMENT_BY_FILE_TIME;ENABLE_HARDSUBX;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;ENABLE_OCR;WIN32;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -538,7 +538,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Full|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/thirdparty/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ENABLE_OCR;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;_DEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -561,7 +561,7 @@ xcopy /y "$(ProjectDir)libs\lib\libtesseract304d.dll" "$(ProjectDir)$(OutDir)"</
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Full|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\thirdparty\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\;..\src\thirdparty\libpng;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\;..\src\thirdparty\libpng;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ENABLE_HARDSUBX;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;VERSION_FILE_PRESENT;ENABLE_OCR;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -598,7 +598,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Full|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/thirdparty/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src;../src/lib_ccx;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION_FILE_PRESENT;ENABLE_OCR;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -620,7 +620,7 @@ xcopy /y "$(ProjectDir)libs\lib\libtesseract304d.dll" "$(ProjectDir)$(OutDir)"</
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\thirdparty\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\libpng;..\src\thirdparty;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;..\src\thirdparty\win_spec_incld;..\src\lib_ccx;..\src\thirdparty\lib_hash;..\src\lib_ccx\zvbi;..\src\thirdparty\protobuf-c;..\src\thirdparty\gpacmp4;..\src\thirdparty\win_iconv;..\src\thirdparty\zlib;..\src\thirdparty\libpng;..\src\thirdparty;..\src;libs\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION_FILE_PRESENT;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
@@ -652,7 +652,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/lib_ccx;../src/thirdparty/lib_hash;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src/thirdparty/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\thirdparty\freetype\include;../src/thirdparty/protobuf-c;../src/thirdparty/win_spec_incld;../src/lib_ccx;../src/thirdparty/lib_hash;../src/thirdparty/gpacmp4;../src/thirdparty/libpng;../src/thirdparty/zlib;../src/lib_ccx/zvbi;../src/thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VERSION_FILE_PRESENT;FT2_BUILD_LIBRARY;GPAC_DISABLE_VTT;GPAC_DISABLE_OD_DUMP;WIN32;NDEBUG;_CONSOLE;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>