diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj
index 19708f67..4f6137b5 100644
--- a/windows/ccextractor.vcxproj
+++ b/windows/ccextractor.vcxproj
@@ -11,7 +11,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\ccextractor.h" />
     <ClInclude Include="..\src\gpacmp4\gpac\avparse.h" />
     <ClInclude Include="..\src\gpacmp4\gpac\base_coding.h" />
     <ClInclude Include="..\src\gpacmp4\gpac\bitstream.h" />
@@ -59,6 +58,7 @@
     <ClInclude Include="..\src\lib_ccx\ccx_encoders_structs.h" />
     <ClInclude Include="..\src\lib_ccx\disable_warnings.h" />
     <ClInclude Include="..\src\lib_ccx\dvb_subtitle_decoder.h" />
+    <ClInclude Include="..\src\lib_ccx\lib_ccx.h" />
     <ClInclude Include="..\src\lib_ccx\spupng_encoder.h" />
     <ClInclude Include="..\src\lib_ccx\teletext.h" />
     <ClInclude Include="..\src\zlib\crc32.h" />
@@ -145,6 +145,7 @@
     <ClCompile Include="..\src\lib_ccx\ccx_common_char_encoding.c" />
     <ClCompile Include="..\src\lib_ccx\ccx_common_common.c" />
     <ClCompile Include="..\src\lib_ccx\ccx_common_constants.c" />
+    <ClCompile Include="..\src\lib_ccx\ccx_common_option.c" />
     <ClCompile Include="..\src\lib_ccx\ccx_common_timing.c" />
     <ClCompile Include="..\src\lib_ccx\ccx_decoders_608.c" />
     <ClCompile Include="..\src\lib_ccx\ccx_decoders_708.c" />
@@ -159,6 +160,7 @@
     <ClCompile Include="..\src\lib_ccx\es_userdata.c" />
     <ClCompile Include="..\src\lib_ccx\file_functions.c" />
     <ClCompile Include="..\src\lib_ccx\general_loop.c" />
+    <ClCompile Include="..\src\lib_ccx\lib_ccx.c" />
     <ClCompile Include="..\src\lib_ccx\myth.c" />
     <ClCompile Include="..\src\lib_ccx\networking.c" />
     <ClCompile Include="..\src\lib_ccx\ocr.c" />
diff --git a/windows/ccextractor.vcxproj.filters b/windows/ccextractor.vcxproj.filters
index 5dec1bae..aa06d3c8 100644
--- a/windows/ccextractor.vcxproj.filters
+++ b/windows/ccextractor.vcxproj.filters
@@ -51,9 +51,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\ccextractor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\gpacmp4\gpac\avparse.h">
       <Filter>Header Files\gpacmp4</Filter>
     </ClInclude>
@@ -240,6 +237,9 @@
     <ClInclude Include="..\src\lib_ccx\spupng_encoder.h">
       <Filter>Header Files\ccx_encoders</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lib_ccx\lib_ccx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\ccextractor.c">
@@ -557,5 +557,11 @@
     <ClCompile Include="..\src\lib_ccx\spupng_encoder.c">
       <Filter>Source Files\ccx_encoders</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\lib_ccx\lib_ccx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\lib_ccx\ccx_common_option.c">
+      <Filter>Source Files\ccx_common</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/ccextractor.vcxproj.user b/windows/ccextractor.vcxproj.user
index ff5921cf..3f583f64 100644
--- a/windows/ccextractor.vcxproj.user
+++ b/windows/ccextractor.vcxproj.user
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-in=bin -pn 1 -UCLA -12 -noru -out=ttxt -utf8 -unixts 0 -delay 1412456401000 "E:\Downloads\2014-10-04_2100_US_CNN_Newsroom.ccx.bin"</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file