diff --git a/Make.rules.in b/Make.rules.in
index 2e5556a2933..0be804adbeb 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -141,7 +141,7 @@ LINTS = $(C_SRCS:.c=.ln)
 	$(WINDRES) -i $< -o $@
 
 .spec.spec.c:
-	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -spec $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -M $(MODULE) -spec $<
 
 .spec.spec.def:
 	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -def $<
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index 30efe2d7c4d..043009a5a52 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -1,5 +1,3 @@
-name	advapi32
-
 @ stdcall AbortSystemShutdownA(ptr) AbortSystemShutdownA
 @ stdcall AbortSystemShutdownW(ptr) AbortSystemShutdownW
 @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck
diff --git a/dlls/avicap32/avicap32.spec b/dlls/avicap32/avicap32.spec
index ce4c777b183..accd88ad537 100644
--- a/dlls/avicap32/avicap32.spec
+++ b/dlls/avicap32/avicap32.spec
@@ -1,5 +1,3 @@
-name avicap32
-
 @ stub capCreateCaptureWindowA
 @ stub capCreateCaptureWindowW
 @ stdcall capGetDriverDescriptionA(long ptr long ptr long) capGetDriverDescriptionA
diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec
index abfd32e4b02..d4a8acf2142 100644
--- a/dlls/avifil32/avifil32.spec
+++ b/dlls/avifil32/avifil32.spec
@@ -1,5 +1,3 @@
-name	avifil32
-
 @ stub    AVIBuildFilter
 @ stub    AVIBuildFilterA
 @ stub    AVIBuildFilterW
diff --git a/dlls/avifil32/avifile.spec b/dlls/avifil32/avifile.spec
index a3b9f5183cf..7582b8191f3 100644
--- a/dlls/avifil32/avifile.spec
+++ b/dlls/avifil32/avifile.spec
@@ -1,7 +1,3 @@
-name	avifile
-type	win16
-owner	avifil32
-
 # I'm just using "long" instead of "ptr" for the interface pointers,
 # because they are 32-bit pointers, not converted to 16-bit format,
 # but the app doesn't really need to know, it should never need to
diff --git a/dlls/comcat/comcat.spec b/dlls/comcat/comcat.spec
index d7ea4f3b52d..eec53b8b627 100644
--- a/dlls/comcat/comcat.spec
+++ b/dlls/comcat/comcat.spec
@@ -1,4 +1,3 @@
-name comcat
 init COMCAT_DllEntryPoint
 
 @ stdcall DllCanUnloadNow() COMCAT_DllCanUnloadNow
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index d85e2df6eb5..961e2cb2a74 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -1,4 +1,3 @@
-name	comctl32
 init	COMCTL32_LibMain
 
 # Functions exported by the Win95 comctl32.dll
diff --git a/dlls/commdlg/comdlg32.spec b/dlls/commdlg/comdlg32.spec
index 6d927e6c4a8..f65cedeea03 100644
--- a/dlls/commdlg/comdlg32.spec
+++ b/dlls/commdlg/comdlg32.spec
@@ -1,4 +1,3 @@
-name	comdlg32
 init	COMDLG32_DllEntryPoint
 
 @ stdcall ChooseColorA(ptr) ChooseColorA
diff --git a/dlls/commdlg/commdlg.spec b/dlls/commdlg/commdlg.spec
index 3ce3a3d693d..95232b1f6ef 100644
--- a/dlls/commdlg/commdlg.spec
+++ b/dlls/commdlg/commdlg.spec
@@ -1,7 +1,3 @@
-name	commdlg
-type	win16
-owner	comdlg32
-
 1   pascal16 GetOpenFileName(segptr) GetOpenFileName16
 2   pascal16 GetSaveFileName(segptr) GetSaveFileName16
 5   pascal16 ChooseColor(ptr) ChooseColor16
diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index ab2b3ca4e58..8920b149608 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -1,5 +1,4 @@
 # Old C runtime library. All functions provided by msvcrt
-name    crtdll
 init    CRTDLL_Init
 
 @ forward ??2@YAPAXI@Z msvcrt.??2@YAPAXI@Z
@@ -527,4 +526,3 @@ init    CRTDLL_Init
 @ forward wscanf msvcrt.wscanf
 @ forward _itow msvcrt._itow
 @ forward _ltow msvcrt._ltow
-
diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec
index 1e09b8e0d6c..3848eff9369 100644
--- a/dlls/crypt32/crypt32.spec
+++ b/dlls/crypt32/crypt32.spec
@@ -1,5 +1,3 @@
-name crypt32
-
 @ stub CertAddCRLContextToStore
 @ stub CertAddCTLContextToStore
 @ stub CertAddCertificateContextToStore
diff --git a/dlls/dciman32/dciman32.spec b/dlls/dciman32/dciman32.spec
index 762852da093..c7ba11aa0f5 100644
--- a/dlls/dciman32/dciman32.spec
+++ b/dlls/dciman32/dciman32.spec
@@ -1,5 +1,3 @@
-name	dciman32
-
 @ stub    DCIBeginAccess
 @ stdcall DCICloseProvider(long) DCICloseProvider
 @ stub    DCICreateOffscreen
diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec
index 0f98a073014..cb1bb4f7839 100644
--- a/dlls/ddraw/ddraw.spec
+++ b/dlls/ddraw/ddraw.spec
@@ -1,4 +1,3 @@
-name ddraw
 init DDRAW_DllMain
 
 @ stub DDHAL32_VidMemAlloc
diff --git a/dlls/devenum/devenum.spec b/dlls/devenum/devenum.spec
index 1e9263583a7..c5fc87af6d5 100644
--- a/dlls/devenum/devenum.spec
+++ b/dlls/devenum/devenum.spec
@@ -1,5 +1,3 @@
-name devenum
-
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer
diff --git a/dlls/dinput/dinput.spec b/dlls/dinput/dinput.spec
index 71072dda4bd..d00c41f1199 100644
--- a/dlls/dinput/dinput.spec
+++ b/dlls/dinput/dinput.spec
@@ -1,4 +1,3 @@
-name dinput
 init Init
 
 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
diff --git a/dlls/dinput8/dinput8.spec b/dlls/dinput8/dinput8.spec
index 774fa8a5069..1aee036c600 100644
--- a/dlls/dinput8/dinput8.spec
+++ b/dlls/dinput8/dinput8.spec
@@ -1,5 +1,3 @@
-name dinput8
-
 @ stdcall DirectInput8Create(long long ptr ptr ptr) DirectInput8Create
 @ stdcall DllCanUnloadNow() DINPUT8_DllCanUnloadNow
 @ stdcall DllGetClassObject(ptr ptr ptr) DINPUT8_DllGetClassObject
diff --git a/dlls/dplay/dplay.spec b/dlls/dplay/dplay.spec
index 4a00bb65eaf..19ddc5de6a0 100644
--- a/dlls/dplay/dplay.spec
+++ b/dlls/dplay/dplay.spec
@@ -1,5 +1,4 @@
 # First DirectPlay dll. Replaced by dplayx.dll.
-name dplay
 
 @ forward DirectPlayCreate dplayx.DirectPlayCreate
 @ forward DirectPlayEnumerate dplayx.DirectPlayEnumerate
diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec
index 674f00aba3d..939a8635a72 100644
--- a/dlls/dplayx/dplayx.spec
+++ b/dlls/dplayx/dplayx.spec
@@ -1,4 +1,3 @@
-name dplayx
 init DPLAYX_LibMain
 
   1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
diff --git a/dlls/dsound/dsound.spec b/dlls/dsound/dsound.spec
index f5a26dde2c3..5175d45f4b2 100644
--- a/dlls/dsound/dsound.spec
+++ b/dlls/dsound/dsound.spec
@@ -1,5 +1,3 @@
-name dsound
-
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate8
 2 stdcall DirectSoundEnumerateA(ptr ptr) DirectSoundEnumerateA
diff --git a/dlls/gdi/dispdib.spec b/dlls/gdi/dispdib.spec
index 82b94c2959a..82a2e5a5677 100644
--- a/dlls/gdi/dispdib.spec
+++ b/dlls/gdi/dispdib.spec
@@ -1,5 +1 @@
-name	dispdib
-type	win16
-owner	gdi32
-
 1 pascal16 DisplayDib(ptr ptr word) DisplayDib
diff --git a/dlls/gdi/gdi.exe.spec b/dlls/gdi/gdi.exe.spec
index 776ed6c7ef7..ad9be897a55 100644
--- a/dlls/gdi/gdi.exe.spec
+++ b/dlls/gdi/gdi.exe.spec
@@ -1,8 +1,4 @@
-name	gdi
-type	win16
-heap	65488  # 65536 - 16 (instance data) - 32 (stock objects)
-file	gdi.exe
-owner	gdi32
+heap	65520
 rsrc	version16.res
 
 1   pascal   SetBkColor(word long) SetBkColor16
diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec
index 7a12d6e03b9..1692789abe0 100644
--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
@@ -1,4 +1,3 @@
-name    gdi32
 init    MAIN_GdiInit
 
 # ordinal exports
diff --git a/dlls/gdi/wing.spec b/dlls/gdi/wing.spec
index 0d7a4e786ce..3b767bf7c97 100644
--- a/dlls/gdi/wing.spec
+++ b/dlls/gdi/wing.spec
@@ -1,7 +1,3 @@
-name    wing
-type    win16
-owner	gdi32
-
 1001 pascal16 WinGCreateDC() WinGCreateDC16
 1002 pascal16 WinGRecommendDIBFormat(ptr) WinGRecommendDIBFormat16
 1003 pascal16 WinGCreateBitmap(word ptr ptr) WinGCreateBitmap16
diff --git a/dlls/glu32/glu32.spec b/dlls/glu32/glu32.spec
index fd5054621da..afc05c1bdcf 100644
--- a/dlls/glu32/glu32.spec
+++ b/dlls/glu32/glu32.spec
@@ -1,5 +1,3 @@
-name glu32
-
 @ stdcall gluLookAt(double double double double double double double double double) wine_gluLookAt
 @ stdcall gluOrtho2D(double double double double) wine_gluOrtho2D
 @ stdcall gluPerspective(double double double double) wine_gluPerspective
diff --git a/dlls/icmp/icmp.spec b/dlls/icmp/icmp.spec
index 9cb088e82ac..6cea83e7470 100644
--- a/dlls/icmp/icmp.spec
+++ b/dlls/icmp/icmp.spec
@@ -1,5 +1,3 @@
-name icmp
-
 @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
 @ stdcall IcmpCreateFile() IcmpCreateFile
 @ stub  IcmpParseReplies
@@ -8,5 +6,3 @@ name icmp
 @ stub  do_echo_rep
 @ stub  do_echo_req
 @ stub  register_icmp
-
-
diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec
index af5bd8dab1f..8fa9b7d32cc 100644
--- a/dlls/imagehlp/imagehlp.spec
+++ b/dlls/imagehlp/imagehlp.spec
@@ -1,4 +1,3 @@
-name	imagehlp
 init	IMAGEHLP_LibMain
 
 @ stdcall BindImage(str str str) BindImage
diff --git a/dlls/imm32/imm.spec b/dlls/imm32/imm.spec
index 21fc9fcfb94..e7d2fb3892f 100644
--- a/dlls/imm32/imm.spec
+++ b/dlls/imm32/imm.spec
@@ -1,7 +1,3 @@
-name	imm
-type	win16
-owner	imm32
-
 4   stub IMMGETDEFAULTIMEWND
 7   stub IMMGETDESCRIPTIONA
 8   stub IMMGETIMEFILENAMEA
diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec
index 94a1d99acbb..2abbae3cbda 100644
--- a/dlls/imm32/imm32.spec
+++ b/dlls/imm32/imm32.spec
@@ -1,5 +1,3 @@
-name	imm32
-
 @ stdcall ImmAssociateContext(long long) ImmAssociateContext
 @ stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA
 @ stdcall ImmConfigureIMEW(long long long ptr) ImmConfigureIMEW
diff --git a/dlls/kernel/comm.spec b/dlls/kernel/comm.spec
index 05267a1e31c..d058180d161 100644
--- a/dlls/kernel/comm.spec
+++ b/dlls/kernel/comm.spec
@@ -1,7 +1,3 @@
-name	comm
-type	win16
-owner	kernel32
-
   1 stub INICOM
   2 stub SETCOM
   3 stub SETQUE
@@ -21,4 +17,3 @@ owner	kernel32
  19 stub COMMWRITESTRING
  20 stub READCOMMSTRING
 100 stub ENABLENOTIFICATION
-
diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec
index 130dceb0d0c..728140e3c0c 100644
--- a/dlls/kernel/kernel32.spec
+++ b/dlls/kernel/kernel32.spec
@@ -1,4 +1,3 @@
-name	kernel32
 init	MAIN_KernelInit
 
 # Functions exported by the Win95 kernel32.dll
diff --git a/dlls/kernel/krnl386.exe.spec b/dlls/kernel/krnl386.exe.spec
index 97d9d742683..e41f7e73356 100644
--- a/dlls/kernel/krnl386.exe.spec
+++ b/dlls/kernel/krnl386.exe.spec
@@ -1,7 +1,4 @@
 name	kernel
-type	win16
-file	krnl386.exe
-owner	kernel32
 rsrc	version16.res
 
 # 1-207 are the basic functions, those are (with minor variations)
diff --git a/dlls/kernel/stress.spec b/dlls/kernel/stress.spec
index 4bc3064a5bc..a565b19dda1 100644
--- a/dlls/kernel/stress.spec
+++ b/dlls/kernel/stress.spec
@@ -1,9 +1,5 @@
 # summary: resource modification dll
 #
-name	stress
-type	win16
-owner	kernel32
-
 2   pascal AllocMem(long) AllocMem
 3   pascal FreeAllMem() FreeAllMem
 6   pascal AllocFileHandles(word) AllocFileHandles
diff --git a/dlls/kernel/system.spec b/dlls/kernel/system.spec
index 98c28188cce..0a309472725 100644
--- a/dlls/kernel/system.spec
+++ b/dlls/kernel/system.spec
@@ -1,7 +1,3 @@
-name	system
-type	win16
-owner	kernel32
-
 1 pascal   InquireSystem(word word) InquireSystem16
 2 pascal16 CreateSystemTimer(word segptr) WIN16_CreateSystemTimer
 3 pascal16 KillSystemTimer(word) SYSTEM_KillSystemTimer
diff --git a/dlls/kernel/toolhelp.spec b/dlls/kernel/toolhelp.spec
index e1f50be569d..344fce5f647 100644
--- a/dlls/kernel/toolhelp.spec
+++ b/dlls/kernel/toolhelp.spec
@@ -1,7 +1,3 @@
-name	toolhelp
-type	win16
-owner	kernel32
-
 50 pascal16 GlobalHandleToSel(word) GlobalHandleToSel16
 51 pascal16 GlobalFirst(ptr word) GlobalFirst16
 52 pascal16 GlobalNext(ptr word) GlobalNext16
diff --git a/dlls/kernel/win87em.spec b/dlls/kernel/win87em.spec
index 79eb3372f31..08385158439 100644
--- a/dlls/kernel/win87em.spec
+++ b/dlls/kernel/win87em.spec
@@ -1,7 +1,3 @@
-name	win87em
-type	win16
-owner	kernel32
-
 1 pascal -register _fpMath() WIN87_fpmath
 3 pascal16 __WinEm87Info(ptr word) WIN87_WinEm87Info
 4 pascal16 __WinEm87Restore(ptr word) WIN87_WinEm87Restore
diff --git a/dlls/kernel/windebug.spec b/dlls/kernel/windebug.spec
index 4dcb921ba9c..658d7a889d0 100644
--- a/dlls/kernel/windebug.spec
+++ b/dlls/kernel/windebug.spec
@@ -1,7 +1,3 @@
-name	windebug
-type	win16
-owner	kernel32
-
   1 stub     WINDEBUG
   2 stub     WEP
   3 pascal -register WinNotify() WinNotify16
diff --git a/dlls/kernel/wprocs.spec b/dlls/kernel/wprocs.spec
index d9ca913f25f..5ab4fe4dbb3 100644
--- a/dlls/kernel/wprocs.spec
+++ b/dlls/kernel/wprocs.spec
@@ -1,7 +1,3 @@
-name	wprocs
-type	win16
-owner	kernel32
-
 # Interrupt vectors 0-255 are ordinals 100-355
 # The '-interrupt' keyword takes care of the flags pushed on the stack by the interrupt
 117 pascal -interrupt INT_Int11Handler() INT_Int11Handler
diff --git a/dlls/lzexpand/lz32.spec b/dlls/lzexpand/lz32.spec
index 503dce18068..2499ed459bb 100644
--- a/dlls/lzexpand/lz32.spec
+++ b/dlls/lzexpand/lz32.spec
@@ -1,5 +1,3 @@
-name	lz32
-
 @ stdcall CopyLZFile(long long) CopyLZFile
 @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
 @ stdcall GetExpandedNameW(wstr ptr) GetExpandedNameW
diff --git a/dlls/lzexpand/lzexpand.spec b/dlls/lzexpand/lzexpand.spec
index 541ff31eea4..308e109a7c0 100644
--- a/dlls/lzexpand/lzexpand.spec
+++ b/dlls/lzexpand/lzexpand.spec
@@ -1,7 +1,3 @@
-name	lzexpand
-type	win16
-owner	lz32
-
 1  pascal   LZCopy(word word) LZCopy16
 2  pascal16 LZOpenFile(str ptr word) LZOpenFile16
 3  pascal16 LZInit(word) LZInit16
diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec
index be82299aba0..74a96bba223 100644
--- a/dlls/mapi32/mapi32.spec
+++ b/dlls/mapi32/mapi32.spec
@@ -1,5 +1,3 @@
-name mapi32
-
 @ stub BMAPIAddress
 @ stub BMAPIDetails
 @ stub BMAPIFindNext
diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec
index fb8492a70fb..790b6b68110 100644
--- a/dlls/mpr/mpr.spec
+++ b/dlls/mpr/mpr.spec
@@ -1,5 +1,3 @@
-name mpr
-
 # ordinal exports
  1 stub @
  2 stub @
diff --git a/dlls/msacm/imaadp32/imaadp32.acm.spec b/dlls/msacm/imaadp32/imaadp32.acm.spec
index 53b1f7947a5..a0ba1c7e701 100644
--- a/dlls/msacm/imaadp32/imaadp32.acm.spec
+++ b/dlls/msacm/imaadp32/imaadp32.acm.spec
@@ -1,4 +1 @@
-name imaadp32
-file imaadp32.acm
-
 @ stdcall DriverProc (long long long long long) ADPCM_DriverProc
diff --git a/dlls/msacm/msacm.spec b/dlls/msacm/msacm.spec
index 1ac566bed72..36b65cebc11 100644
--- a/dlls/msacm/msacm.spec
+++ b/dlls/msacm/msacm.spec
@@ -1,7 +1,3 @@
-name	msacm
-type	win16
-owner	msacm32
-
   1 stub     WEP
   2 stub     DRIVERPROC
   3 stub     ___EXPORTEDSTUB
diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec
index 07f92811069..9ac4a174762 100644
--- a/dlls/msacm/msacm32.spec
+++ b/dlls/msacm/msacm32.spec
@@ -1,4 +1,3 @@
-name msacm32
 init MSACM32_LibMain
 
 @ stdcall acmDriverAddA(ptr long long long long) acmDriverAddA
diff --git a/dlls/msacm/msadp32/msadp32.acm.spec b/dlls/msacm/msadp32/msadp32.acm.spec
index e07ed7ff9b4..a0ba1c7e701 100644
--- a/dlls/msacm/msadp32/msadp32.acm.spec
+++ b/dlls/msacm/msadp32/msadp32.acm.spec
@@ -1,4 +1 @@
-name msadp32
-file msadp32.acm
-
 @ stdcall DriverProc (long long long long long) ADPCM_DriverProc
diff --git a/dlls/msacm/msg711/msg711.acm.spec b/dlls/msacm/msg711/msg711.acm.spec
index 407f3ae6956..bd12f9c23a5 100644
--- a/dlls/msacm/msg711/msg711.acm.spec
+++ b/dlls/msacm/msg711/msg711.acm.spec
@@ -1,4 +1 @@
-name msg711
-file msg711.acm
-
 @ stdcall DriverProc(long long long long long) G711_DriverProc
diff --git a/dlls/msacm/winemp3/winemp3.acm.spec b/dlls/msacm/winemp3/winemp3.acm.spec
index 7df22aa4ca1..6ad29908786 100644
--- a/dlls/msacm/winemp3/winemp3.acm.spec
+++ b/dlls/msacm/winemp3/winemp3.acm.spec
@@ -1,4 +1 @@
-name winemp3
-file winemp3.acm
-
 @ stdcall DriverProc(long long long long long) MPEG3_DriverProc
diff --git a/dlls/msdmo/msdmo.spec b/dlls/msdmo/msdmo.spec
index 0915fa5696c..cf272b2451e 100644
--- a/dlls/msdmo/msdmo.spec
+++ b/dlls/msdmo/msdmo.spec
@@ -1,5 +1,3 @@
-name msdmo
-
 @ stub DMOEnum
 @ stub DMOGetName
 @ stub DMOGetTypes
@@ -15,4 +13,3 @@ name msdmo
 @ stub MoDuplicateMediaType
 @ stub MoFreeMediaType
 @ stub MoInitMediaType
-
diff --git a/dlls/msimg32/msimg32.spec b/dlls/msimg32/msimg32.spec
index dd4af755143..75ecae4aa66 100644
--- a/dlls/msimg32/msimg32.spec
+++ b/dlls/msimg32/msimg32.spec
@@ -1,5 +1,3 @@
-name msimg32
-
 @ stdcall AlphaBlend(long long long long long long long long long long long) AlphaBlend
 @ stub DllInitialize
 @ stdcall GradientFill(long ptr long ptr long long) GradientFill
diff --git a/dlls/msisys/msisys.ocx.spec b/dlls/msisys/msisys.ocx.spec
index 904ea070f1f..f10b4b61014 100644
--- a/dlls/msisys/msisys.ocx.spec
+++ b/dlls/msisys/msisys.ocx.spec
@@ -1,5 +1,3 @@
-name	msisys
-file	msisys.ocx
 init	MSISYS_DllMain
 
 @ stdcall DllCanUnloadNow() MSISYS_DllCanUnloadNow
diff --git a/dlls/msnet32/msnet32.spec b/dlls/msnet32/msnet32.spec
index 04003532db8..057f18575a3 100644
--- a/dlls/msnet32/msnet32.spec
+++ b/dlls/msnet32/msnet32.spec
@@ -1,5 +1,3 @@
-name msnet32
-
   1 stub @
   2 stub @
   3 stub @
@@ -96,4 +94,3 @@ name msnet32
  94 stub @
  95 stub @
  96 stub @
-  
diff --git a/dlls/msrle32/msrle32.spec b/dlls/msrle32/msrle32.spec
index 62e3ca8d3b9..345368e4bbc 100644
--- a/dlls/msrle32/msrle32.spec
+++ b/dlls/msrle32/msrle32.spec
@@ -1,4 +1 @@
-name msrle32
-
 @ stub DriverProc #(long long long long long)
