diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index 674206b09ba..c2dc46972c4 100644
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -50,7 +50,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 
 	string module_type = GetExtension(module.GetTargetName());
 	bool lib = (module_type == ".lib") || (module_type == ".a");
-	bool dll = (module_type == ".dll");
+	bool dll = (module_type == ".dll") || (module_type == ".cpl");
 	bool exe = (module_type == ".exe");
 	// TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
 
@@ -109,6 +109,10 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 			if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) )
 				continue;
 
+			// explicitly omit include/wine directories
+			if ( !strncmp(incs[i]->directory.c_str(), "include\\wine", 12 ) )
+				continue;
+
 			string path = Path::RelativeFromDirectory (
 				incs[i]->directory,
 				module.GetBasePath() );
@@ -201,6 +205,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 
 		fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" );
 		bool multiple_includes = false;
+		fprintf ( OUT, "/.;" );
 		for ( i = 0; i < includes.size(); i++ )
 		{
 			const string& include = includes[i];