Index: dll/win32/mshtml/mshtml.rbuild
===================================================================
--- dll/win32/mshtml/mshtml.rbuild	(Revision 42055)
+++ dll/win32/mshtml/mshtml.rbuild	(Arbeitskopie)
@@ -69,15 +69,16 @@
 	<library>wine</library>
 	<library>strmiids</library>
 	<library>uuid</library>
-	<library>urlmon</library>
+	<library delayimport="true">urlmon</library>
 	<library>shlwapi</library>
 	<library>ole32</library>
-	<library>oleaut32</library>
+	<library delayimp="true">oleaut32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
+	<library>delayimp</library>
 	<dependency>mshtml_nsiface_header</dependency>
 </module>
 <module name="mshtml_nsiface_header" type="idlheader" allowwarnings="true">
Index: dll/win32/shlwapi/shlwapi.rbuild
===================================================================
--- dll/win32/shlwapi/shlwapi.rbuild	(Revision 42055)
+++ dll/win32/shlwapi/shlwapi.rbuild	(Arbeitskopie)
@@ -28,16 +28,17 @@
 	<library>gdi32</library>
 	<library>advapi32</library>
 	<library>kernel32</library>
-	<library>oleaut32</library>
-	<library>ole32</library>
-	<library>comctl32</library>
+	<library delayimport="true">oleaut32</library>
+	<library delayimport="true">ole32</library>
+	<library delayimport="true">comctl32</library>
 	<library>comdlg32</library>
-	<library>mpr</library>
-	<library>mlang</library>
-	<library>urlmon</library>
-	<library>shell32</library>
-	<library>winmm</library>
-	<library>version</library>
+	<library delayimport="true">mpr</library>
+	<library delayimport="true">mlang</library>
+	<library delayimport="true">urlmon</library>
+	<library delayimport="true">shell32</library>
+	<library delayimport="true">winmm</library>
+	<library delayimport="true">version</library>
 	<library>ntdll</library>
+	<library>delayimp</library>
 </module>
 </group>
Index: dll/win32/user32/user32.rbuild
===================================================================
--- dll/win32/user32/user32.rbuild	(Revision 42055)
+++ dll/win32/user32/user32.rbuild	(Arbeitskopie)
@@ -6,11 +6,12 @@
 	<library>wine</library>
 	<library>gdi32</library>
 	<library>kernel32</library>
-	<library>advapi32</library>
+	<library delayimp="true">advapi32</library>
 	<library>imm32</library>
 	<library>win32ksys</library>
 	<library>pseh</library>
 	<library>ntdll</library>
+	<library>delayimp</library>
 	<compilerflag compilerset="gcc">-fms-extensions</compilerflag>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
 	<directory name="include">
Index: tools/rbuild/backend/mingw/modulehandler.cpp
===================================================================
--- tools/rbuild/backend/mingw/modulehandler.cpp	(Revision 42055)
+++ tools/rbuild/backend/mingw/modulehandler.cpp	(Arbeitskopie)
@@ -145,9 +145,23 @@
 const FileLocation*
 MingwModuleHandler::GetImportLibraryFilename (
 	const Module& module,
-	string_list* pclean_files )
+	string_list* pclean_files,
+	bool delayimp )
 {
-	FileLocation *target = new FileLocation ( *module.dependency );
+	FileLocation *target;
+
+	if (module.HasImportLibrary())
+	{
+		if (delayimp)
+		{
+			target = new FileLocation ( *module.delayImportLibrary->target );
+		}
+		else
+			target = new FileLocation ( *module.importLibrary->target );
+	}
+	else
+		target = new FileLocation ( *module.dependency );
+
 	if ( pclean_files )
 	{
 		string_list& clean_files = *pclean_files;
@@ -324,7 +338,8 @@
 
 string
 MingwModuleHandler::GetImportLibraryDependency (
-	const Module& importedModule )
+	const Module& importedModule,
+	bool delayimp )
 {
 	string dep;
 	if ( ReferenceObjects ( importedModule ) )
@@ -346,7 +361,7 @@
 	}
 	else
 	{
-		const FileLocation *library_target = GetImportLibraryFilename ( importedModule, NULL );
+		const FileLocation *library_target = GetImportLibraryFilename ( importedModule, NULL, delayimp );
 		dep = backend->GetFullName ( *library_target );
 		delete library_target;
 	}
@@ -358,7 +373,7 @@
 		for ( size_t i = 0; i < libraries.size (); ++ i )
 		{
 			dep += " ";
-			dep += GetImportLibraryDependency ( *libraries[i]->importedModule );
+			dep += GetImportLibraryDependency ( *libraries[i]->importedModule, libraries[i]->delayimp );
 		}
 	}
 
@@ -378,7 +393,7 @@
 		}
 	}
 	else
-		targets.push_back ( GetImportLibraryDependency ( dependencyModule ) );
+		targets.push_back ( GetImportLibraryDependency ( dependencyModule, false ) );
 }
 
 void
@@ -746,7 +761,7 @@
 			dependencies += " \\\n\t\t", wrap_count = 0;
 		else if ( dependencies.size () > 0 )
 			dependencies += " ";
