diff --git a/reactos/tools/rbuild/backend/msvc/msvc.cpp b/reactos/tools/rbuild/backend/msvc/msvc.cpp
index 5684351282e..ca454ab6330 100644
--- a/reactos/tools/rbuild/backend/msvc/msvc.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvc.cpp
@@ -29,7 +29,6 @@
 #include <vector>
 
 #include "msvc.h"
-#include "../mingw/mingw.h"
 
 using std::string;
 using std::vector;
diff --git a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
index 6c5fad44d3c..292c4689800 100644
--- a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
@@ -121,15 +121,6 @@ MSVCBackend::_generate_dsp ( const Module& module )
 		const vector<Include*>& incs = data.includes;
 		for ( i = 0; i < incs.size(); i++ )
 		{
-
-			// explicitly omit win32api directories
-			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "w32api", 6 ) )
-				continue;
-
-			// explicitly omit include/wine directories
-			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\wine", 12 ) )
-				continue;
-
 			string path = Path::RelativeFromDirectory (
 				incs[i]->directory->relative_path,
 				module.output->relative_path );
diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index fc6e58b6857..0bc0fd02d32 100644
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -187,15 +187,16 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 					continue;
 				}
 			}
-			// add to another list win32api and include/wine directories
-			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) ||
-			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) ||
+			// switch between general headers and ros headers
+			if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) ||
+			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) ||
 			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\\GL", 10 ) ||
-				 !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) ||
-				 !strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) ||
+			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) ||
 			     !strncmp(incs[i]->directory->relative_path.c_str(), "include\\reactos\\wine", 20 ) )
 			{
-				includes_ros.push_back ( path );
+				if (strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ))
+					// not crt include
+					includes_ros.push_back ( path );
 			}
 			else
 			{
@@ -226,11 +227,11 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 				baseaddr = prop.value;
 		}
 	}
-    /* include intermediate path for reactos.rc */
-    string version = intdir + "\\include\\reactos";
-    includes.push_back (version);
-	
-    string include_string;
+	/* include intermediate path for reactos.rc */
+	string version = intdir + "\\include\\reactos";
+	includes.push_back (version);
+
+	string include_string;
 
 	fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" );
 	fprintf ( OUT, "<VisualStudioProject\r\n" );