-
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index e47a82d0ae5..7625e75739b 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1,5 +1,4 @@
 # msvcrt.dll - MS VC++ Run Time Library
-name    msvcrt
 init    MSVCRT_Init
 
 @ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index 7e88159a950..d50073a8666 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -1,6 +1,4 @@
 # msvcrt20.dll - MS VC++ Run Time Library
-name    msvcrt20
-
 @ stub ??0Iostream_init@@QAE@AAVios@@H@Z  #
 @ stub ??0Iostream_init@@QAE@XZ #
 @ stub ??0filebuf@@QAE@ABV0@@Z #
diff --git a/dlls/msvideo/msvfw32.spec b/dlls/msvideo/msvfw32.spec
index 3892934845c..003d92ec992 100644
--- a/dlls/msvideo/msvfw32.spec
+++ b/dlls/msvideo/msvfw32.spec
@@ -1,5 +1,3 @@
-name	msvfw32
-
 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124
 
diff --git a/dlls/msvideo/msvideo.spec b/dlls/msvideo/msvideo.spec
index 64c9ec456c5..a6aa52e2cd2 100644
--- a/dlls/msvideo/msvideo.spec
+++ b/dlls/msvideo/msvideo.spec
@@ -1,7 +1,3 @@
-name msvideo
-type win16
-owner msvfw32
-
 2 pascal VideoForWindowsVersion() VideoForWindowsVersion
 20 stub VIDEOGETNUMDEVS
 21 stub VIDEOGETERRORTEXT
diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec
index b476aa4b587..a418ff85ee7 100644
--- a/dlls/netapi32/netapi32.spec
+++ b/dlls/netapi32/netapi32.spec
@@ -1,5 +1,3 @@
-name	netapi32
 init	NETAPI32_LibMain
 
 1 stdcall Netbios(ptr) Netbios
-
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 499250a798f..2e86fd7dded 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1,5 +1,3 @@
-name	ntdll
-
 #note that the Zw... functions are alternate names for the
 #Nt... functions.  (see www.sysinternals.com for details)
 #if you change a Nt.. function DON'T FORGET to change the
diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec
index 1d46d8c1087..5e62fd9846c 100644
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@@ -1,105 +1,104 @@
-name	odbc32
 init    MAIN_OdbcInit
 
-001 stdcall SQLAllocConnect(long ptr) SQLAllocConnect
-002 stdcall SQLAllocEnv(ptr)  SQLAllocEnv
-003 stdcall SQLAllocStmt(long ptr) SQLAllocStmt
-004 stdcall SQLBindCol(long long long ptr long ptr) SQLBindCol
-005 stdcall SQLCancel(long) SQLCancel
-006 stdcall SQLColAttributes(long long long ptr long ptr ptr) SQLColAttributes
-007 stdcall SQLConnect(long str long str long str long) SQLConnect
-008 stdcall SQLDescribeCol(long long str long ptr ptr ptr ptr ptr) SQLDescribeCol
-009 stdcall SQLDisconnect(long) SQLDisconnect
-010 stdcall SQLError(long long long str ptr str long ptr) SQLError
-011 stdcall SQLExecDirect(long str long) SQLExecDirect
-012 stdcall SQLExecute(long) SQLExecute
-013 stdcall SQLFetch(long) SQLFetch
-014 stdcall SQLFreeConnect(long) SQLFreeConnect
-015 stdcall SQLFreeEnv(long) SQLFreeEnv
-016 stdcall SQLFreeStmt(long long ) SQLFreeStmt
-017 stdcall SQLGetCursorName(long str long ptr) SQLGetCursorName
-018 stdcall SQLNumResultCols(long ptr) SQLNumResultCols
-019 stdcall SQLPrepare(long str long) SQLPrepare
-020 stdcall SQLRowCount(long ptr) SQLRowCount
-021 stdcall SQLSetCursorName(long str long) SQLSetCursorName
-022 stdcall SQLSetParam(long long long long long long ptr ptr) SQLSetParam
-023 stdcall SQLTransact(long long long) SQLTransact
-024 stdcall SQLAllocHandle(long long ptr) SQLAllocHandle
-025 stdcall SQLBindParam(long long long long long long ptr ptr) SQLBindParam
-026 stdcall SQLCloseCursor(long) SQLCloseCursor
-027 stdcall SQLColAttribute(long long long ptr long ptr ptr) SQLColAttribute
-028 stdcall SQLCopyDesc(long long) SQLCopyDesc
-029 stdcall SQLEndTran(long long long) SQLEndTran
-030 stdcall SQLFetchScroll(long long long) SQLFetchScroll
-031 stdcall SQLFreeHandle(long long) SQLFreeHandle
-032 stdcall SQLGetConnectAttr(long long ptr long ptr) SQLGetConnectAttr
-033 stdcall SQLGetDescField(long long long ptr long ptr) SQLGetDescField
-034 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) SQLGetDescRec
-035 stdcall SQLGetDiagField(long long long long ptr long ptr) SQLGetDiagField
-036 stdcall SQLGetDiagRec(long long long str ptr str long ptr) SQLGetDiagRec
-037 stdcall SQLGetEnvAttr(long long ptr long ptr) SQLGetEnvAttr
-038 stdcall SQLGetStmtAttr(long long ptr long ptr) SQLGetStmtAttr
-039 stdcall SQLSetConnectAttr(long long ptr long) SQLSetConnectAttr
-040 stdcall SQLColumns(long str long str long str long str long) SQLColumns
-041 stdcall SQLDriverConnect(long long str long str long str long) SQLDriverConnect
-042 stdcall SQLGetConnectOption(long long ptr) SQLGetConnectOption
-043 stdcall SQLGetData(long long long ptr long ptr) SQLGetData
-044 stdcall SQLGetFunctions(long long ptr) SQLGetFunctions
-045 stdcall SQLGetInfo(long long ptr long ptr) SQLGetInfo
-046 stdcall SQLGetStmtOption(long long ptr) SQLGetStmtOption
-047 stdcall SQLGetTypeInfo(long long) SQLGetTypeInfo
-048 stdcall SQLParamData(long ptr) SQLParamData
-049 stdcall SQLPutData(long ptr long) SQLPutData
-050 stdcall SQLSetConnectOption(long long long) SQLSetConnectOption
-051 stdcall SQLSetStmtOption(long long long) SQLSetStmtOption
-052 stdcall SQLSpecialColumns(long long str long str long str long long long) SQLSpecialColumns
-053 stdcall SQLStatistics(long str long str long str long long long) SQLStatistics
-054 stdcall SQLTables(long str long str long str long str long) SQLTables
-055 stdcall SQLBrowseConnect(long str long str long ptr) SQLBrowseConnect
-056 stdcall SQLColumnPrivileges(long str long str long str long str long) SQLColumnPrivileges
-057 stdcall SQLDataSources(long long str long ptr str long ptr) SQLDataSources
-058 stdcall SQLDescribeParam(long long ptr ptr ptr ptr) SQLDescribeParam
-059 stdcall SQLExtendedFetch(long long long ptr ptr) SQLExtendedFetch
-060 stdcall SQLForeignKeys(long str long str long str long str long str long str long) SQLForeignKeys
-061 stdcall SQLMoreResults(long) SQLMoreResults
-062 stdcall SQLNativeSql(long str long str long ptr) SQLNativeSql
-063 stdcall SQLNumParams(long ptr) SQLNumParams
-064 stdcall SQLParamOptions(long long ptr) SQLParamOptions
-065 stdcall SQLPrimaryKeys(long str long str long str long) SQLPrimaryKeys
-066 stdcall SQLProcedureColumns(long str long str long str long str long) SQLProcedureColumns
-067 stdcall SQLProcedures(long str long str long str long) SQLProcedures
-068 stdcall SQLSetPos(long long long long) SQLSetPos
-069 stdcall SQLSetScrollOptions(long long long long) SQLSetScrollOptions
-070 stdcall SQLTablePrivileges(long str long str long str long) SQLTablePrivileges
-071 stdcall SQLDrivers(long long str long ptr str long ptr) SQLDrivers
-072 stdcall SQLBindParameter(long long long long long long long ptr long ptr) SQLBindParameter
-073 stdcall SQLSetDescField(long long long ptr long) SQLSetDescField
-074 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) SQLSetDescRec
-075 stdcall SQLSetEnvAttr(long long ptr long) SQLSetEnvAttr
-076 stdcall SQLSetStmtAttr(long long ptr long) SQLSetStmtAttr
-077 stdcall SQLAllocHandleStd(long long ptr) SQLAllocHandleStd
-078 stdcall SQLBulkOperations(long long) SQLBulkOperations
-079 stub    CloseODBCPerfData
-080 stub    CollectODBCPerfData
-081 stub    CursorLibLockDbc
-082 stub    CursorLibLockDesc
-083 stub    CursorLibLockStmt
-084 stub    ODBCGetTryWaitValue
-085 stub    CursorLibTransact
-086 stub    ODBSetTryWaitValue
-087 stub    LockHandle
-088 stub    ODBCInternalConnectW
-089 stub    ODBCSharedPerfMon
-090 stub    ODBCSharedVSFlag
-091 stub    OpenODBCPerfData
-092 stub    PostComponentError
-093 stub    PostODBCComponentError
-094 stub    PostODBCError
-095 stub    SearchStatusCode
-096 stub    VFreeErrors
-097 stub    VRetrieveDriverErrorsRowCol
-098 stub    ValidateErrorQueue
-099 stub    SQLColAttributesW
+  1 stdcall SQLAllocConnect(long ptr) SQLAllocConnect
+  2 stdcall SQLAllocEnv(ptr)  SQLAllocEnv
+  3 stdcall SQLAllocStmt(long ptr) SQLAllocStmt
+  4 stdcall SQLBindCol(long long long ptr long ptr) SQLBindCol
+  5 stdcall SQLCancel(long) SQLCancel
+  6 stdcall SQLColAttributes(long long long ptr long ptr ptr) SQLColAttributes
+  7 stdcall SQLConnect(long str long str long str long) SQLConnect
+  8 stdcall SQLDescribeCol(long long str long ptr ptr ptr ptr ptr) SQLDescribeCol
+  9 stdcall SQLDisconnect(long) SQLDisconnect
+ 10 stdcall SQLError(long long long str ptr str long ptr) SQLError
+ 11 stdcall SQLExecDirect(long str long) SQLExecDirect
+ 12 stdcall SQLExecute(long) SQLExecute
+ 13 stdcall SQLFetch(long) SQLFetch
+ 14 stdcall SQLFreeConnect(long) SQLFreeConnect
+ 15 stdcall SQLFreeEnv(long) SQLFreeEnv
+ 16 stdcall SQLFreeStmt(long long ) SQLFreeStmt
+ 17 stdcall SQLGetCursorName(long str long ptr) SQLGetCursorName
+ 18 stdcall SQLNumResultCols(long ptr) SQLNumResultCols
+ 19 stdcall SQLPrepare(long str long) SQLPrepare
+ 20 stdcall SQLRowCount(long ptr) SQLRowCount
+ 21 stdcall SQLSetCursorName(long str long) SQLSetCursorName
+ 22 stdcall SQLSetParam(long long long long long long ptr ptr) SQLSetParam
+ 23 stdcall SQLTransact(long long long) SQLTransact
+ 24 stdcall SQLAllocHandle(long long ptr) SQLAllocHandle
+ 25 stdcall SQLBindParam(long long long long long long ptr ptr) SQLBindParam
+ 26 stdcall SQLCloseCursor(long) SQLCloseCursor
+ 27 stdcall SQLColAttribute(long long long ptr long ptr ptr) SQLColAttribute
+ 28 stdcall SQLCopyDesc(long long) SQLCopyDesc
+ 29 stdcall SQLEndTran(long long long) SQLEndTran
+ 30 stdcall SQLFetchScroll(long long long) SQLFetchScroll
+ 31 stdcall SQLFreeHandle(long long) SQLFreeHandle
+ 32 stdcall SQLGetConnectAttr(long long ptr long ptr) SQLGetConnectAttr
+ 33 stdcall SQLGetDescField(long long long ptr long ptr) SQLGetDescField
+ 34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) SQLGetDescRec
+ 35 stdcall SQLGetDiagField(long long long long ptr long ptr) SQLGetDiagField
+ 36 stdcall SQLGetDiagRec(long long long str ptr str long ptr) SQLGetDiagRec
+ 37 stdcall SQLGetEnvAttr(long long ptr long ptr) SQLGetEnvAttr
+ 38 stdcall SQLGetStmtAttr(long long ptr long ptr) SQLGetStmtAttr
+ 39 stdcall SQLSetConnectAttr(long long ptr long) SQLSetConnectAttr
+ 40 stdcall SQLColumns(long str long str long str long str long) SQLColumns
+ 41 stdcall SQLDriverConnect(long long str long str long str long) SQLDriverConnect
+ 42 stdcall SQLGetConnectOption(long long ptr) SQLGetConnectOption
+ 43 stdcall SQLGetData(long long long ptr long ptr) SQLGetData
+ 44 stdcall SQLGetFunctions(long long ptr) SQLGetFunctions
+ 45 stdcall SQLGetInfo(long long ptr long ptr) SQLGetInfo
+ 46 stdcall SQLGetStmtOption(long long ptr) SQLGetStmtOption
+ 47 stdcall SQLGetTypeInfo(long long) SQLGetTypeInfo
+ 48 stdcall SQLParamData(long ptr) SQLParamData
+ 49 stdcall SQLPutData(long ptr long) SQLPutData
+ 50 stdcall SQLSetConnectOption(long long long) SQLSetConnectOption
+ 51 stdcall SQLSetStmtOption(long long long) SQLSetStmtOption
+ 52 stdcall SQLSpecialColumns(long long str long str long str long long long) SQLSpecialColumns
+ 53 stdcall SQLStatistics(long str long str long str long long long) SQLStatistics
+ 54 stdcall SQLTables(long str long str long str long str long) SQLTables
+ 55 stdcall SQLBrowseConnect(long str long str long ptr) SQLBrowseConnect
+ 56 stdcall SQLColumnPrivileges(long str long str long str long str long) SQLColumnPrivileges
+ 57 stdcall SQLDataSources(long long str long ptr str long ptr) SQLDataSources
+ 58 stdcall SQLDescribeParam(long long ptr ptr ptr ptr) SQLDescribeParam
+ 59 stdcall SQLExtendedFetch(long long long ptr ptr) SQLExtendedFetch
+ 60 stdcall SQLForeignKeys(long str long str long str long str long str long str long) SQLForeignKeys
+ 61 stdcall SQLMoreResults(long) SQLMoreResults
+ 62 stdcall SQLNativeSql(long str long str long ptr) SQLNativeSql
+ 63 stdcall SQLNumParams(long ptr) SQLNumParams
+ 64 stdcall SQLParamOptions(long long ptr) SQLParamOptions
+ 65 stdcall SQLPrimaryKeys(long str long str long str long) SQLPrimaryKeys
+ 66 stdcall SQLProcedureColumns(long str long str long str long str long) SQLProcedureColumns
+ 67 stdcall SQLProcedures(long str long str long str long) SQLProcedures
+ 68 stdcall SQLSetPos(long long long long) SQLSetPos
+ 69 stdcall SQLSetScrollOptions(long long long long) SQLSetScrollOptions
+ 70 stdcall SQLTablePrivileges(long str long str long str long) SQLTablePrivileges
+ 71 stdcall SQLDrivers(long long str long ptr str long ptr) SQLDrivers
+ 72 stdcall SQLBindParameter(long long long long long long long ptr long ptr) SQLBindParameter
+ 73 stdcall SQLSetDescField(long long long ptr long) SQLSetDescField
+ 74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) SQLSetDescRec
+ 75 stdcall SQLSetEnvAttr(long long ptr long) SQLSetEnvAttr
+ 76 stdcall SQLSetStmtAttr(long long ptr long) SQLSetStmtAttr
+ 77 stdcall SQLAllocHandleStd(long long ptr) SQLAllocHandleStd
+ 78 stdcall SQLBulkOperations(long long) SQLBulkOperations
+ 79 stub    CloseODBCPerfData
+ 80 stub    CollectODBCPerfData
+ 81 stub    CursorLibLockDbc
+ 82 stub    CursorLibLockDesc
+ 83 stub    CursorLibLockStmt
+ 84 stub    ODBCGetTryWaitValue
+ 85 stub    CursorLibTransact
+ 86 stub    ODBSetTryWaitValue
+ 87 stub    LockHandle
+ 88 stub    ODBCInternalConnectW
+ 89 stub    ODBCSharedPerfMon
+ 90 stub    ODBCSharedVSFlag
+ 91 stub    OpenODBCPerfData
+ 92 stub    PostComponentError
+ 93 stub    PostODBCComponentError
+ 94 stub    PostODBCError
+ 95 stub    SearchStatusCode
+ 96 stub    VFreeErrors
+ 97 stub    VRetrieveDriverErrorsRowCol
+ 98 stub    ValidateErrorQueue
+ 99 stub    SQLColAttributesW
 100 stub    SQLConnectW
 101 stub    SQLDescribeColW
 102 stub    SQLErrorW
