Uncomment out DisableThreadLibraryCalls in DllMain and add the

dlls/dinput8/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput8.dll
 IMPORTLIB = libdinput8.$(IMPLIBEXT)
-IMPORTS   = dinput
+IMPORTS   = dinput kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \

dlls/dplay/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplay.dll
 IMPORTLIB = libdplay.$(IMPLIBEXT)
-IMPORTS   = dplayx
+IMPORTS   = dplayx kernel32
 
 C_SRCS = dplay_main.c
 

dlls/newdev/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = newdev.dll
 IMPORTLIB = libnewdev.$(IMPLIBEXT)
+IMPORTS   = kernel32
 
 C_SRCS = main.c
 

dlls/ntdll/loader.c

@@ -2088,6 +2088,16 @@ NTSTATUS WINAPI NtUnloadDriver( const UNICODE_STRING *DriverServiceName )
 
 
 /******************************************************************
+ *		DllMain   (NTDLL.@)
+ */
+BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
+{
+    if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst );
+    return TRUE;
+}
+
+
+/******************************************************************
  *		__wine_init_windows_dir   (NTDLL.@)
  *
  * Windows and system dir initialization once kernel32 has been loaded.

dlls/olepro32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32.dll
 IMPORTLIB = libolepro32.$(IMPLIBEXT)
-IMPORTS   = oleaut32
+IMPORTS   = oleaut32 kernel32
 
 C_SRCS = olepro32stubs.c
 

dlls/rsabase/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rsabase.dll
 IMPORTLIB = librsabase.$(IMPLIBEXT)
-IMPORTS   = rsaenh
+IMPORTS   = rsaenh kernel32
 
 SUBDIRS = tests
 

dlls/shfolder/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shfolder.dll
 IMPORTLIB = libshfolder.$(IMPLIBEXT)
-IMPORTS   = shell32
+IMPORTS   = shell32 kernel32
 
 C_SRCS = shfolder_main.c
 

dlls/stdole2.tlb/Makefile.in

@@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = stdole2.tlb
+IMPORTS   = kernel32
 
 RC_SRCS = rsrc.rc
 RC_TLB = std_ole_v2.tlb

dlls/stdole32.tlb/Makefile.in

@@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = stdole32.tlb
+IMPORTS   = kernel32
 
 RC_SRCS = rsrc.rc
 RC_TLB = std_ole_v1.tlb

dlls/winecrt0/dll_main.c

@@ -24,6 +24,6 @@
 
 BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
 {
-    /* if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); */
+    if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst );
     return TRUE;
 }