diff --git a/common.vcproj b/common.vcproj
index 4e7e40e48..7816d4d92 100644
--- a/common.vcproj
+++ b/common.vcproj
@@ -182,6 +182,12 @@
 			<File
 				RelativePath=".\src\common\xml_element_parser.cpp">
 			</File>
+			<File
+				RelativePath=".\src\common\xml_element_writer.cpp">
+			</File>
+			<File
+				RelativePath=".\src\common\xml_element_writer.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/src/extract/tracks.cpp b/src/extract/tracks.cpp
index 76be09b06..538ee8c3c 100644
--- a/src/extract/tracks.cpp
+++ b/src/extract/tracks.cpp
@@ -692,6 +692,11 @@ handle_data(KaxBlock *block,
   ssa_line_c ssa_line;
   rmff_frame_t *rmf_frame;
 
+  static const char *kax_ssa_fields[10] = {
+    "readorder", "layer", "style", "name", "marginl", "marginr",
+    "marginv", "effect", "text", NULL
+  };
+
   track = find_track(block->TrackNum());
   if ((track == NULL) || !track->in_use){
     delete block;
@@ -789,11 +794,6 @@ handle_data(KaxBlock *block,
         break;
 
       case FILE_TYPE_SSA:
-        static const char *kax_ssa_fields[10] = {
-          "readorder", "layer", "style", "name", "marginl", "marginr",
-          "marginv", "effect", "text", NULL
-        };
-
         if ((end == start) && !track->warning_printed) {
           mxwarn(_("Subtitle track %lld is missing some duration elements. "
                    "Please check the resulting SSA/ASS file for entries that "