-		dependencies += GetImportLibraryDependency ( *libraries[i]->importedModule );
+		dependencies += GetImportLibraryDependency ( *libraries[i]->importedModule, libraries[i]->delayimp );
 	}
 	return dependencies;
 }
@@ -2135,42 +2150,57 @@
 }
 
 void
-MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ()
+MingwModuleHandler::GenerateImportLibraryTarget (
+	const FileLocation *defFilename,
+	const FileLocation *library_target,
+	bool delayimp)
 {
-	if ( module.importLibrary != NULL )
+	string empty = "tools" + sSep + "rbuild" + sSep + "empty.def";
+
+	fprintf ( fMakefile, "# IMPORT LIBRARY RULE\n" );
+
+	fprintf ( fMakefile, "%s:",
+	          backend->GetFullName ( *library_target ).c_str () );
+
+	if ( defFilename )
 	{
-		const FileLocation *library_target = GetImportLibraryFilename ( module, &clean_files );
-		const FileLocation *defFilename = GetDefinitionFilename ();
-		string empty = "tools" + sSep + "rbuild" + sSep + "empty.def";
+		fprintf ( fMakefile, " %s",
+		          backend->GetFullName ( *defFilename ).c_str () );
+	}
 
-		fprintf ( fMakefile, "# IMPORT LIBRARY RULE\n" );
+	fprintf ( fMakefile, " | %s\n",
+	          backend->GetFullPath ( *library_target ).c_str () );
 
-		fprintf ( fMakefile, "%s:",
-		          backend->GetFullName ( *library_target ).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );
 
-		if ( defFilename )
-		{
-			fprintf ( fMakefile, " %s",
-			          backend->GetFullName ( *defFilename ).c_str () );
-		}
+	fprintf ( fMakefile,
+	          "\t${dlltool} --dllname %s --def %s %s %s%s%s\n\n",
+	          module.GetDllName ().c_str (),
+	          defFilename ? backend->GetFullName ( *defFilename ).c_str ()
+	                      : empty.c_str (),
+	          delayimp ? "--output-delaylib" : "--output-lib",
+	          backend->GetFullName ( *library_target ).c_str (),
+	          module.mangledSymbols ? "" : " --kill-at",
+	          module.underscoreSymbols ? " --add-underscore" : "" );
+}
 
-		fprintf ( fMakefile, " | %s\n",
-		          backend->GetFullPath ( *library_target ).c_str () );
+void
+MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ()
+{
+	if ( module.importLibrary != NULL )
+	{
+		const FileLocation *library_target = GetImportLibraryFilename ( module, &clean_files, false );
+		const FileLocation *delayimp_target = GetImportLibraryFilename ( module, &clean_files, true );
+		const FileLocation *defFilename = GetDefinitionFilename ();
 
-		fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );
+		GenerateImportLibraryTarget(defFilename, library_target, false);
+		GenerateImportLibraryTarget(defFilename, delayimp_target, true);
 
-		fprintf ( fMakefile,
-		          "\t${dlltool} --dllname %s --def %s --output-lib %s%s%s\n\n",
-		          module.GetDllName ().c_str (),
-		          defFilename ? backend->GetFullName ( *defFilename ).c_str ()
-		                      : empty.c_str (),
-		          backend->GetFullName ( *library_target ).c_str (),
-		          module.mangledSymbols ? "" : " --kill-at",
-		          module.underscoreSymbols ? " --add-underscore" : "" );
-
 		if ( defFilename )
 			delete defFilename;
 		delete library_target;
+		delete delayimp_target;
+
 	}
 }
 
Index: tools/rbuild/backend/mingw/modulehandler.h
===================================================================
--- tools/rbuild/backend/mingw/modulehandler.h	(Revision 42055)
+++ tools/rbuild/backend/mingw/modulehandler.h	(Arbeitskopie)
@@ -57,7 +57,8 @@
 
 	static const FileLocation* GetImportLibraryFilename (
 		const Module& module,
-		string_list* pclean_files );
+		string_list* pclean_files,
+		bool delayimp );
 
 	static std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines, std::set<std::string> &used_defs );
 	static std::string GenerateDefineParametersFromVector ( const std::vector<Define*>& defines, CompilerType compiler );
@@ -95,7 +96,7 @@
 	std::string GetBasename ( const std::string& filename ) const;
 	std::string GetCompilationUnitDependencies ( const CompilationUnit& compilationUnit ) const;
 	const FileLocation* GetModuleArchiveFilename () const;
-	std::string GetImportLibraryDependency ( const Module& importedModule );
+	std::string GetImportLibraryDependency ( const Module& importedModule, bool delayimp );
 	void GetTargets ( const Module& dependencyModule,
 	                  string_list& targets );
 	void GetModuleDependencies ( string_list& dependencies );
@@ -118,6 +119,7 @@
 	void GeneratePhonyTarget() const;
 	void GenerateBuildMapCode ( const FileLocation *mapTarget = NULL );
 	void GenerateRules ();
