diff --git a/stella/src/debugger/DebuggerParser.cxx b/stella/src/debugger/DebuggerParser.cxx
index a2cd959be..fb59f5f60 100644
--- a/stella/src/debugger/DebuggerParser.cxx
+++ b/stella/src/debugger/DebuggerParser.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: DebuggerParser.cxx,v 1.21 2005-06-21 00:13:49 urchlay Exp $
+// $Id: DebuggerParser.cxx,v 1.22 2005-06-21 01:05:49 stephena Exp $
 //============================================================================
 
 #include "bspf.hxx"
@@ -222,7 +222,7 @@ bool DebuggerParser::subStringMatch(const string& needle, const string& haystack
 	const char *hs = haystack.c_str();
 	const char *n = needle.c_str();
 
-	if(strncasecmp(n, hs, strlen(n)) == 0)
+	if(STR_N_CASE_CMP(n, hs, strlen(n)) == 0)
 		return true;
 
 	return false;
diff --git a/stella/src/debugger/EquateList.cxx b/stella/src/debugger/EquateList.cxx
index 7e69c2d62..26bbae9c2 100644
--- a/stella/src/debugger/EquateList.cxx
+++ b/stella/src/debugger/EquateList.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: EquateList.cxx,v 1.8 2005-06-18 17:28:18 urchlay Exp $
+// $Id: EquateList.cxx,v 1.9 2005-06-21 01:05:49 stephena Exp $
 //============================================================================
 
 #include <string>
@@ -149,7 +149,7 @@ int EquateList::getAddress(const char *lbl) {
 	// cerr << "shit" << endl;
 	for(int i=0; ourVcsEquates[i].label != NULL; i++) {
 		// cerr << "Looking at " << ourVcsEquates[i].label << endl;
-		if( strcasecmp(ourVcsEquates[i].label, lbl) == 0 )
+		if( STR_CASE_CMP(ourVcsEquates[i].label, lbl) == 0 )
 			return ourVcsEquates[i].address;
 	}
 
diff --git a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx
index 7fec7c64a..4a7756d72 100644
--- a/stella/src/emucore/m6502/src/bspf/src/bspf.hxx
+++ b/stella/src/emucore/m6502/src/bspf/src/bspf.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: bspf.hxx,v 1.6 2005-05-25 17:17:38 stephena Exp $
+// $Id: bspf.hxx,v 1.7 2005-06-21 01:05:49 stephena Exp $
 //============================================================================
 
 #ifndef BSPF_HXX
@@ -24,7 +24,7 @@
   that need to be defined for different operating systems.
 
   @author Bradford W. Mott
-  @version $Id: bspf.hxx,v 1.6 2005-05-25 17:17:38 stephena Exp $
+  @version $Id: bspf.hxx,v 1.7 2005-06-21 01:05:49 stephena Exp $
 */
 
 // Types for 8-bit signed and unsigned integers
@@ -65,4 +65,13 @@ typedef unsigned int uInt32;
   #define BSPF_PATH_SEPARATOR  "/"
 #endif
 
+// I wish Windows had a complete POSIX layer
+#ifdef BSPF_WIN32
+  #define STR_CASE_CMP stricmp
+  #define STR_N_CASE_CMP strnicmp
+#else
+  #define STR_CASE_CMP strcasecmp
+  #define STR_N_CASE_CMP strncasecmp
+#endif
+
 #endif
diff --git a/stella/src/win32/Stella/Stella.vcproj b/stella/src/win32/Stella/Stella.vcproj
index f95d9d83d..5400ae009 100644
--- a/stella/src/win32/Stella/Stella.vcproj
+++ b/stella/src/win32/Stella/Stella.vcproj
@@ -140,9 +140,6 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\gui\BrowserDialog.cxx">
 			</File>
-			<File
-				RelativePath="..\..\gui\ByteGridWidget.cxx">
-			</File>
 			<File
 				RelativePath="..\..\emucore\Cart.cxx">
 			</File>
@@ -212,9 +209,15 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\Control.cxx">
 			</File>
+			<File
+				RelativePath="..\..\gui\CpuWidget.cxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\m6502\src\D6502.cxx">
 			</File>
+			<File
+				RelativePath="..\..\gui\DataGridWidget.cxx">
+			</File>
 			<File
 				RelativePath="..\..\debugger\Debugger.cxx">
 			</File>
@@ -436,9 +439,6 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\m6502\src\bspf\src\bspf.hxx">
 			</File>
-			<File
-				RelativePath="..\..\gui\ByteGridWidget.hxx">
-			</File>
 			<File
 				RelativePath="..\..\emucore\Cart.hxx">
 			</File>
@@ -514,9 +514,15 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\Control.hxx">
 			</File>
+			<File
+				RelativePath="..\..\gui\CpuWidget.hxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\m6502\src\D6502.hxx">
 			</File>
+			<File
+				RelativePath="..\..\gui\DataGridWidget.hxx">
+			</File>
 			<File
 				RelativePath="..\..\debugger\Debugger.hxx">
 			</File>