diff --git a/src/common/tv_filters/atari_ntsc.c b/src/common/tv_filters/atari_ntsc.c
index 625cfb1fa..24ef22db8 100644
--- a/src/common/tv_filters/atari_ntsc.c
+++ b/src/common/tv_filters/atari_ntsc.c
@@ -72,14 +72,15 @@ static void correct_errors( atari_ntsc_rgb_t color, atari_ntsc_rgb_t* out )
 
 void atari_ntsc_init( atari_ntsc_t* ntsc, atari_ntsc_setup_t const* setup )
 {
-  int entry = 0;
+  atari_ntsc_in_t* palette;
+  int entry;
   init_t impl;
   if ( !setup )
     setup = &atari_ntsc_composite;
   init( &impl, setup );
 
   // Palette stores R/G/B data for 'atari_ntsc_palette_size' entries
-  atari_ntsc_in_t* palette = ( atari_ntsc_in_t*) setup->palette;
+  palette = (atari_ntsc_in_t*) setup->palette;
   
   // Burst-phase (TODO - how is this actually used?)
 //  float start_angle = - ((213.0f) * M_PI / 180.0f) - setup->burst_phase * M_PI;
diff --git a/src/common/tv_filters/atari_ntsc.h b/src/common/tv_filters/atari_ntsc.h
index 800f11bdb..11aa15cbd 100644
--- a/src/common/tv_filters/atari_ntsc.h
+++ b/src/common/tv_filters/atari_ntsc.h
@@ -22,14 +22,14 @@
 #ifndef ATARI_NTSC_H
 #define ATARI_NTSC_H
 
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
 /* Type of input and output pixel values. */
 typedef unsigned char  atari_ntsc_in_t;
 typedef unsigned short atari_ntsc_out_t;
 
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
 /* Each raw pixel input value is passed through this. You might want to mask
    the pixel index if you use the high bits as flags, etc. */
 #define ATARI_NTSC_ADJ_IN( in ) in
diff --git a/src/win32/Stella.vcxproj b/src/win32/Stella.vcxproj
index 582de4426..7067aa677 100644
--- a/src/win32/Stella.vcxproj
+++ b/src/win32/Stella.vcxproj
@@ -233,6 +233,7 @@ SDLmain.lib
     <ClCompile Include="..\debugger\gui\KeyboardWidget.cxx" />
     <ClCompile Include="..\debugger\gui\PaddleWidget.cxx" />
     <ClCompile Include="..\emucore\CartCM.cxx" />
+    <ClCompile Include="..\emucore\CartCTY.cxx" />
     <ClCompile Include="..\emucore\CartFA2.cxx" />
     <ClCompile Include="..\emucore\CompuMate.cxx" />
     <ClCompile Include="..\emucore\MindLink.cxx" />
@@ -440,6 +441,8 @@ SDLmain.lib
     <ClInclude Include="..\debugger\gui\NullControlWidget.hxx" />
     <ClInclude Include="..\debugger\gui\PaddleWidget.hxx" />
     <ClInclude Include="..\emucore\CartCM.hxx" />
+    <ClInclude Include="..\emucore\CartCTY.hxx" />
+    <ClInclude Include="..\emucore\CartCTYTunes.hxx" />
     <ClInclude Include="..\emucore\CartFA2.hxx" />
     <ClInclude Include="..\emucore\CompuMate.hxx" />
     <ClInclude Include="..\emucore\MindLink.hxx" />
diff --git a/src/win32/Stella.vcxproj.filters b/src/win32/Stella.vcxproj.filters
index b005b4e17..a45d0186a 100644
--- a/src/win32/Stella.vcxproj.filters
+++ b/src/win32/Stella.vcxproj.filters
@@ -630,6 +630,9 @@
     <ClCompile Include="..\common\tv_filters\NTSCFilter.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\emucore\CartCTY.cxx">
+      <Filter>Source Files\emucore</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\Array.hxx">
@@ -1250,6 +1253,12 @@
     <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\emucore\CartCTY.hxx">
+      <Filter>Header Files\emucore</Filter>
+    </ClInclude>
+    <ClInclude Include="..\emucore\CartCTYTunes.hxx">
+      <Filter>Header Files\emucore</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="stella.ico">