+	void GenerateImportLibraryTarget (const FileLocation *defFilename, const FileLocation *library_target, bool delayimp);
 	void GenerateImportLibraryTargetIfNeeded ();
 	void GetDefinitionDependencies ( std::vector<FileLocation>& dependencies ) const;
 	std::string GetLinkingDependencies () const;
Index: tools/rbuild/module.cpp
===================================================================
--- tools/rbuild/module.cpp	(Revision 42055)
+++ tools/rbuild/module.cpp	(Arbeitskopie)
@@ -260,6 +260,7 @@
 	: project (project),
 	  node (moduleNode),
 	  importLibrary (NULL),
+	  delayImportLibrary (NULL),
 	  metadata (NULL),
 	  bootSector (NULL),
 	  bootstrap (NULL),
@@ -509,6 +510,7 @@
 		layoutNameResId = "";
 
 	SetImportLibrary ( NULL );
+	this->delayImportLibrary = NULL;
 }
 
 Module::~Module ()
@@ -715,7 +717,10 @@
 	}
 	else if ( e.name == "library" && e.value.size () )
 	{
+		const XMLAttribute* att = e.GetAttribute ( "delayimport", false );
 		Library* pLibrary = new Library ( e, *this, e.value );
+		if ( att && !stricmp ( att->value.c_str(), "true" ) )
+			pLibrary->delayimp = true;
 		non_if_data.libraries.push_back ( pLibrary );
 		subs_invalid = true;
 	}
@@ -780,7 +785,8 @@
 				e.location,
 				"Only one <importlibrary> is valid per module" );
 		}
-		SetImportLibrary ( new ImportLibrary ( project, e, this ) );
+		SetImportLibrary ( new ImportLibrary ( project, e, this, false ) );
+		SetDelayImportLibrary ( new ImportLibrary ( project, e, this, true ) );
 		subs_invalid = true;
 	}
 	else if ( e.name == "if" || e.name == "ifnot" )
@@ -1420,6 +1426,12 @@
 	                                HasImportLibrary () ? "lib" + name + ".a" : output->name );
 }
 
+void
+Module::SetDelayImportLibrary ( ImportLibrary* importLibrary )
+{
+	this->delayImportLibrary = importLibrary;
+}
+
 std::string
 Module::GetDllName () const
 {
@@ -1482,7 +1494,8 @@
 	: node(&_node),
 	  module(_module),
 	  name(_name),
-	  importedModule(_module.project.LocateModule(_name))
+	  importedModule(_module.project.LocateModule(_name)),
+	  delayimp(false)
 {
 	if ( module.name == name )
 	{
@@ -1506,7 +1519,8 @@
 	: node(NULL),
 	  module(_module),
 	  name(_name),
-	  importedModule(_module.project.LocateModule(_name))
+	  importedModule(_module.project.LocateModule(_name)),
+	  delayimp(false)
 {
 	if ( !importedModule )
 	{
@@ -1817,12 +1831,14 @@
 ImportLibrary::~ImportLibrary ()
 {
 	delete source;
+	delete target;
 }
 
 
 ImportLibrary::ImportLibrary ( const Project& project,
                                const XMLElement& node,
-                               const Module* module )
+                               const Module* module,
+                               bool delayimp )
 	: XmlNode ( project, node ),
 	  module (module)
 {
@@ -1889,6 +1905,11 @@
 		                            name,
 		                            &node );
 	}
+
+	target = new FileLocation ( IntermediateDirectory,
+	                            base->output->relative_path,
+	                            "lib" + module->name + (delayimp ? ".delayimp.a" :  ".a" ));
+
 }
 
 
Index: tools/rbuild/rbuild.h
===================================================================
--- tools/rbuild/rbuild.h	(Revision 42055)
+++ tools/rbuild/rbuild.h	(Arbeitskopie)
@@ -377,6 +377,7 @@
 	std::string buildtype;
 	ModuleType type;
 	ImportLibrary* importLibrary;
+	ImportLibrary* delayImportLibrary;
 	Metadata* metadata;
 	Bootsector* bootSector;
 	bool mangledSymbols;
@@ -429,6 +430,7 @@
 	std::string GetDllName() const;
 private:
 	void SetImportLibrary ( ImportLibrary* importLibrary );
+	void SetDelayImportLibrary ( ImportLibrary* importLibrary );
 	DirectoryLocation GetTargetDirectoryTree () const;
 	std::string GetDefaultModuleExtension () const;
 	std::string GetDefaultModuleEntrypoint () const;
@@ -555,6 +557,7 @@
 	const Module& module;
 	std::string name;
 	const Module* importedModule;
+	bool delayimp;
 
 	Library ( const XMLElement& _node,
 	          const Module& _module,
@@ -655,10 +658,12 @@
 	const Module* module;
 	std::string dllname;
 	FileLocation *source;
+	FileLocation *target;
 
 	ImportLibrary ( const Project& project,
 	                const XMLElement& node,
-	                const Module* module );
+	                const Module* module,
+	                bool delayimp );
 	~ImportLibrary ();
 };