Index: genguid.cpp
===================================================================
--- genguid.cpp	(revision 28218)
+++ genguid.cpp	(working copy)
@@ -27,7 +27,6 @@
 using std::string;
 
 #ifdef _WIN32
-#include <objbase.h>
 #include <stdio.h>
 
 typedef HRESULT _stdcall CoInitializeFunc ( PVOID );
Index: vcprojmaker.cpp
===================================================================
--- vcprojmaker.cpp	(revision 28218)
+++ vcprojmaker.cpp	(working copy)
@@ -347,12 +347,9 @@
 			if ( i > 0 )
 				fprintf ( OUT, ";" );
 
-			string unescaped = *it1;
-			defines.erase(unescaped);
-			const string& escaped = _replace_str(unescaped, "\"","&quot;");
-
-			defines.insert(escaped);
-			fprintf ( OUT, "%s", escaped.c_str() );
+			// escape the string, without remove it from the list
+			(*it1) = _replace_str((*it1), "\"","&quot;");
+			fprintf ( OUT, "%s", (*it1).c_str() );
 		}
 		fprintf ( OUT, "\"\r\n" );
 		fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h");
