diff --git a/reactos/tools/rbuild/bootstrap.cpp b/reactos/tools/rbuild/bootstrap.cpp
index 992510897d2..277f8676348 100644
--- a/reactos/tools/rbuild/bootstrap.cpp
+++ b/reactos/tools/rbuild/bootstrap.cpp
@@ -71,6 +71,8 @@ Bootstrap::IsSupportedModuleType ( ModuleType type )
 		case EmbeddedTypeLib:
 		case ElfExecutable:
 			return false;
+		case TypeDontCare:
+			break;
 	}
 	throw InvalidOperationException ( __FILE__,
 	                                  __LINE__ );
diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 51c0f2a3b14..2b030ce97cd 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -254,7 +254,7 @@ Module::Module ( const Project& project,
 		                                  __LINE__,
 		                                  "Module created with non-<module> node" );
 
-	xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () );
+	xmlbuildFile = FixSeparator ( Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () ) );
 
 	const XMLAttribute* att = moduleNode.GetAttribute ( "name", true );
 	assert(att);
@@ -963,6 +963,8 @@ Module::GetTargetDirectoryTree () const
 		case Alias:
 		case IdlHeader:
 			return IntermediateDirectory;
+		case TypeDontCare:
+			break;
 	}
 	throw InvalidOperationException ( __FILE__,
 	                                  __LINE__,
@@ -1018,6 +1020,8 @@ Module::GetDefaultModuleExtension () const
 			return "";
 		case EmbeddedTypeLib:
 			return ".tlb";
+		case TypeDontCare:
+			break;
 	}
 	throw InvalidOperationException ( __FILE__,
 	                                  __LINE__ );
@@ -1070,6 +1074,8 @@ Module::GetDefaultModuleEntrypoint () const
 		case ElfExecutable:
 		case EmbeddedTypeLib:
 			return "";
+		case TypeDontCare:
+			break;
 	}
 	throw InvalidOperationException ( __FILE__,
 	                                  __LINE__ );
@@ -1115,6 +1121,8 @@ Module::GetDefaultModuleBaseaddress () const
 		case IdlHeader:
 		case EmbeddedTypeLib:
 			return "";
+		case TypeDontCare:
+			break;
 	}
 	throw InvalidOperationException ( __FILE__,
 	                                  __LINE__ );
@@ -1161,6 +1169,8 @@ Module::IsDLL () const
 		case EmbeddedTypeLib:
 		case ElfExecutable:
 			return false;
+		case TypeDontCare:
+			break;
 	}
 	throw InvalidOperationException ( __FILE__,
 	                                  __LINE__ );
diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index b2a7367698e..589fdfa8a3e 100644
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -300,13 +300,15 @@ enum ModuleType
 	EmbeddedTypeLib = 26,
 	ElfExecutable = 27,
 	RpcProxy,
+	TypeDontCare,
 };
 
 enum HostType
 {
 	HostFalse,
 	HostDefault,
-	HostTrue
+	HostTrue,
+	HostDontCare,
 };
 
 class FileLocation