@@ -175,4 +174,3 @@ init    MAIN_OdbcInit
 172 stub    SQLSetStmtAttrA
 173 stub    ODBCSharedTraceFlag
 174 stub    ODBCQualifyFileDSNW
-  
diff --git a/dlls/ole32/compobj.spec b/dlls/ole32/compobj.spec
index eb1aaac5943..1e92a6724fd 100644
--- a/dlls/ole32/compobj.spec
+++ b/dlls/ole32/compobj.spec
@@ -1,7 +1,3 @@
-name	compobj
-type	win16
-owner	ole32
-
 1 pascal CoBuildVersion() CoBuildVersion
 2 pascal CoInitialize(long) CoInitialize16
 3 pascal CoUninitialize() CoUninitialize16
diff --git a/dlls/ole32/ole2.spec b/dlls/ole32/ole2.spec
index cc2332eda8e..8ed0e587c97 100644
--- a/dlls/ole32/ole2.spec
+++ b/dlls/ole32/ole2.spec
@@ -1,7 +1,3 @@
-name	ole2
-type	win16
-owner	ole32
-
 1 pascal OleBuildVersion() OleBuildVersion
 2 pascal OleInitialize(ptr) OleInitialize
 3 pascal OleUninitialize() OleUninitialize
diff --git a/dlls/ole32/ole2conv.spec b/dlls/ole32/ole2conv.spec
index c8b87b800f4..0a457e5b702 100644
--- a/dlls/ole32/ole2conv.spec
+++ b/dlls/ole32/ole2conv.spec
@@ -1,7 +1,3 @@
-name	ole2conv
-type	win16
-owner	ole32
-
 1 stub GETFILTERINFO
 2 stub IMPORTGR
 3 stub GETFILTERPREF
diff --git a/dlls/ole32/ole2nls.spec b/dlls/ole32/ole2nls.spec
index 6a03c271c22..688213864ae 100644
--- a/dlls/ole32/ole2nls.spec
+++ b/dlls/ole32/ole2nls.spec
@@ -1,7 +1,3 @@
-name	ole2nls
-type	win16
-owner	ole32
-
 1 pascal GetUserDefaultLCID() GetUserDefaultLCID16
 2 pascal GetSystemDefaultLCID() GetSystemDefaultLCID16
 3 pascal16 GetUserDefaultLangID() GetUserDefaultLangID16
diff --git a/dlls/ole32/ole2prox.spec b/dlls/ole32/ole2prox.spec
index a8ba9cfef9e..3d05d2e26b9 100644
--- a/dlls/ole32/ole2prox.spec
+++ b/dlls/ole32/ole2prox.spec
@@ -1,7 +1,3 @@
-name	ole2prox
-type	win16
-owner	ole32
-
 1 stub DLLGETCLASSOBJECT
 #2 WEP
 #3 ___EXPORTEDSTUB
diff --git a/dlls/ole32/ole2thk.spec b/dlls/ole32/ole2thk.spec
index 9956e677acc..7ce7dc11508 100644
--- a/dlls/ole32/ole2thk.spec
+++ b/dlls/ole32/ole2thk.spec
@@ -1,7 +1,3 @@
-name	ole2thk
-type	win16
-owner	ole32
-
 1 stub WEP
 2 stub ROT16_ISRUNNING16
 3 stub ISWIN32SHANDLE
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index c7a86f50121..2602527a1d5 100644
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -1,4 +1,3 @@
-name	ole32
 init	OLE32_DllEntryPoint
 
   1 stub BindMoniker                # stdcall (ptr long ptr ptr) return 0,ERR_NOTIMPLEMENTED
diff --git a/dlls/ole32/storage.spec b/dlls/ole32/storage.spec
index 81f4706acd6..053b7a29758 100644
--- a/dlls/ole32/storage.spec
+++ b/dlls/ole32/storage.spec
@@ -1,9 +1,6 @@
 # Compound Storage DLL.
 # (FIXME: some methods are commented out. Commenting them in _WILL_
 #  result in dataloss. Do it at your own risk.)
-name	storage
-type	win16
-owner	ole32
 
 1 pascal StgCreateDocFileA(str long long ptr) StgCreateDocFile16
 2 stub StgCreateDocFileOnILockBytes
diff --git a/dlls/oleaut32/ole2disp.spec b/dlls/oleaut32/ole2disp.spec
index bc29e23bf89..2f9e2efbaa3 100644
--- a/dlls/oleaut32/ole2disp.spec
+++ b/dlls/oleaut32/ole2disp.spec
@@ -1,7 +1,3 @@
-name	ole2disp
-type	win16
-owner	oleaut32
-
 1 stub DLLGETCLASSOBJECT
 2 pascal SysAllocString(str)		SysAllocString16
 3 pascal SysReallocString(ptr str)	SysReAllocString16
diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec
index bd325a2692f..6643d7b6cbc 100644
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@@ -1,5 +1,3 @@
-name oleaut32
-
 1 stdcall DllGetClassObject(ptr ptr ptr) OLEAUT32_DllGetClassObject
 2 stdcall SysAllocString(wstr) SysAllocString
 3 stdcall SysReAllocString(ptr wstr) SysReAllocString
diff --git a/dlls/oleaut32/typelib.spec b/dlls/oleaut32/typelib.spec
index 6aa6f957c9e..3f943e2795e 100644
--- a/dlls/oleaut32/typelib.spec
+++ b/dlls/oleaut32/typelib.spec
@@ -1,7 +1,3 @@
-name typelib
-type win16
-owner oleaut32
-
 2  stub CREATETYPELIB
 3  pascal LoadTypeLib(ptr ptr) LoadTypeLib16
 4  stub LHASHVALOFNAMESYS
diff --git a/dlls/olecli/olecli.spec b/dlls/olecli/olecli.spec
index 5cc06ae31ea..053950fb987 100644
--- a/dlls/olecli/olecli.spec
+++ b/dlls/olecli/olecli.spec
@@ -1,7 +1,3 @@
-name	olecli
-type	win16
-owner	olecli32
-
 #1 WEP
 2 stub OLEDELETE
 3 stub OLESAVETOSTREAM
