diff --git a/scummvm.cpp b/scummvm.cpp
index 3ea30e31f0c..87ed4dcd569 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -950,7 +950,7 @@ int Scumm::normalizeAngle(int angle) {
 	return (angle+360)%360;
 }
 
-extern Scumm scumm;
+extern Scumm *scumm;
 
 void NORETURN CDECL error(const char *s, ...) {
 	char buf[1024];
@@ -960,12 +960,12 @@ void NORETURN CDECL error(const char *s, ...) {
 	vsprintf(buf, s, va);
 	va_end(va);
 
-	if (scumm._currentScript != 0xFF) {
-		ScriptSlot *ss = &scumm.vm.slot[scumm._currentScript];
+	if (scumm->_currentScript != 0xFF) {
+		ScriptSlot *ss = &scumm->vm.slot[scumm->_currentScript];
 		fprintf(stderr, "Error(%d:%d:0x%X): %s!\n",
-			scumm._roomResource,
+			scumm->_roomResource,
 			ss->number,
-			scumm._scriptPointer - scumm._scriptOrgPointer,
+			scumm->_scriptPointer - scumm->_scriptOrgPointer,
 			buf);
 	} else {
 		fprintf(stderr, "Error: %s!\n", buf);
diff --git a/scummvm.dsp b/scummvm.dsp
index 73f7ced910d..4a6ce777fbc 100644
--- a/scummvm.dsp
+++ b/scummvm.dsp
@@ -43,8 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "Sound" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # ADD BASE RSC /l 0x41d /d "NDEBUG"
 # ADD RSC /l 0x41d /d "NDEBUG"
 BSC32=bscmake.exe
@@ -191,6 +190,10 @@ SOURCE=.\debug.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\gameDetecter.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\gfx.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 Release"
@@ -411,10 +414,18 @@ SOURCE=.\verbs.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=.\akos.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\sound\fmopl.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\gameDetecter.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\sound\gmidi.h
 # End Source File
 # Begin Source File