diff --git a/base/stdpre.h b/base/stdpre.h
index c51292a4..172190ce 100644
--- a/base/stdpre.h
+++ b/base/stdpre.h
@@ -3,6 +3,7 @@
 #pragma warning(disable: 4514)		// unreferenced inline
 #pragma warning(disable: 4710)		// not inlined
 #pragma warning(disable: 4663)		// C++ change, template specialization
+#pragma warning(disable: 4503)		// decorated name length too long
 #pragma warning(push, 3)
 #pragma warning(disable: 4018)		// signed/unsigned mismatch
 #pragma warning(disable: 4284)
diff --git a/platform/CMSWindowsScreen.h b/platform/CMSWindowsScreen.h
index f3db8a43..00c05dda 100644
--- a/platform/CMSWindowsScreen.h
+++ b/platform/CMSWindowsScreen.h
@@ -3,10 +3,10 @@
 
 #include "IClipboard.h"
 #include "CMutex.h"
+#include "CString.h"
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-class CString;
 class CThread;
 
 class CMSWindowsScreen {