diff --git a/dlls/olecli/olecli32.spec b/dlls/olecli/olecli32.spec
index a26d10194c9..69859566609 100644
--- a/dlls/olecli/olecli32.spec
+++ b/dlls/olecli/olecli32.spec
@@ -1,5 +1,3 @@
-name olecli32
-
    1 stub WEP
    2 stub OleDelete
    3 forward OleSaveToStream ole32.OleSaveToStream
diff --git a/dlls/oledlg/oledlg.spec b/dlls/oledlg/oledlg.spec
index 722bf5b4a38..0acaf1fbd57 100644
--- a/dlls/oledlg/oledlg.spec
+++ b/dlls/oledlg/oledlg.spec
@@ -1,5 +1,3 @@
-name	oledlg
-
   1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
   2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
   3 stdcall OleUIInsertObjectA(ptr) OleUIInsertObjectA
diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec
index 586f97cc3fa..34d70fea97c 100644
--- a/dlls/olepro32/olepro32.spec
+++ b/dlls/olepro32/olepro32.spec
@@ -1,5 +1,3 @@
-name olepro32
-
 248 forward OleIconToCursor OLEAUT32.OleIconToCursor
 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
 250 forward OleCreatePropertyFrame OLEAUT32.OleCreatePropertyFrame
diff --git a/dlls/olesvr/olesvr.spec b/dlls/olesvr/olesvr.spec
index 285acfbe2d4..0552281dacc 100644
--- a/dlls/olesvr/olesvr.spec
+++ b/dlls/olesvr/olesvr.spec
@@ -1,7 +1,3 @@
-name	olesvr
-type	win16
-owner	olesvr32
-
 #1 WEP
 2  pascal OleRegisterServer(str ptr ptr word word) OleRegisterServer16
 3  pascal OleRevokeServer(long) OleRevokeServer16
diff --git a/dlls/olesvr/olesvr32.spec b/dlls/olesvr/olesvr32.spec
index 371b523702b..82155fbdce2 100644
--- a/dlls/olesvr/olesvr32.spec
+++ b/dlls/olesvr/olesvr32.spec
@@ -1,5 +1,3 @@
-name	olesvr32
-
  1 stub WEP
  2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
  3 stub OleRevokeServer
diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec
index 3c06c97a33c..d9313f0f609 100644
--- a/dlls/opengl32/opengl32.spec
+++ b/dlls/opengl32/opengl32.spec
@@ -1,4 +1,3 @@
-name opengl32
 init OpenGL32_Init
 
 @  stdcall wglCreateContext(long) wglCreateContext
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index d0e98498412..40aeff60a76 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -1,5 +1,3 @@
-name    psapi
-
 @ stdcall EmptyWorkingSet(long) EmptyWorkingSet
 @ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
 @ stdcall EnumProcessModules(long ptr long ptr) EnumProcessModules
diff --git a/dlls/qcap/qcap.spec b/dlls/qcap/qcap.spec
index 18321af6945..c5fc87af6d5 100644
--- a/dlls/qcap/qcap.spec
+++ b/dlls/qcap/qcap.spec
@@ -1,7 +1,4 @@
-name qcap
-
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer
-
diff --git a/dlls/quartz/quartz.spec b/dlls/quartz/quartz.spec
index 1b363ec7608..07963e6a8a2 100644
--- a/dlls/quartz/quartz.spec
+++ b/dlls/quartz/quartz.spec
@@ -1,5 +1,3 @@
-name	quartz
-
 @ stub AMGetErrorTextA
 @ stub AMGetErrorTextW
 @ stub AmpFactorToDB
@@ -8,4 +6,3 @@ name	quartz
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer
-
diff --git a/dlls/rasapi32/rasapi16.spec b/dlls/rasapi32/rasapi16.spec
index 3d978cd2c0b..1c22648f50b 100644
--- a/dlls/rasapi32/rasapi16.spec
+++ b/dlls/rasapi32/rasapi16.spec
@@ -1,7 +1,3 @@
-name    rasapi16
-type    win16
-owner	rasapi32
-
 #1 stub	WEP
 #2 stub	DLLENTRYPOINT
 3 stub	RNA1632_THUNKDATA16
diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec
index 94507e5f020..e1c59fae35c 100644
--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
@@ -1,5 +1,3 @@
-name	rasapi32
-
  1  stub RasAutodialAddressToNetwork
  2  stub RasAutodialEntryToNetwork
  3  stub RasConnectionNotificationA
diff --git a/dlls/richedit/riched32.spec b/dlls/richedit/riched32.spec
index 1f0e28bb41d..f5b750fda8b 100644
--- a/dlls/richedit/riched32.spec
+++ b/dlls/richedit/riched32.spec
@@ -1,4 +1,3 @@
-name	riched32
 init	RICHED32_LibMain
 
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index 32f0e9174de..0d2ca722efc 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -1,4 +1,3 @@
-name	rpcrt4
 init	RPCRT4_LibMain
 
 @ stub DceErrorInqTextA
diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec
index 7b286862ed7..95ae65da889 100644
--- a/dlls/serialui/serialui.spec
+++ b/dlls/serialui/serialui.spec
@@ -1,4 +1,3 @@
-name	serialui
 init	SERIALUI_LibMain
 
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 42234f5b43d..8bc5fd37570 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -1,5 +1,3 @@
-name setupapi
-
 @ stub AddMiniIconToList
 @ stub AddTagToGroupOrderListEntry
 @ stub AppendStringToMultiSz
diff --git a/dlls/setupapi/setupx.spec b/dlls/setupapi/setupx.spec
index 19206b1ce83..02ba5d5e8e8 100644
--- a/dlls/setupapi/setupx.spec
+++ b/dlls/setupapi/setupx.spec
@@ -1,7 +1,3 @@
-name    setupx
-type    win16
-owner	setupapi
-
 1    stub     WEP
 2    pascal16 IpOpen(str ptr) IpOpen16
 3    stub     IpOpenAppend #(str word)
diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec
index c0f683cdd46..d267e799a98 100644
--- a/dlls/shdocvw/shdocvw.spec
+++ b/dlls/shdocvw/shdocvw.spec
@@ -1,5 +1,3 @@
-name	shdocvw
-
 # ordinal exports
 101 stub @
 102 stub @
diff --git a/dlls/shell32/shell.spec b/dlls/shell32/shell.spec
index 3fb13b81c02..e2b0e54c0bd 100644
--- a/dlls/shell32/shell.spec
+++ b/dlls/shell32/shell.spec
@@ -1,6 +1,3 @@
-name	shell
-type	win16
-owner	shell32
 rsrc	version16.res
 
   1 pascal   RegOpenKey(long str ptr) RegOpenKey16
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 6834884c5d6..51253c7f087 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -1,4 +1,3 @@
-name	shell32
 init	Shell32LibMain
 
 # Functions exported by the Win95 shell32.dll
diff --git a/dlls/shfolder/shfolder.spec b/dlls/shfolder/shfolder.spec
index 65ca40db63d..e10bd731538 100644
--- a/dlls/shfolder/shfolder.spec
+++ b/dlls/shfolder/shfolder.spec
@@ -1,4 +1,2 @@
-name shfolder
-
 @ forward SHGetFolderPathA shell32.SHGetFolderPathA
 @ forward SHGetFolderPathW shell32.SHGetFolderPathW
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index c2225e0c234..6071dc07006 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -1,4 +1,3 @@
-name shlwapi
 init SHLWAPI_LibMain
 
 1   stdcall @(str ptr) SHLWAPI_1
diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec
index a1d8a9a23bc..c6a97bec0b5 100644
--- a/dlls/snmpapi/snmpapi.spec
+++ b/dlls/snmpapi/snmpapi.spec
@@ -1,4 +1,3 @@
-name    snmpapi
 init    SNMPAPI_DllMain
 
 @ stub SnmpSvcAddrIsIpx
diff --git a/dlls/sti/sti.spec b/dlls/sti/sti.spec
index ce1e683a9b0..a5e0bc1e772 100644
--- a/dlls/sti/sti.spec
+++ b/dlls/sti/sti.spec
@@ -1,5 +1,3 @@
-name sti
-
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer
diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec
index d4afab2053e..f969991391c 100644
--- a/dlls/tapi32/tapi32.spec
+++ b/dlls/tapi32/tapi32.spec
@@ -1,5 +1,3 @@
-name	tapi32
-
 @ stdcall lineAccept(long str long) lineAccept
 @ stdcall lineAddProvider(str long ptr) lineAddProvider
 @ stdcall lineAddToConference(long long) lineAddToConference
diff --git a/dlls/ttydrv/ttydrv.spec b/dlls/ttydrv/ttydrv.spec
index 28c15ac6b88..741b81ae2c3 100644
--- a/dlls/ttydrv/ttydrv.spec
+++ b/dlls/ttydrv/ttydrv.spec
@@ -1,4 +1,3 @@
-name	ttydrv
 init	TTYDRV_Init
 
 # GDI driver
diff --git a/dlls/twain/twain_32.spec b/dlls/twain/twain_32.spec
index cde68f24904..245be682d52 100644
--- a/dlls/twain/twain_32.spec
+++ b/dlls/twain/twain_32.spec
@@ -1,4 +1,3 @@
-name	twain_32
 init	TWAIN_LibMain
 
 @ stdcall DSM_Entry(ptr ptr long long long ptr) DSM_Entry
diff --git a/dlls/url/url.spec b/dlls/url/url.spec
index 91a444ce19f..75dddcb016c 100644
--- a/dlls/url/url.spec
+++ b/dlls/url/url.spec
@@ -1,5 +1,3 @@
-name url
-
 @ stub AddMIMEFileTypesPS
 @ stub AutodialHookCallback
 @ stub DllCanUnloadNow
diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec
index 24034bc11a7..d510f3e61c4 100644
--- a/dlls/urlmon/urlmon.spec
+++ b/dlls/urlmon/urlmon.spec
@@ -1,5 +1,3 @@
-name    urlmon
-
 1 stub CDLGetLongPathNameA
 2 stub CDLGetLongPathNameW
 @ stub AsyncGetClassBits
@@ -76,4 +74,3 @@ name    urlmon
 @ stdcall UrlMkSetSessionOption(long ptr long long) UrlMkSetSessionOption
 @ stub WriteHitLogging
 @ stub ZonesReInit
-
diff --git a/dlls/user/ddeml.spec b/dlls/user/ddeml.spec
index 362e9e1711c..fc6b4b5b7b2 100644
--- a/dlls/user/ddeml.spec
+++ b/dlls/user/ddeml.spec
@@ -1,7 +1,3 @@
-name	ddeml
-type	win16
-owner	user32
-
 2 pascal16 DdeInitialize(ptr segptr long long) DdeInitialize16
 3 pascal16 DdeUninitialize(long) DdeUninitialize16
 4 pascal DdeConnectList(long word word word ptr) DdeConnectList16
diff --git a/dlls/user/display.spec b/dlls/user/display.spec
index a282ca30db1..9e0f926352d 100644
--- a/dlls/user/display.spec
+++ b/dlls/user/display.spec
@@ -1,6 +1,3 @@
-name	display
-type	win16
-owner	user32
 rsrc	resources/display.res
 
 1   stub BitBlt
@@ -59,4 +56,3 @@ rsrc	resources/display.res
 502 stub ORDINAL_ONLY2
 600 stub InkReady
 601 stub GetLPDevice
-
diff --git a/dlls/user/keyboard.spec b/dlls/user/keyboard.spec
index ea5e5ff531b..e8b7c33cabe 100644
--- a/dlls/user/keyboard.spec
+++ b/dlls/user/keyboard.spec
@@ -1,7 +1,3 @@
-name	keyboard
-type	win16
-owner	user32
-
 1   pascal16 Inquire(ptr) KEYBOARD_Inquire
 2   pascal16 Enable(segptr ptr) KEYBOARD_Enable
 3   pascal16 Disable() KEYBOARD_Disable
@@ -22,4 +18,3 @@ owner	user32
 135 pascal16 OemToAnsiBuff(ptr ptr word) OemToAnsiBuff16
 #136	pascal	EnableKbSysReq
 #137	pascal	GetBiosKeyProc
-
diff --git a/dlls/user/mouse.spec b/dlls/user/mouse.spec
index 423c295b3c6..c028a7a053e 100644
--- a/dlls/user/mouse.spec
+++ b/dlls/user/mouse.spec
@@ -1,6 +1,3 @@
-name	mouse
-type	win16
-owner	user32
 rsrc	resources/mouse.res
 
 1 pascal16 Inquire(ptr) MOUSE_Inquire
diff --git a/dlls/user/user.exe.spec b/dlls/user/user.exe.spec
index 76c2ce38593..4356879dabd 100644
--- a/dlls/user/user.exe.spec
+++ b/dlls/user/user.exe.spec
@@ -1,8 +1,4 @@
-name	user
-type	win16
 heap	65520
-file	user.exe
-owner	user32
 rsrc	resources/version16.res
 
 1   pascal16 MessageBox(word str str word) MessageBox16
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index 82e4542036f..36618aafc58 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -1,4 +1,3 @@
-name	user32
 init	UserClientDllInitialize
 
 @ stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout
diff --git a/dlls/version/ver.spec b/dlls/version/ver.spec
index 4e7a288c4b8..14ce7e7b895 100644
--- a/dlls/version/ver.spec
+++ b/dlls/version/ver.spec
@@ -1,9 +1,4 @@
-name	ver
-type	win16
-owner	version
-
 #1 DLLENTRYPOINT
-
 2 pascal GetFileResourceSize(str str str ptr) GetFileResourceSize16
 3 pascal GetFileResource(str str str long long ptr) GetFileResource16
 6 pascal GetFileVersionInfoSize(str ptr) GetFileVersionInfoSize16
diff --git a/dlls/version/version.spec b/dlls/version/version.spec
index 82ed1cdfce4..8bfa1178c24 100644
--- a/dlls/version/version.spec
+++ b/dlls/version/version.spec
@@ -1,5 +1,3 @@
-name version
-
 @ stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfoA
 @ stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSizeA
 @ stdcall GetFileVersionInfoSizeW(wstr ptr) GetFileVersionInfoSizeW
diff --git a/dlls/win32s/w32skrnl.spec b/dlls/win32s/w32skrnl.spec
index fd97de84c5c..0fb09a8ef02 100644
--- a/dlls/win32s/w32skrnl.spec
+++ b/dlls/win32s/w32skrnl.spec
@@ -1,5 +1,3 @@
-name	w32skrnl
-
 1 stub _kSetEnvironmentVariable@8
 2 stub _SzFromImte@4
 3 stdcall GetCurrentTask32() GetCurrentTask32
diff --git a/dlls/win32s/w32sys.spec b/dlls/win32s/w32sys.spec
index 1df93f7158e..3af72770043 100644
--- a/dlls/win32s/w32sys.spec
+++ b/dlls/win32s/w32sys.spec
@@ -1,7 +1,3 @@
-name	w32sys
-type	win16
-owner	w32skrnl
-
 #1 WEP
 2 pascal16 IsPeFormat(str word) IsPeFormat16
 3 stub EXECPE
diff --git a/dlls/win32s/win32s16.spec b/dlls/win32s/win32s16.spec
index 3a45fd49818..2f984143aa4 100644
--- a/dlls/win32s/win32s16.spec
+++ b/dlls/win32s/win32s16.spec
@@ -1,7 +1,3 @@
-name	win32s16
-type	win16
-owner	w32skrnl
-
 1 stub WEP
 2 pascal16 BootTask() BootTask16
 3 stub CREATEPROCESS
diff --git a/dlls/winaspi/winaspi.spec b/dlls/winaspi/winaspi.spec
index 83b7aa47183..556b3494c61 100644
--- a/dlls/winaspi/winaspi.spec
+++ b/dlls/winaspi/winaspi.spec
@@ -1,9 +1,5 @@
-name	winaspi
-type	win16
-owner	wnaspi32
-
-1	pascal16 GetASPISupportInfo() GetASPISupportInfo16
-2	pascal16 SendASPICommand(segptr) SendASPICommand16
-3   pascal16 InsertInASPIChain(word segptr) InsertInASPIChain16
-4	pascal GETASPIDLLVERSION() GetASPIDLLVersion16
-5	stub ___EXPORTEDSTUB
+1 pascal16 GetASPISupportInfo() GetASPISupportInfo16
+2 pascal16 SendASPICommand(segptr) SendASPICommand16
+3 pascal16 InsertInASPIChain(word segptr) InsertInASPIChain16
+4 pascal GETASPIDLLVERSION() GetASPIDLLVersion16
+5 stub ___EXPORTEDSTUB
diff --git a/dlls/winaspi/wnaspi32.spec b/dlls/winaspi/wnaspi32.spec
index a0c4998cbcd..d54be3c0b8e 100644
--- a/dlls/winaspi/wnaspi32.spec
+++ b/dlls/winaspi/wnaspi32.spec
@@ -1,4 +1,3 @@
-name	wnaspi32
 init	WNASPI32_LibMain
 
 # we have several ordinal clashes here, it seems...
diff --git a/dlls/winedos/winedos.spec b/dlls/winedos/winedos.spec
index 1e50d4ff495..d2457971789 100644
--- a/dlls/winedos/winedos.spec
+++ b/dlls/winedos/winedos.spec
@@ -1,4 +1,3 @@
-name winedos
 init DOSVM_Init
 
 @ stdcall LoadDosExe(str long) MZ_LoadImage
diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.spec
index 62db307a595..dbf652a4628 100644
--- a/dlls/wineps/wineps.spec
+++ b/dlls/wineps/wineps.spec
@@ -1,4 +1,3 @@
-name	wineps
 init	PSDRV_Init
 
 # GDI driver
diff --git a/dlls/wineps/wineps16.spec b/dlls/wineps/wineps16.spec
index 20829f0ab48..d293296bf5b 100644
--- a/dlls/wineps/wineps16.spec
+++ b/dlls/wineps/wineps16.spec
@@ -1,7 +1,3 @@
-name    wineps16
-type    win16
-owner	wineps
-
 13 pascal16 DeviceMode(word word str str) PSDRV_DeviceMode16
 90 pascal16 ExtDeviceMode(word word ptr str str ptr str word) PSDRV_ExtDeviceMode16
 91 pascal DeviceCapabilities(str str word ptr ptr) PSDRV_DeviceCapabilities16
diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec
index e74200d2989..6042b693b6b 100644
--- a/dlls/wininet/wininet.spec
+++ b/dlls/wininet/wininet.spec
@@ -1,4 +1,3 @@
-name    wininet
 init    WININET_LibMain
 
 @ stub InternetInitializeAutoProxyDll
diff --git a/dlls/winmm/joystick/joystick.drv.spec b/dlls/winmm/joystick/joystick.drv.spec
index 54e9c34c77a..affaa4f0efd 100644
--- a/dlls/winmm/joystick/joystick.drv.spec
+++ b/dlls/winmm/joystick/joystick.drv.spec
@@ -1,4 +1 @@
-name joystick
-file joystick.drv
-
 @ stdcall DriverProc(long long long long long) JSTCK_DriverProc
diff --git a/dlls/winmm/mcianim/mcianim.drv.spec b/dlls/winmm/mcianim/mcianim.drv.spec
index 2e34ad0276a..040176da431 100644
--- a/dlls/winmm/mcianim/mcianim.drv.spec
+++ b/dlls/winmm/mcianim/mcianim.drv.spec
@@ -1,4 +1 @@
-name mcianim
-file mcianim.drv
-
 @ stdcall DriverProc(long long long long long) MCIANIM_DriverProc
diff --git a/dlls/winmm/mciavi/mciavi.drv.spec b/dlls/winmm/mciavi/mciavi.drv.spec
index bba843cf95d..31a49f5a55c 100644
--- a/dlls/winmm/mciavi/mciavi.drv.spec
+++ b/dlls/winmm/mciavi/mciavi.drv.spec
@@ -1,5 +1,3 @@
-name mciavi
-file mciavi.drv
 init MCIAVI_LibMain
 
 @ stdcall DriverProc(long long long long long) MCIAVI_DriverProc
diff --git a/dlls/winmm/mcicda/mcicda.drv.spec b/dlls/winmm/mcicda/mcicda.drv.spec
index c6d6716f04b..2c40f3873d5 100644
--- a/dlls/winmm/mcicda/mcicda.drv.spec
+++ b/dlls/winmm/mcicda/mcicda.drv.spec
@@ -1,4 +1 @@
-name mcicda
-file mcicda.drv
-
 @ stdcall DriverProc(long long long long long) MCICDA_DriverProc
diff --git a/dlls/winmm/mciseq/mciseq.drv.spec b/dlls/winmm/mciseq/mciseq.drv.spec
index 46ae86bf66c..9d46a2b3424 100644
--- a/dlls/winmm/mciseq/mciseq.drv.spec
+++ b/dlls/winmm/mciseq/mciseq.drv.spec
@@ -1,4 +1 @@
-name mciseq
-file mciseq.drv
-
 @ stdcall DriverProc(long long long long long) MCIMIDI_DriverProc
diff --git a/dlls/winmm/mciwave/mciwave.drv.spec b/dlls/winmm/mciwave/mciwave.drv.spec
index 23e6f731f62..38678ad23c2 100644
--- a/dlls/winmm/mciwave/mciwave.drv.spec
+++ b/dlls/winmm/mciwave/mciwave.drv.spec
@@ -1,4 +1 @@
-name mciwave
-file mciwave.drv
-
 @ stdcall DriverProc(long long long long long) MCIWAVE_DriverProc
diff --git a/dlls/winmm/midimap/midimap.drv.spec b/dlls/winmm/midimap/midimap.drv.spec
index 6c1d24626b0..e83446b9187 100644
--- a/dlls/winmm/midimap/midimap.drv.spec
+++ b/dlls/winmm/midimap/midimap.drv.spec
@@ -1,5 +1,2 @@
-name midimap
-file midimap.drv
-
 @ stdcall DriverProc(long long long long long) MIDIMAP_DriverProc
 @ stdcall modMessage(long long long long long) MIDIMAP_modMessage
diff --git a/dlls/winmm/mmsystem.spec b/dlls/winmm/mmsystem.spec
index 7de1f4b80b9..08ccca0261a 100644
--- a/dlls/winmm/mmsystem.spec
+++ b/dlls/winmm/mmsystem.spec
@@ -1,7 +1,3 @@
-name	mmsystem
-type	win16
-owner	winmm
-
 #1      pascal  MMSYSTEM_WEP(word word word ptr) MMSYSTEM_WEP
 2      pascal  sndPlaySound(ptr word) sndPlaySound16
 3      pascal  PlaySound(ptr word long) PlaySound16
diff --git a/dlls/winmm/sound.spec b/dlls/winmm/sound.spec
index 2b36f113fbf..4eca15c1593 100644
--- a/dlls/winmm/sound.spec
+++ b/dlls/winmm/sound.spec
@@ -1,7 +1,3 @@
-name	sound
-type	win16
-owner	winmm
-
 1  pascal16 OpenSound() OpenSound16
 2  pascal16 CloseSound() CloseSound16
 3  pascal16 SetVoiceQueueSize(word word) SetVoiceQueueSize16
diff --git a/dlls/winmm/wavemap/msacm.drv.spec b/dlls/winmm/wavemap/msacm.drv.spec
index 892c37994be..f9bead0b053 100644
--- a/dlls/winmm/wavemap/msacm.drv.spec
+++ b/dlls/winmm/wavemap/msacm.drv.spec
@@ -1,6 +1,3 @@
-name msacmmap
-file msacm.drv
-
 @ stdcall DriverProc(long long long long long) WAVEMAP_DriverProc
 @ stdcall widMessage(long long long long long) WAVEMAP_widMessage
 @ stdcall wodMessage(long long long long long) WAVEMAP_wodMessage
diff --git a/dlls/winmm/winearts/winearts.drv.spec b/dlls/winmm/winearts/winearts.drv.spec
index c410623fea6..f8d2a7fe85b 100644
--- a/dlls/winmm/winearts/winearts.drv.spec
+++ b/dlls/winmm/winearts/winearts.drv.spec
@@ -1,5 +1,2 @@
-name winearts
-file winearts.drv
-
 @ stdcall DriverProc(long long long long long) ARTS_DriverProc
 @ stdcall wodMessage(long long long long long) ARTS_wodMessage
diff --git a/dlls/winmm/wineoss/wineoss.drv.spec b/dlls/winmm/wineoss/wineoss.drv.spec
index 7b259a9229a..2478ecc3c26 100644
--- a/dlls/winmm/wineoss/wineoss.drv.spec
+++ b/dlls/winmm/wineoss/wineoss.drv.spec
@@ -1,6 +1,3 @@
-name wineoss
-file wineoss.drv
-
   1 stdcall DriverProc(long long long long long) OSS_DriverProc
   2 stdcall auxMessage(long long long long long) OSS_auxMessage
   3 stdcall mixMessage(long long long long long) OSS_mixMessage
diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec
index 68310ee8425..3137892d34d 100644
--- a/dlls/winmm/winmm.spec
+++ b/dlls/winmm/winmm.spec
@@ -1,4 +1,3 @@
-name winmm
 init WINMM_LibMain
 
 # ordinal exports
diff --git a/dlls/winnls/winnls.spec b/dlls/winnls/winnls.spec
index 2ddbb9ba7ff..199fb143de1 100644
--- a/dlls/winnls/winnls.spec
+++ b/dlls/winnls/winnls.spec
@@ -1,7 +1,3 @@
-name	winnls
-type	win16
-owner	winnls32
-
 1   stub WINNLSINQUIRE
 2   stub HOOKKEYBOARDMESSAGE
 #3   stub ___EXPORTEDSTUB
diff --git a/dlls/winnls/winnls32.spec b/dlls/winnls/winnls32.spec
index ea4353d23ee..ac12e7fb82e 100644
--- a/dlls/winnls/winnls32.spec
+++ b/dlls/winnls/winnls32.spec
@@ -1,5 +1,3 @@
-name	winnls32
-
 1  stub WINNLS32EnableIME
 2  stub WINNLS32GetEnableStatus
 3  stub WINNLS32GetIMEHotKey
diff --git a/dlls/winsock/winsock.spec b/dlls/winsock/winsock.spec
index 197e9440f65..1e48f632f57 100644
--- a/dlls/winsock/winsock.spec
+++ b/dlls/winsock/winsock.spec
@@ -1,7 +1,3 @@
-name	winsock
-type	win16
-owner	ws2_32
-
 1   pascal16 accept(word ptr ptr) WINSOCK_accept16
 2   pascal16 bind(word ptr word) WINSOCK_bind16
 3   pascal16 closesocket(word) WINSOCK_closesocket16
diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec
index 1e9f6055c7e..c2325479ab9 100644
--- a/dlls/winsock/ws2_32.spec
+++ b/dlls/winsock/ws2_32.spec
@@ -2,7 +2,6 @@
 #
 #  Export table information obtained from Windows 2000 ws2_32.dll
 
-name ws2_32
 init WS_LibMain
 
 #  EXPORTS ***********
diff --git a/dlls/winspool/winspool.drv.spec b/dlls/winspool/winspool.drv.spec
index 0932b0b386a..c681c982462 100644
--- a/dlls/winspool/winspool.drv.spec
+++ b/dlls/winspool/winspool.drv.spec
@@ -1,5 +1,3 @@
-name	winspool
-file	winspool.drv
 init	WINSPOOL_EntryPoint
 
 100 stub @
diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec
index b79316762e7..e5e97d23289 100644
--- a/dlls/wintrust/wintrust.spec
+++ b/dlls/wintrust/wintrust.spec
@@ -1,3 +1 @@
-name	wintrust
-
 @ stdcall WinVerifyTrust(long ptr ptr) WinVerifyTrust
diff --git a/dlls/wow32/wow32.spec b/dlls/wow32/wow32.spec
index 032bbbb1c03..e4222bde547 100644
--- a/dlls/wow32/wow32.spec
+++ b/dlls/wow32/wow32.spec
@@ -1,5 +1,3 @@
-name	wow32
-
 # ordinal exports
 1 forward WOWGetDescriptor kernel32.K32WOWGetDescriptor
 
diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec
index 7d33f9c0e90..2bcca47ed0e 100644
--- a/dlls/wsock32/wsock32.spec
+++ b/dlls/wsock32/wsock32.spec
@@ -1,5 +1,3 @@
-name	wsock32
-
   1 forward accept ws2_32.accept
   2 forward bind ws2_32.bind
   3 forward closesocket ws2_32.closesocket
diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec
index d9022b9f1e2..81fdd0412d1 100644
--- a/dlls/x11drv/x11drv.spec
+++ b/dlls/x11drv/x11drv.spec
@@ -1,4 +1,3 @@
-name	x11drv
 init	X11DRV_Init
 
 # GDI driver
diff --git a/miscemu/Makefile.in b/miscemu/Makefile.in
index 7a96f379017..359059b7202 100644
--- a/miscemu/Makefile.in
+++ b/miscemu/Makefile.in
@@ -21,6 +21,9 @@ ALL_OBJS = $(SPEC_SRCS:.spec=.spec.o) $(OBJS)
 $(MODULE): $(ALL_OBJS)
 	$(CC) -o $@ $(ALL_OBJS) -L$(DLLDIR) $(LDIMPORTS:%=-l%) $(LIBWINE) $(LIBUNICODE) $(LIBS) $(LDFLAGS)
 
+wine.spec.c: wine.spec
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -spec $(SRCDIR)/wine.spec -L$(DLLDIR) $(IMPORTS:%=-l%)
+
 install:: $(MODULE)
 	$(MKINSTALLDIRS) $(bindir)
 	$(INSTALL_PROGRAM) wine $(bindir)/wine
diff --git a/miscemu/wine.spec b/miscemu/wine.spec
index 2923380b87b..8996141d224 100644
--- a/miscemu/wine.spec
+++ b/miscemu/wine.spec
@@ -1,3 +1,2 @@
-name	wine
 mode	guiexe
 init	wine_initial_task
diff --git a/tools/winebuild/README b/tools/winebuild/README
index 29e94ef524f..9d7e31e47c5 100644
--- a/tools/winebuild/README
+++ b/tools/winebuild/README
@@ -1,12 +1,10 @@
 			Spec file format
 			----------------
 
-name	NAME
-type    win16|win32
+[name	NAME]
 [file   WINFILENAME]
 [mode	dll|cuiexe|guiexe|cuiexe_unicode|guiexe_unicode]
 [heap   SIZE]
-[stack  SIZE]
 [init	FUNCTION]
 [rsrc	RESFILE]
 [ignore ([SYMBOL [SYMBOL...]])]
@@ -29,9 +27,17 @@ ORDINAL forward [FLAGS] EXPORTNAME SYMBOLNAME
 General:
 ========
 
-    "name" and "type" fields are mandatory.  Specific ordinal
-declarations are optional, but the default handler will print an error
-message.
+All declarations are optional; reasonable defaults will be used for
+anything that isn't specified.
+
+"name" is the internal name of the module. It is only used in Win16
+modules. The default is to use the base name of the spec file (without
+any extension). This is used for KERNEL, since it lives in
+KRNL386.EXE. It shouldn't be needed otherwise.
+
+"file" gives the name of the file containing the dll. If not specified
+it is determined from the name of the source spec file. Normally you
+shouldn't ever need to specify it explicitly.
 
 "mode" specifies whether it is the spec file for a dll or the main exe.
 This is only valid for Win32 spec files.
@@ -39,13 +45,6 @@ This is only valid for Win32 spec files.
 "heap" is the size of the module local heap (only valid for Win16
 modules); default is no local heap.
 
-"stack" is the stack size for Win32 exe modules, in kilobytes; default
-size is 1024 (1Mb stack).
-
-"file" gives the name of the Windows file that is replaced by the
-builtin. <name>.DLL is assumed if none is given. (This is important
-for kernel, which lives in the Windows file KRNL386.EXE).
-
 "init" specifies a function which will be called when this dll
 is loaded. This is only valid for Win32 modules.
 
@@ -142,7 +141,7 @@ Equate ordinals:
 ================
 
     This type defines an ordinal as an absolute value.
-"EXPORTNAME" will be the name available for dynamic linking.  
+"EXPORTNAME" will be the name available for dynamic linking.
 "DATA" can be a decimal number or a hex number preceeded by "0x".
 
 Extern ordinals:
@@ -158,6 +157,5 @@ Forwarded ordinals:
 
     This type defines an entry that is forwarded to another entry
 point (kind of a symbolic link). "EXPORTNAME" will forward to the
-entry point "SYMBOLNAME" that must be of the form "DLL.Function". This 
+entry point "SYMBOLNAME" that must be of the form "DLL.Function". This
 type only works with Win32.
-
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 5b21bec3cdd..91c4734d95a 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -116,16 +116,13 @@ static char *open_library( const char *name )
 static void read_exported_symbols( const char *name, struct import *imp )
 {
     FILE *f;
-    char buffer[1024];
+    char buffer[1024], prefix[80];
     char *fullname, *cmdline;
-    const char *ext;
     int size, err;
 
     imp->exports    = NULL;
     imp->nb_exports = size = 0;
 
-    if (!(ext = strrchr( name, '.' ))) ext = name + strlen(name);
-
     if (!(fullname = open_library( name ))) return;
     cmdline = xmalloc( strlen(fullname) + 7 );
     sprintf( cmdline, "nm -D %s", fullname );
@@ -134,15 +131,15 @@ static void read_exported_symbols( const char *name, struct import *imp )
     if (!(f = popen( cmdline, "r" )))
         fatal_error( "Cannot execute '%s'\n", cmdline );
 
+    sprintf( prefix, "__wine_dllexport_%s", make_c_identifier(name) );
+
     while (fgets( buffer, sizeof(buffer), f ))
     {
         char *p = buffer + strlen(buffer) - 1;
         if (p < buffer) continue;
         if (*p == '\n') *p-- = 0;
-        if (!(p = strstr( buffer, "__wine_dllexport_" ))) continue;
-        p += 17;
-        if (strncmp( p, name, ext - name )) continue;
-        p += ext - name;
+        if (!(p = strstr( buffer, prefix ))) continue;
+        p += strlen(prefix);
         if (*p++ != '_') continue;
 
         if (imp->nb_exports == size)
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 346be12a64c..daeccdc17d5 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -119,6 +119,7 @@ static void do_f_flags( const char *arg );
 static void do_define( const char *arg );
 static void do_include( const char *arg );
 static void do_exe_mode( const char *arg );
+static void do_module( const char *arg );
 static void do_spec( const char *arg );
 static void do_def( const char *arg );
 static void do_exe( const char *arg );
@@ -142,6 +143,7 @@ static const struct option_descr option_table[] =
     { "-D",       1, do_define,  "-D sym           Ignored for C flags compatibility" },
     { "-I",       1, do_include, "-I dir           Ignored for C flags compatibility" },
     { "-m",       1, do_exe_mode,"-m mode          Set the executable mode (cui|gui|cuiw|guiw)" },
+    { "-M",       1, do_module,  "-M module        Set the name of the main (Win32) module for a Win16 dll" },
     { "-L",       1, do_lib,     "-L directory     Look for imports libraries in 'directory'" },
     { "-l",       1, do_import,  "-l lib.dll       Import the specified library" },
     { "-dl",      1, do_dimport, "-dl lib.dll      Delay-import the specified library" },
@@ -207,9 +209,16 @@ static void do_include( const char *arg )
 
 static void do_spec( const char *arg )
 {
+    char *p;
+
     if (exec_mode != MODE_NONE || !arg[0]) do_usage();
     exec_mode = MODE_SPEC;
     open_input( arg );
+
+    if ((p = strrchr( arg, '/' ))) strcpy( DLLFileName, p + 1 );
+    else strcpy( DLLFileName, arg );
+    if ((p = strrchr( DLLFileName, '.' )) && !strcmp( p, ".spec" )) *p = 0;
+    if (!strchr( DLLFileName, '.' )) strcat( DLLFileName, ".dll" );
 }
 
 static void do_def( const char *arg )
@@ -227,7 +236,6 @@ static void do_exe( const char *arg )
     exec_mode = MODE_EXE;
     if ((p = strrchr( arg, '/' ))) p++;
     else p = arg;
-    strcpy( DLLName, p );
     strcpy( DLLFileName, p );
     if (!strchr( DLLFileName, '.' )) strcat( DLLFileName, ".exe" );
     if (SpecMode == SPEC_MODE_DLL) SpecMode = SPEC_MODE_GUIEXE;
@@ -242,6 +250,11 @@ static void do_exe_mode( const char *arg )
     else do_usage();
 }
 
+static void do_module( const char *arg )
+{
+    strcpy( owner_name, arg );
+}
+
 static void do_glue( const char *arg )
 {
     if (exec_mode != MODE_NONE || !arg[0]) do_usage();
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index 27c01061dbf..f94693ae82f 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -495,6 +495,8 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
 
     input_file = file;
     current_line = 1;
+    if (owner_name[0]) SpecType = SPEC_WIN16;
+
     while ((token = GetToken(1)) != NULL)
     {
 	if (strcmp(token, "name") == 0)
@@ -505,13 +507,6 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
 	{
 	    strcpy(DLLFileName, GetToken(0));
 	}
-        else if (strcmp(token, "type") == 0)
-        {
-            token = GetToken(0);
-            if (!strcmp(token, "win16" )) SpecType = SPEC_WIN16;
-            else if (!strcmp(token, "win32" )) SpecType = SPEC_WIN32;
-            else fatal_error( "Type must be 'win16' or 'win32'\n" );
-        }
         else if (strcmp(token, "mode") == 0)
         {
             token = GetToken(0);
@@ -528,12 +523,6 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
             if (!IsNumberString(token)) fatal_error( "Expected number after heap\n" );
             DLLHeapSize = atoi(token);
 	}
-        else if (strcmp(token, "stack") == 0)
-        {
-            token = GetToken(0);
-            if (!IsNumberString(token)) fatal_error( "Expected number after stack\n" );
-            stack_size = atoi(token);
-        }
         else if (strcmp(token, "init") == 0)
         {
             if (SpecType == SPEC_WIN16)
@@ -549,12 +538,6 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
             }
             else GetToken(0);  /* skip it */
         }
-        else if (strcmp(token, "owner") == 0)
-        {
-            if (SpecType != SPEC_WIN16)
-                fatal_error( "Owner only supported for Win16 spec files\n" );
-            strcpy( owner_name, GetToken(0) );
-        }
         else if (strcmp(token, "ignore") == 0)
         {
             if (SpecType != SPEC_WIN32)
@@ -575,19 +558,6 @@ SPEC_TYPE ParseTopLevel( FILE *file, int def_only )
             fatal_error( "Expected name, id, length or ordinal\n" );
     }
 
-    if (!DLLFileName[0])
-    {
-        if (SpecMode == SPEC_MODE_DLL)
-	{
-	    strcpy( DLLFileName, DLLName );
-	    /* Append .dll to name if no extension present */
-	    if (!strrchr( DLLFileName, '.'))
-		strcat( DLLFileName, ".dll" );
-	}
-        else
-            sprintf( DLLFileName, "%s.exe", DLLName );
-    }
-
     if (SpecType == SPEC_WIN16 && !owner_name[0])
         fatal_error( "'owner' not specified for Win16 dll\n" );
 
diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c
index 0facd7cd8ae..811a9718d64 100644
--- a/tools/winebuild/spec16.c
+++ b/tools/winebuild/spec16.c
@@ -199,6 +199,7 @@ static int BuildModule16( FILE *outfile, int max_code_offset,
     /* First entry is module name */
     *pstr = strlen( DLLName );
     strcpy( pstr + 1, DLLName );
+    strupper( pstr + 1 );
     pstr += *pstr + 1;
     *pstr++ = 0;
     *pstr++ = 0;
@@ -588,7 +589,7 @@ static void output_stub_funcs( FILE *outfile )
         fprintf( outfile, "  rec.flags   = %d;\n", EH_NONCONTINUABLE );
         fprintf( outfile, "  rec.rec     = 0;\n" );
         fprintf( outfile, "  rec.params  = 2;\n" );
-        fprintf( outfile, "  rec.info[0] = dllname;\n" );
+        fprintf( outfile, "  rec.info[0] = \"%s\";\n", DLLFileName );
         fprintf( outfile, "  rec.info[1] = func;\n" );
         fprintf( outfile, "#ifdef __GNUC__\n" );
         fprintf( outfile, "  rec.addr = __builtin_return_address(1);\n" );
@@ -639,9 +640,13 @@ void BuildSpec16File( FILE *outfile )
     data = (unsigned char *)xmalloc( 0x10000 );
     memset( data, 0, 16 );
     data_offset = 16;
-    strupper( DLLName );
 
-    fprintf( outfile, "static const char dllname[] = \"%s\";\n\n", DLLName );
+    if (!DLLName[0])  /* set default name from file name */
+    {
+        char *p;
+        strcpy( DLLName, DLLFileName );
+        if ((p = strrchr( DLLName, '.' ))) *p = 0;
+    }
 
     output_stub_funcs( outfile );
 
@@ -683,7 +688,7 @@ void BuildSpec16File( FILE *outfile )
         char profile[101];
 
         strcpy( profile, get_function_name( typelist[i] ));
-        BuildCallFrom16Func( outfile, profile, DLLName );
+        BuildCallFrom16Func( outfile, profile, DLLFileName );
     }
 #endif
 
@@ -780,7 +785,7 @@ void BuildSpec16File( FILE *outfile )
 
 #ifdef __i386__
         fprintf( outfile, "    { 0x68, __wine_%s_CallFrom16_%s, 0x9a, __wine_call_from_16_%s,\n",
-                 make_c_identifier(DLLName), profile,
+                 make_c_identifier(DLLFileName), profile,
                  (typelist[i]->flags & (FLAG_REGISTER|FLAG_INTERRUPT)) ? "regs":
                  typelist[i]->type == TYPE_PASCAL_16? "word" : "long" );
         if (argsize)
@@ -878,8 +883,8 @@ void BuildSpec16File( FILE *outfile )
 
     /* Output the DLL constructor */
 
-    sprintf( constructor, "__wine_spec_%s_init", make_c_identifier(DLLName) );
-    sprintf( destructor, "__wine_spec_%s_fini", make_c_identifier(DLLName) );
+    sprintf( constructor, "__wine_spec_%s_init", make_c_identifier(DLLFileName) );
+    sprintf( destructor, "__wine_spec_%s_fini", make_c_identifier(DLLFileName) );
     output_dll_init( outfile, constructor, destructor );
 
     fprintf( outfile,
@@ -942,4 +947,3 @@ void BuildGlue( FILE *outfile, FILE *infile )
 
     fclose( infile );
 }
-
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 9fb749d376f..2756defba69 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -53,12 +53,12 @@ static const char *make_internal_name( const ORDDEF *odp, const char *prefix )
     if (odp->name[0])
     {
         char *p;
-        sprintf( buffer, "__wine_%s_%s_%s", prefix, DLLName, odp->name );
+        sprintf( buffer, "__wine_%s_%s_%s", prefix, DLLFileName, odp->name );
         /* make sure name is a legal C identifier */
         for (p = buffer; *p; p++) if (!isalnum(*p) && *p != '_') break;
         if (!*p) return buffer;
     }
-    sprintf( buffer, "__wine_%s_%s_%d", prefix, make_c_identifier(DLLName), odp->ordinal );
+    sprintf( buffer, "__wine_%s_%s_%d", prefix, make_c_identifier(DLLFileName), odp->ordinal );
     return buffer;
 }
 
@@ -310,9 +310,9 @@ static int output_exports( FILE *outfile, int nr_exports )
             if (!isalnum(*p) && *p != '_' && *p != '.') break;
         if (*p) continue;
         fprintf( outfile, "    \"\\t.globl " PREFIX "__wine_dllexport_%s_%s\\n\"\n",
-                 make_c_identifier(DLLName), Names[i]->name );
+                 make_c_identifier(DLLFileName), Names[i]->name );
         fprintf( outfile, "    \"" PREFIX "__wine_dllexport_%s_%s:\\n\"\n",
-                 make_c_identifier(DLLName), Names[i]->name );
+                 make_c_identifier(DLLFileName), Names[i]->name );
     }
     fprintf( outfile, "    \"\\t.long 0xffffffff\\n\"\n" );
 
@@ -475,7 +475,6 @@ void output_dll_init( FILE *outfile, const char *constructor, const char *destru
     {
         fprintf( outfile, "asm(\"\\t.section\t.fini ,\\\"ax\\\"\\n\"\n" );
         fprintf( outfile, "    \"\\tbl " PREFIX "%s\\n\"\n", destructor );
-                 DLLName );
         fprintf( outfile, "    \"\\t.previous\\n\");\n" );
     }
 #else
@@ -527,7 +526,7 @@ void BuildSpec32File( FILE *outfile )
     fprintf( outfile, "    \".align %d\\n\"\n", get_alignment(page_size) );
     fprintf( outfile, "    \"" PREFIX "pe_header:\\t.fill %ld,1,0\\n\\t\");\n", page_size );
 
-    fprintf( outfile, "static const char dllname[] = \"%s\";\n\n", DLLName );
+    fprintf( outfile, "static const char dllname[] = \"%s\";\n\n", DLLFileName );
     fprintf( outfile, "extern int __wine_spec_exports[];\n\n" );
 
 #ifdef __i386__
@@ -775,7 +774,7 @@ void BuildSpec32File( FILE *outfile )
 
     /* Output the DLL constructor */
 
-    sprintf( constructor, "__wine_spec_%s_init", make_c_identifier(DLLName) );
+    sprintf( constructor, "__wine_spec_%s_init", make_c_identifier(DLLFileName) );
     output_dll_init( outfile, constructor, NULL );
 
     fprintf( outfile,