Documentation ordinal fixes.

diff --git a/controls/menu.c b/controls/menu.c
index e8a0b74..0072421 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -4669,9 +4669,8 @@
 }
 
 /**********************************************************************
- *		CheckMenuRadioItem    (not a Windows API)
+ *		CheckMenuRadioItem (USER.666)
  */
-
 BOOL16 WINAPI CheckMenuRadioItem16(HMENU16 hMenu,
 				   UINT16 first, UINT16 last, UINT16 check,
 				   BOOL16 bypos)
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index 21d7846..cc7f2c1 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -2027,7 +2027,7 @@
 
 
 /**************************************************************************
- * StrChrA [COMCTL32.@]
+ * StrChrA [COMCTL32.350]
  *
  */
 
@@ -2039,7 +2039,7 @@
 
 
 /**************************************************************************
- * StrStrIA [COMCTL32.@]
+ * StrStrIA [COMCTL32.355]
  */
 
 LPSTR WINAPI
@@ -2072,7 +2072,7 @@
 
 
 /**************************************************************************
- * StrToIntA [COMCTL32.@] Converts a string to a signed integer.
+ * StrToIntA [COMCTL32.357] Converts a string to a signed integer.
  */
 
 INT WINAPI
@@ -2082,7 +2082,7 @@
 }
 
 /**************************************************************************
- * StrToIntW [COMCTL32.@] Converts a wide char string to a signed integer.
+ * StrToIntW [COMCTL32.365] Converts a wide char string to a signed integer.
  */
 
 INT WINAPI
@@ -2215,7 +2215,7 @@
 }
 
 /**************************************************************************
- * StrCSpnA [COMCTL32.@]
+ * StrCSpnA [COMCTL32.356]
  *
  */
 INT WINAPI COMCTL32_StrCSpnA( LPCSTR lpStr, LPCSTR lpSet) {
@@ -2223,7 +2223,7 @@
 }
 
 /**************************************************************************
- * StrChrW [COMCTL32.@]
+ * StrChrW [COMCTL32.358]
  *
  */
 LPWSTR WINAPI COMCTL32_StrChrW( LPCWSTR lpStart, WORD wMatch) {
@@ -2231,7 +2231,7 @@
 }
 
 /**************************************************************************
- * StrCmpNA [COMCTL32.@]
+ * StrCmpNA [COMCTL32.352]
  *
  */
 INT WINAPI COMCTL32_StrCmpNA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
@@ -2239,7 +2239,7 @@
 }
 
 /**************************************************************************
- * StrCmpNIA [COMCTL32.@]
+ * StrCmpNIA [COMCTL32.353]
  *
  */
 INT WINAPI COMCTL32_StrCmpNIA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
@@ -2247,7 +2247,7 @@
 }
 
 /**************************************************************************
- * StrCmpNW [COMCTL32.@]
+ * StrCmpNW [COMCTL32.360]
  *
  */
 INT WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
@@ -2255,7 +2255,7 @@
 }
 
 /**************************************************************************
- * StrCmpNIW [COMCTL32.@]
+ * StrCmpNIW [COMCTL32.361]
  *
  */
 INT WINAPI COMCTL32_StrCmpNIW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
@@ -2264,7 +2264,7 @@
 }
 
 /**************************************************************************
- * StrRChrA [COMCTL32.@]
+ * StrRChrA [COMCTL32.351]
  *
  */
 LPSTR WINAPI COMCTL32_StrRChrA( LPCSTR lpStart, LPCSTR lpEnd, WORD wMatch )
@@ -2287,7 +2287,7 @@
 
 
 /**************************************************************************
- * StrRChrW [COMCTL32.@]
+ * StrRChrW [COMCTL32.359]
  *
  */
 LPWSTR WINAPI COMCTL32_StrRChrW( LPCWSTR lpStart, LPCWSTR lpEnd, WORD wMatch)
@@ -2305,7 +2305,7 @@
 
 
 /**************************************************************************
- * StrStrA [COMCTL32.@]
+ * StrStrA [COMCTL32.354]
  *
  */
 LPSTR WINAPI COMCTL32_StrStrA( LPCSTR lpFirst, LPCSTR lpSrch) {
@@ -2313,7 +2313,7 @@
 }
 
 /**************************************************************************
- * StrStrW [COMCTL32.@]
+ * StrStrW [COMCTL32.362]
  *
  */
 LPWSTR WINAPI COMCTL32_StrStrW( LPCWSTR lpFirst, LPCWSTR lpSrch) {
@@ -2321,7 +2321,7 @@
 }
 
 /**************************************************************************
- * StrSpnW [COMCTL32.@]
+ * StrSpnW [COMCTL32.364]
  *
  */
 INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 31be5e5..2978a80 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -862,7 +862,7 @@
 
 
 /***********************************************************************
- * DllGetVersion [COMCTL32.@]
+ * DllGetVersion [COMCTL32.25]
  *
  * Retrieves version information of the 'COMCTL32.DLL'
  *
@@ -898,7 +898,7 @@
 }
 
 /***********************************************************************
- *		DllInstall (COMCTL32.@)
+ *		DllInstall (COMCTL32.26)
  */
 HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index d9e76ac..f25b532b 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -39,7 +39,7 @@
 } DirectDrawEnumerateProcData;
 
 /***********************************************************************
- *		DirectDrawEnumerateExA (DDRAW.*)
+ *		DirectDrawEnumerateExA (DDRAW.@)
  */
 HRESULT WINAPI DirectDrawEnumerateExA(
     LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags)
@@ -86,7 +86,7 @@
 }
 
 /***********************************************************************
- *		DirectDrawEnumerateExW (DDRAW.*)
+ *		DirectDrawEnumerateExW (DDRAW.@)
  */
 
 static BOOL CALLBACK DirectDrawEnumerateExProcW(
@@ -118,7 +118,7 @@
 }
 
 /***********************************************************************
- *		DirectDrawEnumerateA (DDRAW.*)
+ *		DirectDrawEnumerateA (DDRAW.@)
  */
 
 static BOOL CALLBACK DirectDrawEnumerateProcA(
@@ -142,7 +142,7 @@
 }
 
 /***********************************************************************
- *		DirectDrawEnumerateW (DDRAW.*)
+ *		DirectDrawEnumerateW (DDRAW.@)
  */
 
 static BOOL WINAPI DirectDrawEnumerateProcW(
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index cf2a708..5543b16 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -43,7 +43,7 @@
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (DPLAYX.@)
+ *              DllCanUnloadNow (DPLAYX.10)
  */
 HRESULT WINAPI DPLAYX_DllCanUnloadNow(void)
 {
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index cb937b8..486440e 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -3853,7 +3853,7 @@
 static IClassFactoryImpl DSOUND_CF = {&DSCF_Vtbl, 1 };
 
 /*******************************************************************************
- * DllGetClassObject [DSOUND.@]
+ * DllGetClassObject [DSOUND.5]
  * Retrieves class object from a DLL object
  *
  * NOTES
@@ -3884,7 +3884,7 @@
 
 
 /*******************************************************************************
- * DllCanUnloadNow [DSOUND.@]  Determines whether the DLL is in use.
+ * DllCanUnloadNow [DSOUND.4]  Determines whether the DLL is in use.
  *
  * RETURNS
  *    Success: S_OK
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 12f4ecb..02b363f 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -1037,7 +1037,7 @@
 }
 
 /**********************************************************************
- * 		IsPeFormat		(KERNEL.2)
+ * 		IsPeFormat		(KERNEL.431)
  * Checks the passed filename if it is a PE format executeable
  * RETURNS
  *  TRUE, if it is.
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index eaa0dae..dc4fb60 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -15,7 +15,7 @@
 DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**************************************************************************
- *		DllEntryPoint (MSACM.2046)
+ *		DllEntryPoint (MSACM.255)
  *
  * MSACM DLL entry point
  *
diff --git a/dlls/msvideo/drawdib.c b/dlls/msvideo/drawdib.c
index 0696ab5..2e94949 100644
--- a/dlls/msvideo/drawdib.c
+++ b/dlls/msvideo/drawdib.c
@@ -419,7 +419,7 @@
 }
 
 /***********************************************************************
- *              DrawDibGetPalette       [MSVIDEO.108]]   
+ *              DrawDibGetPalette       [MSVIDEO.108]
  */
 HPALETTE16 VFWAPI DrawDibGetPalette16(HDRAWDIB16 hdd) {
 	return (HPALETTE16)DrawDibGetPalette(hdd);
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index d4e68d6..8295f5c 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -74,7 +74,7 @@
 }
 
 /******************************************************************************
- *  NtReadFile					[NTDLL] 
+ *  NtReadFile					[NTDLL.@]
  *  ZwReadFile
  *
  * Parameters
@@ -147,7 +147,7 @@
 }
 
 /******************************************************************************
- *  NtSetVolumeInformationFile		[NTDLL] 
+ *  NtSetVolumeInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetVolumeInformationFile(
 	IN HANDLE FileHandle,
@@ -162,7 +162,7 @@
 }
 
 /******************************************************************************
- *  NtQueryInformationFile		[NTDLL] 
+ *  NtQueryInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryInformationFile(
 	HANDLE FileHandle,
@@ -177,7 +177,7 @@
 }
 
 /******************************************************************************
- *  NtSetInformationFile		[NTDLL] 
+ *  NtSetInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationFile(
 	HANDLE FileHandle,
@@ -192,7 +192,7 @@
 }
 
 /******************************************************************************
- *  NtQueryDirectoryFile	[NTDLL]
+ *  NtQueryDirectoryFile	[NTDLL.@]
  *  ZwQueryDirectoryFile
  */
 NTSTATUS WINAPI NtQueryDirectoryFile(
@@ -216,7 +216,7 @@
 }
 
 /******************************************************************************
- *  NtQueryVolumeInformationFile		[NTDLL] 
+ *  NtQueryVolumeInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryVolumeInformationFile (
 	IN HANDLE FileHandle,
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index f35f0de..1ee0037 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -48,7 +48,7 @@
 }
 
 /*********************************************************************
- *                  _ftol   (NTDLL)
+ *                  _ftol   (NTDLL.@)
  *
  * VERSION
  *	[GNUC && i386]
@@ -65,7 +65,7 @@
 #endif /* defined(__GNUC__) && defined(__i386__) */
 
 /*********************************************************************
- *                  _ftol   (NTDLL)
+ *                  _ftol   (NTDLL.@)
  *
  * FIXME
  *	Should be register function
@@ -81,7 +81,7 @@
 #endif /* !defined(__GNUC__) && defined(__i386__) */
 
 /*********************************************************************
- *                  _ftol   (NTDLL)
+ *                  _ftol   (NTDLL.@)
  * VERSION
  *	[!i386]
  */
@@ -93,7 +93,7 @@
 #endif /* !defined(__i386__) */
 
 /*********************************************************************
- *                  _CIpow   (NTDLL)
+ *                  _CIpow   (NTDLL.@)
  * VERSION
  *	[GNUC && i386]
  */
@@ -109,7 +109,7 @@
 
 
 /*********************************************************************
- *                  _CIpow   (NTDLL)
+ *                  _CIpow   (NTDLL.@)
  *
  * FIXME
  *	Should be register function
@@ -126,7 +126,7 @@
 #endif /* !defined(__GNUC__) && defined(__i386__) */
 
 /*********************************************************************
- *                  _CIpow   (NTDLL)
+ *                  _CIpow   (NTDLL.@)
  * VERSION
  *	[!i386]
  */
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index e59387c..d64dab9 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -129,7 +129,7 @@
  */
 
 /******************************************************************************
- *  NtResumeThread	[NTDLL] 
+ *  NtResumeThread	[NTDLL.@]
  */
 NTSTATUS WINAPI NtResumeThread(
 	IN HANDLE ThreadHandle,
@@ -142,7 +142,7 @@
 
 
 /******************************************************************************
- *  NtTerminateThread	[NTDLL] 
+ *  NtTerminateThread	[NTDLL.@]
  */
 NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code )
 {
@@ -186,7 +186,7 @@
 }
 
 /******************************************************************************
- *  NtSetInformationThread		[NTDLL] 
+ *  NtSetInformationThread		[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationThread(
 	HANDLE ThreadHandle,
@@ -204,7 +204,7 @@
  */
 
 /******************************************************************************
- *  NtDuplicateToken		[NTDLL] 
+ *  NtDuplicateToken		[NTDLL.@]
  */
 NTSTATUS WINAPI NtDuplicateToken(
         IN HANDLE ExistingToken,
@@ -222,7 +222,7 @@
 }
 
 /******************************************************************************
- *  NtOpenProcessToken		[NTDLL] 
+ *  NtOpenProcessToken		[NTDLL.@]
  */
 NTSTATUS WINAPI NtOpenProcessToken(
 	HANDLE ProcessHandle,
@@ -236,7 +236,7 @@
 }
 
 /******************************************************************************
- *  NtOpenThreadToken		[NTDLL] 
+ *  NtOpenThreadToken		[NTDLL.@]
  */
 NTSTATUS WINAPI NtOpenThreadToken(
 	HANDLE ThreadHandle,
@@ -251,7 +251,7 @@
 }
 
 /******************************************************************************
- *  NtAdjustPrivilegesToken		[NTDLL] 
+ *  NtAdjustPrivilegesToken		[NTDLL.@]
  *
  * FIXME: parameters unsafe
  */
@@ -372,7 +372,7 @@
  */
  
 /******************************************************************************
- *  NtCreateSection	[NTDLL] 
+ *  NtCreateSection	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateSection(
 	OUT PHANDLE SectionHandle,
@@ -391,7 +391,7 @@
 }
 
 /******************************************************************************
- *  NtOpenSection	[NTDLL] 
+ *  NtOpenSection	[NTDLL.@]
  */
 NTSTATUS WINAPI NtOpenSection(
 	PHANDLE SectionHandle,
@@ -405,7 +405,7 @@
 }
 
 /******************************************************************************
- *  NtQuerySection	[NTDLL] 
+ *  NtQuerySection	[NTDLL.@]
  */
 NTSTATUS WINAPI NtQuerySection(
 	IN HANDLE SectionHandle,
@@ -420,7 +420,7 @@
 }
 
 /******************************************************************************
- * NtMapViewOfSection	[NTDLL] 
+ * NtMapViewOfSection	[NTDLL.@]
  * FUNCTION: Maps a view of a section into the virtual address space of a process
  *
  * ARGUMENTS:
@@ -461,7 +461,7 @@
  */
 
 /******************************************************************************
- *  NtCreatePort		[NTDLL] 
+ *  NtCreatePort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreatePort(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5) 
 {
@@ -470,7 +470,7 @@
 }
 
 /******************************************************************************
- *  NtConnectPort		[NTDLL] 
+ *  NtConnectPort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtConnectPort(DWORD x1,PUNICODE_STRING uni,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8) 
 {
@@ -480,7 +480,7 @@
 }
 
 /******************************************************************************
- *  NtListenPort		[NTDLL] 
+ *  NtListenPort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtListenPort(DWORD x1,DWORD x2) 
 {
@@ -489,7 +489,7 @@
 }
 
 /******************************************************************************
- *  NtAcceptConnectPort	[NTDLL] 
+ *  NtAcceptConnectPort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtAcceptConnectPort(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6) 
 {
@@ -498,7 +498,7 @@
 }
 
 /******************************************************************************
- *  NtCompleteConnectPort	[NTDLL] 
+ *  NtCompleteConnectPort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCompleteConnectPort(DWORD x1) 
 {
@@ -507,7 +507,7 @@
 }
 
 /******************************************************************************
- *  NtRegisterThreadTerminatePort	[NTDLL] 
+ *  NtRegisterThreadTerminatePort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtRegisterThreadTerminatePort(DWORD x1) 
 {
@@ -516,7 +516,7 @@
 }
 
 /******************************************************************************
- *  NtRequestWaitReplyPort		[NTDLL] 
+ *  NtRequestWaitReplyPort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtRequestWaitReplyPort(DWORD x1,DWORD x2,DWORD x3) 
 {
@@ -525,7 +525,7 @@
 }
 
 /******************************************************************************
- *  NtReplyWaitReceivePort	[NTDLL] 
+ *  NtReplyWaitReceivePort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtReplyWaitReceivePort(DWORD x1,DWORD x2,DWORD x3,DWORD x4) 
 {
@@ -538,7 +538,7 @@
  */
 
  /******************************************************************************
- *  NtSetIntervalProfile	[NTDLL] 
+ *  NtSetIntervalProfile	[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetIntervalProfile(DWORD x1,DWORD x2) {
 	FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2);
@@ -546,7 +546,7 @@
 }
 
 /******************************************************************************
- *  NtQueryPerformanceCounter	[NTDLL] 
+ *  NtQueryPerformanceCounter	[NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryPerformanceCounter(
 	IN PLARGE_INTEGER Counter,
@@ -558,7 +558,7 @@
 }
 
 /******************************************************************************
- *  NtCreateMailslotFile	[NTDLL] 
+ *  NtCreateMailslotFile	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateMailslotFile(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8) 
 {
@@ -616,7 +616,7 @@
 
 
 /******************************************************************************
- *  NtCreatePagingFile		[NTDLL] 
+ *  NtCreatePagingFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreatePagingFile(
 	IN PUNICODE_STRING PageFileName,
@@ -648,7 +648,7 @@
 }
 
 /******************************************************************************
- *  NtPowerInformation				[NTDLL] 
+ *  NtPowerInformation				[NTDLL.@]
  * 
  */
 NTSTATUS WINAPI NtPowerInformation(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5)
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 8f9bd3f..3947743 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -36,7 +36,7 @@
 }
 
 /******************************************************************************
- *  NtQuerySecurityObject	[NTDLL] 
+ *  NtQuerySecurityObject	[NTDLL.@]
  *
  * analogue to GetKernelObjectSecurity
  *
@@ -190,7 +190,7 @@
 	return STATUS_SUCCESS;
 }
 /******************************************************************************
- *  NtDuplicateObject		[NTDLL] 
+ *  NtDuplicateObject		[NTDLL.@]
  */
 NTSTATUS WINAPI NtDuplicateObject(
 	IN HANDLE SourceProcessHandle,
@@ -228,7 +228,7 @@
 }
 
 /******************************************************************************
- *  NtWaitForSingleObject		[NTDLL] 
+ *  NtWaitForSingleObject		[NTDLL.@]
  */
 NTSTATUS WINAPI NtWaitForSingleObject(
 	IN PHANDLE Object,
@@ -264,7 +264,7 @@
 }
 
 /******************************************************************************
- *  NtCreateDirectoryObject	[NTDLL] 
+ *  NtCreateDirectoryObject	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateDirectoryObject(
 	PHANDLE DirectoryHandle,
@@ -310,7 +310,7 @@
  */
  
 /******************************************************************************
- *  NtOpenSymbolicLinkObject	[NTDLL] 
+ *  NtOpenSymbolicLinkObject	[NTDLL.@]
  */
 NTSTATUS WINAPI NtOpenSymbolicLinkObject(
 	OUT PHANDLE LinkHandle,
@@ -324,7 +324,7 @@
 }
 
 /******************************************************************************
- *  NtCreateSymbolicLinkObject	[NTDLL] 
+ *  NtCreateSymbolicLinkObject	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateSymbolicLinkObject(
 	OUT PHANDLE SymbolicLinkHandle,
@@ -339,7 +339,7 @@
 }
 
 /******************************************************************************
- *  NtQuerySymbolicLinkObject	[NTDLL] 
+ *  NtQuerySymbolicLinkObject	[NTDLL.@]
  */
 NTSTATUS WINAPI NtQuerySymbolicLinkObject(
 	IN HANDLE LinkHandle,
@@ -353,7 +353,7 @@
 }
 
 /******************************************************************************
- *  NtAllocateUuids   [NTDLL]
+ *  NtAllocateUuids   [NTDLL.@]
  *
  * I have seen lpdwCount pointing to a pointer once...
  */
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index d5d683e..57cba0a 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -27,7 +27,7 @@
 
 
 /******************************************************************************
- * NtCreateKey [NTDLL]
+ * NtCreateKey [NTDLL.@]
  * ZwCreateKey
  */
 NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,
@@ -106,7 +106,7 @@
 
 
 /******************************************************************************
- * NtDeleteKey [NTDLL]
+ * NtDeleteKey [NTDLL.@]
  * ZwDeleteKey
  */
 NTSTATUS WINAPI NtDeleteKey( HANDLE hkey )
@@ -126,7 +126,7 @@
 
 
 /******************************************************************************
- * NtDeleteValueKey [NTDLL]
+ * NtDeleteValueKey [NTDLL.@]
  * ZwDeleteValueKey
  */
 NTSTATUS WINAPI NtDeleteValueKey( HANDLE hkey, const UNICODE_STRING *name )
@@ -237,7 +237,7 @@
 
 
 /******************************************************************************
- * NtEnumerateKey [NTDLL]
+ * NtEnumerateKey [NTDLL.@]
  * ZwEnumerateKey
  *
  * NOTES
@@ -267,7 +267,7 @@
 
 
 /******************************************************************************
- * NtQueryKey [NTDLL]
+ * NtQueryKey [NTDLL.@]
  * ZwQueryKey
  */
 NTSTATUS WINAPI NtQueryKey( HANDLE handle, KEY_INFORMATION_CLASS info_class,
@@ -335,7 +335,7 @@
 
 
 /******************************************************************************
- *  NtEnumerateValueKey	[NTDLL] 
+ *  NtEnumerateValueKey	[NTDLL.@]
  *  ZwEnumerateValueKey
  */
 NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index,
@@ -437,7 +437,7 @@
 
 
 /******************************************************************************
- * NtQueryValueKey [NTDLL]
+ * NtQueryValueKey [NTDLL.@]
  * ZwQueryValueKey
  *
  * NOTES
@@ -518,7 +518,7 @@
 
 
 /******************************************************************************
- *  NtFlushKey	[NTDLL] 
+ *  NtFlushKey	[NTDLL.@]
  *  ZwFlushKey
  */
 NTSTATUS WINAPI NtFlushKey(HANDLE KeyHandle)
@@ -529,7 +529,7 @@
 }
 
 /******************************************************************************
- *  NtLoadKey	[NTDLL] 
+ *  NtLoadKey	[NTDLL.@]
  *  ZwLoadKey
  */
 NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, const OBJECT_ATTRIBUTES *file )
@@ -541,7 +541,7 @@
 }
 
 /******************************************************************************
- *  NtNotifyChangeKey	[NTDLL] 
+ *  NtNotifyChangeKey	[NTDLL.@]
  *  ZwNotifyChangeKey
  */
 NTSTATUS WINAPI NtNotifyChangeKey(
@@ -582,7 +582,7 @@
 }
 
 /******************************************************************************
- * NtReplaceKey [NTDLL]
+ * NtReplaceKey [NTDLL.@]
  * ZwReplaceKey
  */
 NTSTATUS WINAPI NtReplaceKey(
@@ -596,7 +596,7 @@
 	return STATUS_SUCCESS;
 }
 /******************************************************************************
- * NtRestoreKey [NTDLL]
+ * NtRestoreKey [NTDLL.@]
  * ZwRestoreKey
  */
 NTSTATUS WINAPI NtRestoreKey(
@@ -609,7 +609,7 @@
 	return STATUS_SUCCESS;
 }
 /******************************************************************************
- * NtSaveKey [NTDLL]
+ * NtSaveKey [NTDLL.@]
  * ZwSaveKey
  */
 NTSTATUS WINAPI NtSaveKey(
@@ -621,7 +621,7 @@
 	return STATUS_SUCCESS;
 }
 /******************************************************************************
- * NtSetInformationKey [NTDLL]
+ * NtSetInformationKey [NTDLL.@]
  * ZwSetInformationKey
  */
 NTSTATUS WINAPI NtSetInformationKey(
@@ -637,7 +637,7 @@
 
 
 /******************************************************************************
- * NtSetValueKey [NTDLL]
+ * NtSetValueKey [NTDLL.@]
  * ZwSetValueKey
  *
  * NOTES
@@ -682,7 +682,7 @@
 }
 
 /******************************************************************************
- * NtUnloadKey [NTDLL]
+ * NtUnloadKey [NTDLL.@]
  * ZwUnloadKey
  */
 NTSTATUS WINAPI NtUnloadKey(
@@ -709,7 +709,7 @@
 }
 
 /******************************************************************************
- *  RtlOpenCurrentUser		[NTDLL] 
+ *  RtlOpenCurrentUser		[NTDLL.@]
  *
  * if we return just HKEY_CURRENT_USER the advapi try's to find a remote
  * registry (odd handle) and fails
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index d0e85c5..dcf6a29 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -218,7 +218,7 @@
  */
 
 /******************************************************************************
- *  RtlCreateHeap		[NTDLL] 
+ *  RtlCreateHeap		[NTDLL.@]
  */
 HANDLE WINAPI RtlCreateHeap(
 	ULONG Flags,
@@ -235,7 +235,7 @@
 
 }	
 /******************************************************************************
- *  RtlAllocateHeap		[NTDLL] 
+ *  RtlAllocateHeap		[NTDLL.@]
  */
 PVOID WINAPI RtlAllocateHeap(
 	HANDLE Heap,
@@ -248,7 +248,7 @@
 }
 
 /******************************************************************************
- *  RtlFreeHeap		[NTDLL] 
+ *  RtlFreeHeap		[NTDLL.@]
  */
 BOOLEAN WINAPI RtlFreeHeap(
 	HANDLE Heap,
@@ -261,7 +261,7 @@
 }
 	
 /******************************************************************************
- *  RtlDestroyHeap		[NTDLL] 
+ *  RtlDestroyHeap		[NTDLL.@]
  *
  * FIXME: prototype guessed
  */
@@ -277,7 +277,7 @@
  */
 
 /******************************************************************************
- *	DbgPrint	[NTDLL] 
+ *	DbgPrint	[NTDLL.@]
  */
 void WINAPIV DbgPrint(LPCSTR fmt, ...)
 {
@@ -293,7 +293,7 @@
 }
 
 /******************************************************************************
- *  RtlAcquirePebLock		[NTDLL] 
+ *  RtlAcquirePebLock		[NTDLL.@]
  */
 VOID WINAPI RtlAcquirePebLock(void)
 {
@@ -301,7 +301,7 @@
 }
 
 /******************************************************************************
- *  RtlReleasePebLock		[NTDLL] 
+ *  RtlReleasePebLock		[NTDLL.@]
  */
 VOID WINAPI RtlReleasePebLock(void)
 {
@@ -309,14 +309,14 @@
 }
 
 /******************************************************************************
- *  RtlIntegerToChar	[NTDLL] 
+ *  RtlIntegerToChar	[NTDLL.@]
  */
 DWORD WINAPI RtlIntegerToChar(DWORD x1,DWORD x2,DWORD x3,DWORD x4) {
 	FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx),stub!\n",x1,x2,x3,x4);
 	return 0;
 }
 /******************************************************************************
- *  RtlSetEnvironmentVariable		[NTDLL] 
+ *  RtlSetEnvironmentVariable		[NTDLL.@]
  */
 DWORD WINAPI RtlSetEnvironmentVariable(DWORD x1,PUNICODE_STRING key,PUNICODE_STRING val) {
 	FIXME("(0x%08lx,%s,%s),stub!\n",x1,debugstr_w(key->Buffer),debugstr_w(val->Buffer));
@@ -324,7 +324,7 @@
 }
 
 /******************************************************************************
- *  RtlNewSecurityObject		[NTDLL] 
+ *  RtlNewSecurityObject		[NTDLL.@]
  */
 DWORD WINAPI RtlNewSecurityObject(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6) {
 	FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx),stub!\n",x1,x2,x3,x4,x5,x6);
@@ -332,7 +332,7 @@
 }
 
 /******************************************************************************
- *  RtlDeleteSecurityObject		[NTDLL] 
+ *  RtlDeleteSecurityObject		[NTDLL.@]
  */
 DWORD WINAPI RtlDeleteSecurityObject(DWORD x1) {
 	FIXME("(0x%08lx),stub!\n",x1);
@@ -387,7 +387,7 @@
 
 
 /***********************************************************************
- *           RtlImageNtHeader   (NTDLL)
+ *           RtlImageNtHeader   (NTDLL.@)
  */
 PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule)
 {
@@ -404,7 +404,7 @@
 
 
 /******************************************************************************
- *  RtlCreateEnvironment		[NTDLL] 
+ *  RtlCreateEnvironment		[NTDLL.@]
  */
 DWORD WINAPI RtlCreateEnvironment(DWORD x1,DWORD x2) {
 	FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2);
@@ -413,7 +413,7 @@
 
 
 /******************************************************************************
- *  RtlDestroyEnvironment		[NTDLL] 
+ *  RtlDestroyEnvironment		[NTDLL.@]
  */
 DWORD WINAPI RtlDestroyEnvironment(DWORD x) {
 	FIXME("(0x%08lx),stub!\n",x);
@@ -421,14 +421,14 @@
 }
 
 /******************************************************************************
- *  RtlQueryEnvironmentVariable_U		[NTDLL] 
+ *  RtlQueryEnvironmentVariable_U		[NTDLL.@]
  */
 DWORD WINAPI RtlQueryEnvironmentVariable_U(DWORD x1,PUNICODE_STRING key,PUNICODE_STRING val) {
 	FIXME("(0x%08lx,%s,%p),stub!\n",x1,debugstr_w(key->Buffer),val);
 	return 0;
 }
 /******************************************************************************
- *  RtlInitializeGenericTable		[NTDLL] 
+ *  RtlInitializeGenericTable		[NTDLL.@]
  */
 DWORD WINAPI RtlInitializeGenericTable(void)
 {
@@ -437,7 +437,7 @@
 }
 
 /******************************************************************************
- *  RtlInitializeBitMap			[NTDLL] 
+ *  RtlInitializeBitMap			[NTDLL.@]
  * 
  */
 NTSTATUS WINAPI RtlInitializeBitMap(DWORD x1,DWORD x2,DWORD x3)
@@ -447,7 +447,7 @@
 }
 
 /******************************************************************************
- *  RtlSetBits				[NTDLL] 
+ *  RtlSetBits				[NTDLL.@]
  * 
  */
 NTSTATUS WINAPI RtlSetBits(DWORD x1,DWORD x2,DWORD x3)
@@ -457,7 +457,7 @@
 }
 
 /******************************************************************************
- *  RtlFindClearBits			[NTDLL] 
+ *  RtlFindClearBits			[NTDLL.@]
  * 
  */
 NTSTATUS WINAPI RtlFindClearBits(DWORD x1,DWORD x2,DWORD x3)
@@ -467,7 +467,7 @@
 }
 
 /******************************************************************************
- *  RtlClearBits			[NTDLL] 
+ *  RtlClearBits			[NTDLL.@]
  * 
  */
 NTSTATUS WINAPI RtlClearBits(DWORD x1,DWORD x2,DWORD x3)
@@ -487,7 +487,7 @@
 }	
 
 /******************************************************************************
- *  RtlMoveMemory   [NTDLL] 
+ *  RtlMoveMemory   [NTDLL.@]
  */
 #undef RtlMoveMemory
 VOID WINAPI RtlMoveMemory( VOID *Destination, CONST VOID *Source, SIZE_T Length )
@@ -496,7 +496,7 @@
 }
 
 /******************************************************************************
- *  RtlFillMemory   [NTDLL] 
+ *  RtlFillMemory   [NTDLL.@]
  */
 #undef RtlFillMemory
 VOID WINAPI RtlFillMemory( VOID *Destination, SIZE_T Length, BYTE Fill )
@@ -505,7 +505,7 @@
 }
 
 /******************************************************************************
- *  RtlZeroMemory   [NTDLL] 
+ *  RtlZeroMemory   [NTDLL.@]
  */
 #undef RtlZeroMemory
 VOID WINAPI RtlZeroMemory( VOID *Destination, SIZE_T Length )
@@ -514,7 +514,7 @@
 }
 
 /******************************************************************************
- *  RtlCompareMemory   [NTDLL] 
+ *  RtlCompareMemory   [NTDLL.@]
  */
 SIZE_T WINAPI RtlCompareMemory( const VOID *Source1, const VOID *Source2, SIZE_T Length)
 {
@@ -524,7 +524,7 @@
 }
 
 /******************************************************************************
- *  RtlAssert                           [NTDLL]
+ *  RtlAssert                           [NTDLL.@]
  *
  * Not implemented in non-debug versions.
  */
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index fbe65a2..ce52d4a 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -292,7 +292,7 @@
 }
 
 /**************************************************************************
- *  RtlLengthSecurityDescriptor			[NTDLL]
+ *  RtlLengthSecurityDescriptor			[NTDLL.@]
  */
 ULONG WINAPI RtlLengthSecurityDescriptor(
 	PSECURITY_DESCRIPTOR SecurityDescriptor)
@@ -317,7 +317,7 @@
 }
 
 /******************************************************************************
- *  RtlGetDaclSecurityDescriptor		[NTDLL] 
+ *  RtlGetDaclSecurityDescriptor		[NTDLL.@]
  *
  */
 NTSTATUS WINAPI RtlGetDaclSecurityDescriptor(
@@ -378,7 +378,7 @@
 }
 
 /******************************************************************************
- *  RtlGetSaclSecurityDescriptor		[NTDLL] 
+ *  RtlGetSaclSecurityDescriptor		[NTDLL.@]
  *
  */
 NTSTATUS WINAPI RtlGetSaclSecurityDescriptor(
@@ -497,7 +497,7 @@
 	return STATUS_SUCCESS;
 }
 /**************************************************************************
- *                 RtlGetGroupSecurityDescriptor		[NTDLL]
+ *                 RtlGetGroupSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(
 	PSECURITY_DESCRIPTOR SecurityDescriptor,
@@ -518,7 +518,7 @@
 } 
 
 /**************************************************************************
- *                 RtlMakeSelfRelativeSD		[NTDLL]
+ *                 RtlMakeSelfRelativeSD		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlMakeSelfRelativeSD(
 	IN PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
@@ -613,7 +613,7 @@
 }
 
 /******************************************************************************
- *  RtlAddAccessAllowedAce		[NTDLL] 
+ *  RtlAddAccessAllowedAce		[NTDLL.@]
  */
 BOOL WINAPI RtlAddAccessAllowedAce(
 	IN OUT PACL pAcl,
@@ -627,7 +627,7 @@
 }
 
 /******************************************************************************
- *  RtlGetAce		[NTDLL] 
+ *  RtlGetAce		[NTDLL.@]
  */
 DWORD WINAPI RtlGetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce ) 
 {
@@ -640,7 +640,7 @@
  */
 
 /******************************************************************************
- *  RtlAdjustPrivilege		[NTDLL] 
+ *  RtlAdjustPrivilege		[NTDLL.@]
  */
 DWORD WINAPI RtlAdjustPrivilege(DWORD x1,DWORD x2,DWORD x3,DWORD x4) 
 {
@@ -649,7 +649,7 @@
 }
 
 /******************************************************************************
- *  RtlImpersonateSelf		[NTDLL] 
+ *  RtlImpersonateSelf		[NTDLL.@]
  */
 BOOL WINAPI
 RtlImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
@@ -659,7 +659,7 @@
 }
 
 /******************************************************************************
- *  NtAccessCheck		[NTDLL]
+ *  NtAccessCheck		[NTDLL.@]
  */
 NTSTATUS WINAPI 
 NtAccessCheck(
@@ -680,7 +680,7 @@
 }
 
 /******************************************************************************
- *  NtSetSecurityObject		[NTDLL]
+ *  NtSetSecurityObject		[NTDLL.@]
  */
 NTSTATUS WINAPI
 NtSetSecurityObject(
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 11e048a..39a41c4 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -994,13 +994,13 @@
 #endif /* linux */
 
 /**********************************************************************
- *		DbgBreakPoint   (NTDLL)
+ *		DbgBreakPoint   (NTDLL.@)
  */
 void WINAPI DbgBreakPoint(void);
 __ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret");
 
 /**********************************************************************
- *		DbgUserBreakPoint   (NTDLL)
+ *		DbgUserBreakPoint   (NTDLL.@)
  */
 void WINAPI DbgUserBreakPoint(void);
 __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret");
diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c
index 1f3b8cb..45d5cbd 100644
--- a/dlls/ntdll/signal_sparc.c
+++ b/dlls/ntdll/signal_sparc.c
@@ -371,7 +371,7 @@
 }
 
 /**********************************************************************
- *              DbgBreakPoint   (NTDLL)
+ *              DbgBreakPoint   (NTDLL.@)
  */
 void WINAPI DbgBreakPoint(void)
 {
@@ -379,7 +379,7 @@
 }
 
 /**********************************************************************
- *              DbgUserBreakPoint   (NTDLL)
+ *              DbgUserBreakPoint   (NTDLL.@)
  */
 void WINAPI DbgUserBreakPoint(void)
 {
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index 1b09dbb..27e62b6 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -13,7 +13,7 @@
 #include "windef.h"
 
 /*********************************************************************
- *                  _memicmp   (NTDLL)
+ *                  _memicmp   (NTDLL.@)
  */
 INT __cdecl _memicmp( LPCSTR s1, LPCSTR s2, DWORD len )
 {
@@ -28,7 +28,7 @@
 }
 
 /*********************************************************************
- *                  _strupr   (NTDLL)
+ *                  _strupr   (NTDLL.@)
  */
 LPSTR __cdecl _strupr( LPSTR str )
 {
@@ -38,7 +38,7 @@
 }
 
 /*********************************************************************
- *                  _strlwr   (NTDLL)
+ *                  _strlwr   (NTDLL.@)
  *
  * convert a string in place to lowercase 
  */
@@ -51,7 +51,7 @@
 
 
 /*********************************************************************
- *                  _ultoa   (NTDLL)
+ *                  _ultoa   (NTDLL.@)
  */
 LPSTR  __cdecl _ultoa( unsigned long x, LPSTR buf, INT radix )
 {
@@ -71,7 +71,7 @@
 
 
 /*********************************************************************
- *                  _ltoa   (NTDLL)
+ *                  _ltoa   (NTDLL.@)
  */
 LPSTR  __cdecl _ltoa( long x, LPSTR buf, INT radix )
 {
@@ -87,7 +87,7 @@
 
 
 /*********************************************************************
- *                  _itoa           (NTDLL)
+ *                  _itoa           (NTDLL.@)
  */
 LPSTR  __cdecl _itoa( int x, LPSTR buf, INT radix )
 {
@@ -96,7 +96,7 @@
 
 
 /*********************************************************************
- *		_splitpath (NTDLL)
+ *		_splitpath (NTDLL.@)
  */
 void __cdecl _splitpath(const char* inpath, char * drv, char * dir,
                         char* fname, char * ext )
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 7234d75..3fdaf18 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -176,7 +176,7 @@
 /************* end of code by Rex Jolliff (rex@lvcablemodem.com) *******************/
 
 /******************************************************************************
- *  RtlSystemTimeToLocalTime 	[NTDLL] 
+ *  RtlSystemTimeToLocalTime 	[NTDLL.@]
  */
 VOID WINAPI RtlSystemTimeToLocalTime(
 	IN  PLARGE_INTEGER SystemTime,
@@ -188,7 +188,7 @@
 }
 
 /******************************************************************************
- *  RtlTimeToSecondsSince1970		[NTDLL] 
+ *  RtlTimeToSecondsSince1970		[NTDLL.@]
  */
 BOOLEAN WINAPI RtlTimeToSecondsSince1970( const FILETIME *time, LPDWORD res )
 {
@@ -200,7 +200,7 @@
 }
 
 /******************************************************************************
- *  RtlTimeToSecondsSince1980		[NTDLL] 
+ *  RtlTimeToSecondsSince1980		[NTDLL.@]
  */
 BOOLEAN WINAPI RtlTimeToSecondsSince1980( const FILETIME *time, LPDWORD res )
 {
@@ -212,7 +212,7 @@
 }
 
 /******************************************************************************
- *  RtlSecondsSince1970ToTime		[NTDLL] 
+ *  RtlSecondsSince1970ToTime		[NTDLL.@]
  */
 void WINAPI RtlSecondsSince1970ToTime( DWORD time, FILETIME *res )
 {
@@ -221,7 +221,7 @@
 }
 
 /******************************************************************************
- *  RtlSecondsSince1980ToTime		[NTDLL] 
+ *  RtlSecondsSince1980ToTime		[NTDLL.@]
  */
 void WINAPI RtlSecondsSince1980ToTime( DWORD time, FILETIME *res )
 {
diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c
index bc0dbbd..e94699c 100644
--- a/dlls/ntdll/wcstring.c
+++ b/dlls/ntdll/wcstring.c
@@ -274,7 +274,7 @@
 
 
 /*********************************************************************
- *                  wcstol  (NTDLL)
+ *                  wcstol  (NTDLL.@)
  * Like strtol, but for wide character strings.
  */
 INT __cdecl NTDLL_wcstol(LPWSTR s,LPWSTR *end,INT base)
@@ -307,7 +307,7 @@
 
 
 /*********************************************************************
- *           _ultow    (NTDLL)
+ *           _ultow    (NTDLL.@)
  * Like _ultoa, but for wide character strings.
  */
 LPWSTR __cdecl _ultow(ULONG value, LPWSTR string, INT radix)
@@ -339,7 +339,7 @@
 }
 
 /*********************************************************************
- *           _wtol    (NTDLL)
+ *           _wtol    (NTDLL.@)
  * Like atol, but for wide character strings.
  */
 LONG __cdecl _wtol(LPWSTR string)
@@ -350,7 +350,7 @@
 }
 
 /*********************************************************************
- *           _wtoi    (NTDLL)
+ *           _wtoi    (NTDLL.@)
  */
 INT __cdecl _wtoi(LPWSTR string)
 {
@@ -487,7 +487,7 @@
 
 
 /***********************************************************************
- *        _snwprintf (NTDLL)
+ *        _snwprintf (NTDLL.@)
  */
 int __cdecl _snwprintf(WCHAR *str, unsigned int len, const WCHAR *format, ...)
 {
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 4960a4b..f621aee 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -1739,7 +1739,7 @@
 
 
 /***********************************************************************
- *           DllGetClassObject [OLE32.@]
+ *           DllGetClassObject [OLE32.63]
  */
 HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
 {	
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 8913c26..991a5f6 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -464,7 +464,7 @@
 }
 
 /***********************************************************************
- *           GetRunningObjectTable (OLE2.73)
+ *           GetRunningObjectTable (OLE2.30)
  */
 HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
 {
diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c
index 8e8efc4..885212f 100644
--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -251,7 +251,7 @@
 }
 
 /***********************************************************************
- *           CoIsOle1Class                              [OLE32]
+ *           CoIsOle1Class                              [OLE32.29]
  */
 BOOL WINAPI CoIsOle1Class(REFCLSID clsid)
 {
diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c
index a525556..ecdc045 100644
--- a/dlls/ole32/ole32_main.c
+++ b/dlls/ole32/ole32_main.c
@@ -32,7 +32,7 @@
 }
 
 /***********************************************************************
- *		DllRegisterServer (OLE32.@)
+ *		DllRegisterServer (OLE32.194)
  */
 HRESULT WINAPI OLE32_DllRegisterServer() {
     /* FIXME: what Interfaces should we register ... */
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index b2480d6..0e1311b 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -189,7 +189,7 @@
 }
 
 /******************************************************************************
- * CreateTypeLib [OLEAUT32]  creates a typelib
+ * CreateTypeLib [OLEAUT32.160]  creates a typelib
  *
  * RETURNS
  *    Success: S_OK
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 1269753..27b328b 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -67,7 +67,7 @@
 }
 
 /*************************************************************************
- *           UuidCreate   [RPCRT4]
+ *           UuidCreate   [RPCRT4.@]
  *
  * Creates a 128bit UUID.
  * Implemented according the DCE specification for UUID generation.
diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c
index 1673ae1..8a4a52d 100644
--- a/dlls/setupapi/virtcopy.c
+++ b/dlls/setupapi/virtcopy.c
@@ -379,7 +379,7 @@
 }
 
 /***********************************************************************
- *		VcpExplain (SETUPX.?)
+ *		VcpExplain (SETUPX.411)
  */
 LPCSTR WINAPI VcpExplain16(LPVIRTNODE lpVn, DWORD dwWhat)
 {
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 220eed7..466d7b6 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -15,7 +15,7 @@
 DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /***********************************************************************
- *              DllCanUnloadNow (SHDOCVW.@) */
+ *              DllCanUnloadNow (SHDOCVW.109) */
 HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void)
 {
     FIXME("(void): stub\n");
@@ -24,7 +24,7 @@
 }
 
 /*************************************************************************
- *              DllGetClassObject (SHDOCVW.@)
+ *              DllGetClassObject (SHDOCVW.312)
  */
 HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
@@ -43,7 +43,7 @@
 }
 
 /***********************************************************************
- *              DllGetVersion (SHDOCVW.@)
+ *              DllGetVersion (SHDOCVW.113)
  */
 HRESULT WINAPI SHDOCVW_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
@@ -52,7 +52,7 @@
 }
 
 /*************************************************************************
- *              DllInstall (SHDOCVW.@)
+ *              DllInstall (SHDOCVW.114)
  */
 HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
@@ -62,7 +62,7 @@
 }
 
 /***********************************************************************
- *		DllRegisterServer (SHDOCVW.@)
+ *		DllRegisterServer (SHDOCVW.124)
  */
 HRESULT WINAPI SHDOCVW_DllRegisterServer()
 {
@@ -71,7 +71,7 @@
 }
 
 /***********************************************************************
- *		DllUnregisterServer (SHDOCVW.@)
+ *		DllUnregisterServer (SHDOCVW.127)
  */
 HRESULT WINAPI SHDOCVW_DllUnregisterServer()
 {
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 18896ea..439dd5d 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -179,7 +179,7 @@
 }
 
 /*************************************************************************
- * SHChangeNotify				[SHELL32.239]
+ * SHChangeNotify				[SHELL32.@]
  */
 void WINAPI SHChangeNotifyW (LONG wEventId, UINT  uFlags, LPCVOID dwItem1, LPCVOID dwItem2)
 {
@@ -222,7 +222,7 @@
 }
 
 /*************************************************************************
- * SHChangeNotify				[SHELL32.239]
+ * SHChangeNotify				[SHELL32.@]
  */
 void WINAPI SHChangeNotifyA (LONG wEventId, UINT  uFlags, LPCVOID dwItem1, LPCVOID dwItem2)
 {
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 5c9df21..5624d79 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -884,7 +884,7 @@
 }
 
 /*************************************************************************
- * SHGetFolderLocation [SHELL32]
+ * SHGetFolderLocation [SHELL32.@]
  *
  * NOTES
  *  the pidl can be a simple one. since we cant get the path out of the pidl
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 20e31cb..0884ca6 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -799,7 +799,7 @@
 }
 
 /***********************************************************************
- * DllGetVersion [SHELL32]
+ * DllGetVersion [SHELL32.@]
  *
  * Retrieves version information of the 'SHELL32.DLL'
  *
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 8555b1f..a67833f 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -969,7 +969,7 @@
 }
 
 /*************************************************************************
- *      SHAddFromPropSheetExtArray	[SHELL32]
+ *      SHAddFromPropSheetExtArray	[SHELL32.167]
  */
 DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c)
 {
@@ -978,7 +978,7 @@
 }
 
 /*************************************************************************
- *      SHCreatePropSheetExtArray	[SHELL32]
+ *      SHCreatePropSheetExtArray	[SHELL32.168]
  */
 DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c)
 {
@@ -996,7 +996,7 @@
 }
 
 /*************************************************************************
- *      SHDestroyPropSheetExtArray	[SHELL32]
+ *      SHDestroyPropSheetExtArray	[SHELL32.169]
  */
 DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a)
 {
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index 277d7d4..41e1ba0 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -106,7 +106,7 @@
 }
 
 /*************************************************************************
- * SHRegDeleteKeyW   [SHELL32]
+ * SHRegDeleteKeyW   [SHELL32.512]
  */
 HRESULT WINAPI SHRegDeleteKeyW(
 	HKEY hkey,
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index b7c2cd1..ec6d3e7 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -45,7 +45,7 @@
 }
 
 /***********************************************************************
- * DllGetVersion [SHLWAPI]
+ * DllGetVersion [SHLWAPI.@]
  *
  * Retrieves version information of the 'SHLWAPI.DLL'
  *
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index d3fd48c..b22b6b3 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -16,7 +16,7 @@
 DEFAULT_DEBUG_CHANNEL(shell);
 
 /*************************************************************************
- * StrChrA					[SHLWAPI]
+ * StrChrA					[SHLWAPI.@]
  */
 LPSTR WINAPI StrChrA (LPCSTR str, WORD c)
 {
@@ -25,7 +25,7 @@
 }
 
 /*************************************************************************
- * StrChrW					[SHLWAPI]
+ * StrChrW					[SHLWAPI.@]
  *
  */
 LPWSTR WINAPI StrChrW (LPCWSTR str, WCHAR x )
@@ -35,7 +35,7 @@
 }
 
 /*************************************************************************
- * StrCmpIW					[SHLWAPI]
+ * StrCmpIW					[SHLWAPI.@]
  */
 int WINAPI StrCmpIW ( LPCWSTR wstr1, LPCWSTR wstr2 )
 {
@@ -44,7 +44,7 @@
 }
 
 /*************************************************************************
- * StrCmpNA					[SHLWAPI]
+ * StrCmpNA					[SHLWAPI.@]
  */
 INT WINAPI StrCmpNA ( LPCSTR str1, LPCSTR str2, INT len)
 {
@@ -53,7 +53,7 @@
 }
 
 /*************************************************************************
- * StrCmpNW					[SHLWAPI]
+ * StrCmpNW					[SHLWAPI.@]
  */
 INT WINAPI StrCmpNW ( LPCWSTR wstr1, LPCWSTR wstr2, INT len)
 {
@@ -62,7 +62,7 @@
 }
 
 /*************************************************************************
- * StrCmpNIA					[SHLWAPI]
+ * StrCmpNIA					[SHLWAPI.@]
  */
 int WINAPI StrCmpNIA ( LPCSTR str1, LPCSTR str2, int len)
 {
@@ -71,7 +71,7 @@
 }
 
 /*************************************************************************
- * StrCmpNIW					[SHLWAPI]
+ * StrCmpNIW					[SHLWAPI.@]
  */
 int WINAPI StrCmpNIW ( LPCWSTR wstr1, LPCWSTR wstr2, int len)
 {
@@ -80,7 +80,7 @@
 }
 
 /*************************************************************************
- * StrCmpW					[SHLWAPI]
+ * StrCmpW					[SHLWAPI.@]
  */
 int WINAPI StrCmpW ( LPCWSTR wstr1, LPCWSTR wstr2 )
 {
@@ -89,7 +89,7 @@
 }
 
 /*************************************************************************
- * StrCatW					[SHLWAPI]
+ * StrCatW					[SHLWAPI.@]
  */
 LPWSTR WINAPI StrCatW( LPWSTR wstr1, LPCWSTR wstr2 )
 {
@@ -98,7 +98,7 @@
 
 
 /*************************************************************************
- * StrCpyW					[SHLWAPI]
+ * StrCpyW					[SHLWAPI.@]
  */
 LPWSTR WINAPI StrCpyW( LPWSTR wstr1, LPCWSTR wstr2 )
 {
@@ -107,7 +107,7 @@
 
 
 /*************************************************************************
- * StrCpyNW					[SHLWAPI]
+ * StrCpyNW					[SHLWAPI.@]
  */
 LPWSTR WINAPI StrCpyNW( LPWSTR wstr1, LPCWSTR wstr2, int n )
 {
@@ -116,7 +116,7 @@
 
 
 /*************************************************************************
- * StrStrA					[SHLWAPI]
+ * StrStrA					[SHLWAPI.@]
  */
 LPSTR WINAPI StrStrA(LPCSTR lpFirst, LPCSTR lpSrch)
 {
@@ -131,7 +131,7 @@
 }
 
 /*************************************************************************
- * StrStrW					[SHLWAPI]
+ * StrStrW					[SHLWAPI.@]
  */
 LPWSTR WINAPI StrStrW(LPCWSTR lpFirst, LPCWSTR lpSrch)
 {
@@ -146,7 +146,7 @@
 }
 
 /*************************************************************************
- * StrStrIA					[SHLWAPI]
+ * StrStrIA					[SHLWAPI.@]
  */
 LPSTR WINAPI StrStrIA(LPCSTR lpFirst, LPCSTR lpSrch)
 {
@@ -161,7 +161,7 @@
 }
 
 /*************************************************************************
- * StrStrIW					[SHLWAPI]
+ * StrStrIW					[SHLWAPI.@]
  */
 LPWSTR WINAPI StrStrIW(LPCWSTR lpFirst, LPCWSTR lpSrch)
 {
@@ -176,7 +176,7 @@
 }
 
 /*************************************************************************
- *	StrToIntA			[SHLWAPI]
+ *	StrToIntA			[SHLWAPI.@]
  */
 int WINAPI StrToIntA(LPCSTR lpSrc)
 {
@@ -185,7 +185,7 @@
 }
 
 /*************************************************************************
- *	StrToIntW			[SHLWAPI]
+ *	StrToIntW			[SHLWAPI.@]
  */
 int WINAPI StrToIntW(LPCWSTR lpSrc)
 {
@@ -198,7 +198,7 @@
 }
 
 /*************************************************************************
- *	StrToIntExA			[SHLWAPI]
+ *	StrToIntExA			[SHLWAPI.@]
  */
 BOOL WINAPI StrToIntExA( LPCSTR pszString, DWORD dwFlags, LPINT piRet)
 {
@@ -208,7 +208,7 @@
 }
 
 /*************************************************************************
- *	StrToIntExW			[SHLWAPI]
+ *	StrToIntExW			[SHLWAPI.@]
  */
 BOOL WINAPI StrToIntExW( LPCWSTR pszString, DWORD dwFlags, LPINT piRet)
 {
@@ -218,7 +218,7 @@
 }
 
 /*************************************************************************
- *	StrDupA			[SHLWAPI]
+ *	StrDupA			[SHLWAPI.@]
  */
 LPSTR WINAPI StrDupA (LPCSTR lpSrc)
 {
@@ -232,7 +232,7 @@
 }
 
 /*************************************************************************
- *	StrDupW			[SHLWAPI]
+ *	StrDupW			[SHLWAPI.@]
  */
 LPWSTR WINAPI StrDupW (LPCWSTR lpSrc)
 {
@@ -246,7 +246,7 @@
 }
 
 /*************************************************************************
- *	StrCSpnA		[SHLWAPI]
+ *	StrCSpnA		[SHLWAPI.@]
  */
 int WINAPI StrCSpnA (LPCSTR lpStr, LPCSTR lpSet)
 {
@@ -270,7 +270,7 @@
 }
 
 /*************************************************************************
- *	StrCSpnW		[SHLWAPI]
+ *	StrCSpnW		[SHLWAPI.@]
  */
 int WINAPI StrCSpnW (LPCWSTR lpStr, LPCWSTR lpSet)
 {
@@ -335,7 +335,7 @@
 
 
 /*************************************************************************
- *	StrCatBuffA		[SHLWAPI]
+ *	StrCatBuffA		[SHLWAPI.@]
  *
  * Appends back onto front, stopping when front is size-1 characters long.
  * Returns front.
@@ -353,7 +353,7 @@
 }
 
 /*************************************************************************
- *	StrCatBuffW		[SHLWAPI]
+ *	StrCatBuffW		[SHLWAPI.@]
  *
  * Appends back onto front, stopping when front is size-1 characters long.
  * Returns front.
@@ -452,7 +452,7 @@
 }
 
 /*************************************************************************
- * StrFormatByteSizeA				[SHLWAPI]
+ * StrFormatByteSizeA				[SHLWAPI.@]
  */
 LPSTR WINAPI StrFormatByteSizeA ( DWORD dw, LPSTR pszBuf, UINT cchBuf )
 {	char buf[64];
@@ -474,7 +474,7 @@
 }
 
 /*************************************************************************
- * StrFormatByteSizeW				[SHLWAPI]
+ * StrFormatByteSizeW				[SHLWAPI.@]
  */
 LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf )
 {
@@ -486,7 +486,7 @@
 }
 
 /*************************************************************************
- *      StrNCatA	[SHLWAPI]
+ *      StrNCatA	[SHLWAPI.@]
  */
 LPSTR WINAPI StrNCatA(LPSTR front, LPCSTR back, INT cchMax)
 {
@@ -495,7 +495,7 @@
 }
 
 /*************************************************************************
- *      StrNCatW	[SHLWAPI]
+ *      StrNCatW	[SHLWAPI.@]
  */
 LPWSTR WINAPI StrNCatW(LPWSTR front, LPCWSTR back, INT cchMax)
 {
@@ -504,7 +504,7 @@
 }
 
 /*************************************************************************
- *      StrTrimA	[SHLWAPI]
+ *      StrTrimA	[SHLWAPI.@]
  */
 BOOL WINAPI StrTrimA(LPSTR pszSource, LPCSTR pszTrimChars)
 {
@@ -529,7 +529,7 @@
 }
 
 /*************************************************************************
- *      wnsprintfA	[SHLWAPI]
+ *      wnsprintfA	[SHLWAPI.@]
  */
 int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
 {
@@ -543,7 +543,7 @@
 }
 
 /*************************************************************************
- *      wnsprintfW	[SHLWAPI]
+ *      wnsprintfW	[SHLWAPI.@]
  */
 int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...)
 {
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index 44f1458..36967ee 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -76,7 +76,7 @@
 }
 
 /*************************************************************************
- *        UrlCanonicalizeA     [SHLWAPI]
+ *        UrlCanonicalizeA     [SHLWAPI.@]
  */
 HRESULT WINAPI UrlCanonicalizeA(LPCSTR pszUrl, LPSTR pszCanonicalized,
 	LPDWORD pcchCanonicalized, DWORD dwFlags)
@@ -124,7 +124,7 @@
 }
 
 /*************************************************************************
- *        UrlCanonicalizeW     [SHLWAPI]
+ *        UrlCanonicalizeW     [SHLWAPI.@]
  */
 HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, 
 				LPDWORD pcchCanonicalized, DWORD dwFlags)
@@ -135,7 +135,7 @@
 }
 
 /*************************************************************************
- *      UrlEscapeA	[SHLWAPI]
+ *      UrlEscapeA	[SHLWAPI.@]
  *
  * Converts unsafe characters into their escape sequences.
  *
@@ -215,7 +215,7 @@
 }	
 
 /*************************************************************************
- *      UrlEscapeW	[SHLWAPI]
+ *      UrlEscapeW	[SHLWAPI.@]
  */
 HRESULT WINAPI UrlEscapeW(
 	LPCWSTR pszUrl,
@@ -230,7 +230,7 @@
 
 
 /*************************************************************************
- *      UrlUnescapeA	[SHLWAPI]
+ *      UrlUnescapeA	[SHLWAPI.@]
  *
  * Converts escape sequences back to ordinary characters.
  * 
@@ -301,7 +301,7 @@
 }
 
 /*************************************************************************
- *      UrlUnescapeW	[SHLWAPI]
+ *      UrlUnescapeW	[SHLWAPI.@]
  */
 HRESULT WINAPI UrlUnescapeW(
 	LPCWSTR pszUrl,
@@ -315,7 +315,7 @@
 }
 
 /*************************************************************************
- *      HashData	[SHLWAPI]
+ *      HashData	[SHLWAPI.@]
  *
  * Hash an input block into a variable sized digest.
  */
@@ -348,7 +348,7 @@
 }
 
 /*************************************************************************
- *      UrlHashA	[SHLWAPI]
+ *      UrlHashA	[SHLWAPI.@]
  *
  * Hash an ASCII URL.
  */
@@ -362,7 +362,7 @@
 }
 
 /*************************************************************************
- *      UrlApplySchemeW	[SHLWAPI]
+ *      UrlApplySchemeW	[SHLWAPI.@]
  */
 HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DWORD dwFlags)
 {
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 04e3d24..93f149e 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -475,7 +475,7 @@
 
 
 /***********************************************************************
- *           HttpSendRequestExA (WININET)
+ *           HttpSendRequestExA (WININET.@)
  *
  * Sends the specified request to the HTTP server and allows chunked
  * transfers
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index 794c8c8..095d9af 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -3684,7 +3684,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetNumDevs		[WINMM.167]
+ * 				waveOutGetNumDevs		[WINMM.@]
  */
 UINT16 WINAPI waveOutGetNumDevs16(void)
 {
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index d388e39..0538e79 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -1222,7 +1222,7 @@
 
 
 /**********************************************************************
- *              WSAIoctl                (WS2_32)
+ *              WSAIoctl                (WS2_32.50)
  *
  *
  *   FIXME:  Only SIO_GET_INTERFACE_LIST option implemented.
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index 387170e..881a350 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -2593,7 +2593,7 @@
 }
 
 /******************************************************************************
- *		SetPrinterDataExA   (WINSPOOL)
+ *		SetPrinterDataExA   (WINSPOOL.@)
  */
 DWORD WINAPI SetPrinterDataExA(HANDLE hPrinter, LPSTR pKeyName,
 			       LPSTR pValueName, DWORD Type,
@@ -2622,7 +2622,7 @@
 }
 
 /******************************************************************************
- *		SetPrinterDataExW   (WINSPOOL)
+ *		SetPrinterDataExW   (WINSPOOL.@)
  */
 DWORD WINAPI SetPrinterDataExW(HANDLE hPrinter, LPWSTR pKeyName,
 			       LPWSTR pValueName, DWORD Type,
@@ -2651,7 +2651,7 @@
 }
 
 /******************************************************************************
- *		SetPrinterDataA   (WINSPOOL)
+ *		SetPrinterDataA   (WINSPOOL.@)
  */
 DWORD WINAPI SetPrinterDataA(HANDLE hPrinter, LPSTR pValueName, DWORD Type,
 			       LPBYTE pData, DWORD cbData)
@@ -2661,7 +2661,7 @@
 }
 
 /******************************************************************************
- *		SetPrinterDataW   (WINSPOOL)
+ *		SetPrinterDataW   (WINSPOOL.@)
  */
 DWORD WINAPI SetPrinterDataW(HANDLE hPrinter, LPWSTR pValueName, DWORD Type,
 			     LPBYTE pData, DWORD cbData)
@@ -2671,7 +2671,7 @@
 }
 
 /******************************************************************************
- *		GetPrinterDataExA   (WINSPOOL)
+ *		GetPrinterDataExA   (WINSPOOL.@)
  */
 DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPSTR pKeyName,
 			       LPSTR pValueName, LPDWORD pType,
@@ -2702,7 +2702,7 @@
 }
 
 /******************************************************************************
- *		GetPrinterDataExW   (WINSPOOL)
+ *		GetPrinterDataExW   (WINSPOOL.@)
  */
 DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPWSTR pKeyName,
 			       LPWSTR pValueName, LPDWORD pType,
@@ -2733,7 +2733,7 @@
 }
 
 /******************************************************************************
- *		GetPrinterDataA   (WINSPOOL)
+ *		GetPrinterDataA   (WINSPOOL.@)
  */
 DWORD WINAPI GetPrinterDataA(HANDLE hPrinter, LPSTR pValueName, LPDWORD pType,
 			     LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded)
@@ -2743,7 +2743,7 @@
 }
 
 /******************************************************************************
- *		GetPrinterDataW   (WINSPOOL)
+ *		GetPrinterDataW   (WINSPOOL.@)
  */
 DWORD WINAPI GetPrinterDataW(HANDLE hPrinter, LPWSTR pValueName, LPDWORD pType,
 			     LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded)
diff --git a/files/directory.c b/files/directory.c
index 31e10cc..6066144 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -285,7 +285,7 @@
 
 
 /***********************************************************************
- *           GetSystemWindowsDirectoryA   (KERNEL32) W2K, TS4.0SP4
+ *           GetSystemWindowsDirectoryA   (KERNEL32.@) W2K, TS4.0SP4
  */
 UINT WINAPI GetSystemWindowsDirectoryA( LPSTR path, UINT count )
 {
@@ -294,7 +294,7 @@
 
 
 /***********************************************************************
- *           GetSystemWindowsDirectoryW   (KERNEL32) W2K, TS4.0SP4
+ *           GetSystemWindowsDirectoryW   (KERNEL32.@) W2K, TS4.0SP4
  */
 UINT WINAPI GetSystemWindowsDirectoryW( LPWSTR path, UINT count )
 {
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 7a885b8..54110fc 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -1103,7 +1103,7 @@
 
 
 /***********************************************************************
- *           GetLongPathNameA   (KERNEL32.xxx)
+ *           GetLongPathNameA   (KERNEL32.@)
  */
 DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath,
                                   DWORD longlen )
@@ -1574,7 +1574,7 @@
 }
 
 /*************************************************************************
- *           FindFirstFileExA  (KERNEL32)
+ *           FindFirstFileExA  (KERNEL32.@)
  */
 HANDLE WINAPI FindFirstFileExA(
 	LPCSTR lpFileName,
@@ -1644,7 +1644,7 @@
 }
 
 /*************************************************************************
- *           FindFirstFileExW   (KERNEL32)
+ *           FindFirstFileExW   (KERNEL32.@)
  */
 HANDLE WINAPI FindFirstFileExW(
 	LPCWSTR lpFileName,
diff --git a/files/file.c b/files/file.c
index 16d1737..4d78cf6 100644
--- a/files/file.c
+++ b/files/file.c
@@ -1906,7 +1906,7 @@
 
 
 /**************************************************************************
- *           MoveFileExA   (KERNEL32.???)
+ *           MoveFileExA   (KERNEL32.@)
  */
 BOOL WINAPI MoveFileExA( LPCSTR fn1, LPCSTR fn2, DWORD flag )
 {
@@ -1989,7 +1989,7 @@
 }
 
 /**************************************************************************
- *           MoveFileExW   (KERNEL32.???)
+ *           MoveFileExW   (KERNEL32.@)
  */
 BOOL WINAPI MoveFileExW( LPCWSTR fn1, LPCWSTR fn2, DWORD flag )
 {
diff --git a/files/profile.c b/files/profile.c
index 6eb92b0..6d98967 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -1428,7 +1428,7 @@
 }
 
 /***********************************************************************
- *           GetProfileSectionW   (KERNEL32)
+ *           GetProfileSectionW   (KERNEL32.@)
  */
 INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len )
 {
@@ -1496,7 +1496,7 @@
 }
 
 /***********************************************************************
- *           WritePrivateProfileSectionA   (KERNEL32)
+ *           WritePrivateProfileSectionA   (KERNEL32.@)
  */
 BOOL WINAPI WritePrivateProfileSectionA( LPCSTR section, 
 					 LPCSTR string, LPCSTR filename )
@@ -1533,7 +1533,7 @@
 }
 
 /***********************************************************************
- *           WritePrivateProfileSectionW   (KERNEL32)
+ *           WritePrivateProfileSectionW   (KERNEL32.@)
  */
 BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section,
 					 LPCWSTR string, LPCWSTR filename)
diff --git a/loader/module.c b/loader/module.c
index 8edf183..b4136f8 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -1185,7 +1185,7 @@
 }
 
 /***********************************************************************
- *		GetModuleHandleW
+ *		GetModuleHandleW (KERNEL32.@)
  */
 HMODULE WINAPI GetModuleHandleW(LPCWSTR module)
 {
@@ -1240,7 +1240,7 @@
 
 
 /***********************************************************************
- *           LoadLibraryExA   (KERNEL32)
+ *           LoadLibraryExA   (KERNEL32.@)
  */
 HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
 {
@@ -1451,14 +1451,14 @@
 }
 
 /***********************************************************************
- *           LoadLibraryA         (KERNEL32)
+ *           LoadLibraryA         (KERNEL32.@)
  */
 HMODULE WINAPI LoadLibraryA(LPCSTR libname) {
 	return LoadLibraryExA(libname,0,0);
 }
 
 /***********************************************************************
- *           LoadLibraryW         (KERNEL32)
+ *           LoadLibraryW         (KERNEL32.@)
  */
 HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW)
 {
@@ -1480,7 +1480,7 @@
 }
 
 /***********************************************************************
- *           LoadLibraryExW       (KERNEL32)
+ *           LoadLibraryExW       (KERNEL32.@)
  */
 HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW,HANDLE hfile,DWORD flags)
 {
@@ -1530,7 +1530,7 @@
 }
 
 /***********************************************************************
- *           FreeLibrary
+ *           FreeLibrary (KERNEL32.@)
  */
 BOOL WINAPI FreeLibrary(HINSTANCE hLibModule)
 {
@@ -1624,7 +1624,7 @@
 
 
 /***********************************************************************
- *           FreeLibraryAndExitThread
+ *           FreeLibraryAndExitThread (KERNEL32.@)
  */
 VOID WINAPI FreeLibraryAndExitThread(HINSTANCE hLibModule, DWORD dwExitCode)
 {
@@ -1633,7 +1633,7 @@
 }
 
 /***********************************************************************
- *           PrivateLoadLibrary       (KERNEL32)
+ *           PrivateLoadLibrary       (KERNEL32.@)
  *
  * FIXME: rough guesswork, don't know what "Private" means
  */
@@ -1645,7 +1645,7 @@
 
 
 /***********************************************************************
- *           PrivateFreeLibrary       (KERNEL32)
+ *           PrivateFreeLibrary       (KERNEL32.@)
  *
  * FIXME: rough guesswork, don't know what "Private" means
  */
diff --git a/memory/codepage.c b/memory/codepage.c
index 9c6d54d..ce38f34 100644
--- a/memory/codepage.c
+++ b/memory/codepage.c
@@ -88,7 +88,7 @@
 }
 
 /******************************************************************************
- *              GetACP   (KERNEL32)
+ *              GetACP   (KERNEL32.@)
  *
  * RETURNS
  *    Current ANSI code-page identifier, default if no current defined
@@ -101,7 +101,7 @@
 
 
 /***********************************************************************
- *              GetOEMCP   (KERNEL32)
+ *              GetOEMCP   (KERNEL32.@)
  */
 UINT WINAPI GetOEMCP(void)
 {
@@ -111,7 +111,7 @@
 
 
 /***********************************************************************
- *           IsValidCodePage   (KERNEL32)
+ *           IsValidCodePage   (KERNEL32.@)
  */
 BOOL WINAPI IsValidCodePage( UINT codepage )
 {
@@ -120,7 +120,7 @@
 
 
 /***********************************************************************
- *           IsDBCSLeadByteEx   (KERNEL32)
+ *           IsDBCSLeadByteEx   (KERNEL32.@)
  */
 BOOL WINAPI IsDBCSLeadByteEx( UINT codepage, BYTE testchar )
 {
@@ -130,7 +130,7 @@
 
 
 /***********************************************************************
- *           IsDBCSLeadByte   (KERNEL32)
+ *           IsDBCSLeadByte   (KERNEL32.@)
  */
 BOOL WINAPI IsDBCSLeadByte( BYTE testchar )
 {
@@ -140,7 +140,7 @@
 
 
 /***********************************************************************
- *           GetCPInfo   (KERNEL32)
+ *           GetCPInfo   (KERNEL32.@)
  */
 BOOL WINAPI GetCPInfo( UINT codepage, LPCPINFO cpinfo )
 {
@@ -171,7 +171,7 @@
 
 
 /***********************************************************************
- *              EnumSystemCodePagesA   (KERNEL32)
+ *              EnumSystemCodePagesA   (KERNEL32.@)
  */
 BOOL WINAPI EnumSystemCodePagesA( CODEPAGE_ENUMPROCA lpfnCodePageEnum, DWORD flags )
 {
@@ -190,7 +190,7 @@
 
 
 /***********************************************************************
- *              EnumSystemCodePagesW   (KERNEL32)
+ *              EnumSystemCodePagesW   (KERNEL32.@)
  */
 BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD flags )
 {
@@ -216,7 +216,7 @@
 
 
 /***********************************************************************
- *              MultiByteToWideChar   (KERNEL32)
+ *              MultiByteToWideChar   (KERNEL32.@)
  *
  * PARAMS
  *   page [in]    Codepage character set to convert from
@@ -290,7 +290,7 @@
 
 
 /***********************************************************************
- *              WideCharToMultiByte   (KERNEL32)
+ *              WideCharToMultiByte   (KERNEL32.@)
  *
  * PARAMS
  *   page [in]    Codepage character set to convert to
@@ -361,7 +361,7 @@
 
 
 /******************************************************************************
- *              GetStringTypeW   (KERNEL32)
+ *              GetStringTypeW   (KERNEL32.@)
  *
  */
 BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype )
@@ -386,7 +386,7 @@
 
 
 /******************************************************************************
- *              GetStringTypeExW   (KERNEL32)
+ *              GetStringTypeExW   (KERNEL32.@)
  */
 BOOL WINAPI GetStringTypeExW( LCID locale, DWORD type, LPCWSTR src, INT count, LPWORD chartype )
 {
diff --git a/memory/global.c b/memory/global.c
index 45fbaa5..42fdfe9 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -732,7 +732,7 @@
 
 
 /***********************************************************************
- *           GlobalPageLock   (KERNEL.230)
+ *           GlobalPageLock   (KERNEL.191)
  */
 WORD WINAPI GlobalPageLock16( HGLOBAL16 handle )
 {
@@ -746,7 +746,7 @@
 
 
 /***********************************************************************
- *           GlobalPageUnlock   (KERNEL.231)
+ *           GlobalPageUnlock   (KERNEL.192)
  */
 WORD WINAPI GlobalPageUnlock16( HGLOBAL16 handle )
 {
diff --git a/memory/selector.c b/memory/selector.c
index 164ee53..13074bf 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -233,7 +233,7 @@
 
 
 /***********************************************************************
- *           AllocCStoDSAlias   (KERNEL.172)
+ *           AllocCStoDSAlias   (KERNEL.170)
  */
 WORD WINAPI AllocCStoDSAlias16( WORD sel )
 {
@@ -549,7 +549,7 @@
 }
 
 /***********************************************************************
- *           GetThreadSelectorEntry   (KERNEL32)
+ *           GetThreadSelectorEntry   (KERNEL32.@)
  */
 BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent)
 {
diff --git a/misc/options.c b/misc/options.c
index b86f882..66b535a 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -349,7 +349,7 @@
 
 
 /***********************************************************************
- *              __wine_get_main_args
+ *              __wine_get_main_args (NTDLL.@)
  *
  * Return the argc/argv that the application should see.
  * Used by the startup code generated in the .spec.c file.
@@ -362,7 +362,7 @@
 
 
 /***********************************************************************
- *              __wine_get_wmain_args
+ *              __wine_get_wmain_args (NTDLL.@)
  *
  * Same as __wine_get_main_args but for Unicode.
  */
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index 20906f9..7e74cea 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -711,7 +711,7 @@
 
 
 /**********************************************************************
- *	    INT_Int31Handler
+ *	    INT_Int31Handler (WPROCS.149)
  *
  * Handler for int 31h (DPMI).
  */
diff --git a/msdos/int10.c b/msdos/int10.c
index f693e27..e0e1783 100644
--- a/msdos/int10.c
+++ b/msdos/int10.c
@@ -34,7 +34,7 @@
 }
 
 /**********************************************************************
- *	    INT_Int10Handler
+ *	    INT_Int10Handler (WPROCS.116)
  *
  * Handler for int 10h (video).
  * 
diff --git a/msdos/int11.c b/msdos/int11.c
index 611aea7..708a1ba 100644
--- a/msdos/int11.c
+++ b/msdos/int11.c
@@ -14,7 +14,7 @@
 #include "options.h"
 
 /**********************************************************************
- *	    INT_Int11Handler
+ *	    INT_Int11Handler (WPROCS.117)
  *
  * Handler for int 11h (get equipment list).
  */
diff --git a/msdos/int12.c b/msdos/int12.c
index 2fd7e1c..1ba5e89 100644
--- a/msdos/int12.c
+++ b/msdos/int12.c
@@ -5,7 +5,7 @@
 #include "miscemu.h"
 
 /**********************************************************************
- *	    INT_Int12Handler
+ *	    INT_Int12Handler (WPROCS.118)
  *
  * Handler for int 12h (get memory size).
  */
diff --git a/msdos/int13.c b/msdos/int13.c
index 3a39463..dd5fe89 100644
--- a/msdos/int13.c
+++ b/msdos/int13.c
@@ -18,7 +18,7 @@
 DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
- *	    INT_Int13Handler
+ *	    INT_Int13Handler (WPROCS.119)
  *
  * Handler for int 13h (disk I/O).
  */
diff --git a/msdos/int15.c b/msdos/int15.c
index c8c183a..9e7468c 100644
--- a/msdos/int15.c
+++ b/msdos/int15.c
@@ -10,7 +10,7 @@
 
 
 /**********************************************************************
- *	    INT_Int15Handler
+ *	    INT_Int15Handler (WPROCS.121)
  *
  * Handler for int 15h
  */
diff --git a/msdos/int1a.c b/msdos/int1a.c
index 6adf068..278874a 100644
--- a/msdos/int1a.c
+++ b/msdos/int1a.c
@@ -39,7 +39,7 @@
 
 
 /**********************************************************************
- *	    INT_Int1aHandler
+ *	    INT_Int1aHandler (WPROCS.126)
  *
  * Handler for int 1ah 
  *     0x00 - 0x07 - date and time
diff --git a/msdos/int20.c b/msdos/int20.c
index 116230c..9964033 100644
--- a/msdos/int20.c
+++ b/msdos/int20.c
@@ -10,7 +10,7 @@
 #include "callback.h"
 
 /**********************************************************************
- *	    INT_Int20Handler
+ *	    INT_Int20Handler (WPROCS.132)
  *
  * Handler for int 20h.
  */
diff --git a/msdos/int25.c b/msdos/int25.c
index 24022ca..a60cc2b 100644
--- a/msdos/int25.c
+++ b/msdos/int25.c
@@ -15,7 +15,7 @@
 
 
 /**********************************************************************
- *	    INT_Int25Handler
+ *	    INT_Int25Handler (WPROCS.137)
  *
  * Handler for int 25h (absolute disk read).
  */
diff --git a/msdos/int26.c b/msdos/int26.c
index df861df..df5be26 100644
--- a/msdos/int26.c
+++ b/msdos/int26.c
@@ -13,7 +13,7 @@
 DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
- *	    INT_Int26Handler
+ *	    INT_Int26Handler (WPROCS.138)
  *
  * Handler for int 26h (absolute disk read).
  */
diff --git a/msdos/int2a.c b/msdos/int2a.c
index e49a0dc..fe8e5ce 100644
--- a/msdos/int2a.c
+++ b/msdos/int2a.c
@@ -10,7 +10,7 @@
 DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
- *	    INT_Int2aHandler
+ *	    INT_Int2aHandler (WPROCS.142)
  *
  * Handler for int 2ah (network).
  */
diff --git a/msdos/int2f.c b/msdos/int2f.c
index a82a501..721fa95 100644
--- a/msdos/int2f.c
+++ b/msdos/int2f.c
@@ -27,7 +27,7 @@
 static void MSCDEX_Handler( CONTEXT86 *context );
 
 /**********************************************************************
- *	    INT_Int2fHandler
+ *	    INT_Int2fHandler (WPROCS.147)
  *
  * Handler for int 2fh (multiplex).
  */
diff --git a/msdos/int3d.c b/msdos/int3d.c
index 90d9ba3..90420d9 100644
--- a/msdos/int3d.c
+++ b/msdos/int3d.c
@@ -11,7 +11,7 @@
 DEFAULT_DEBUG_CHANNEL(int);
 
 /**********************************************************************
- *          INT_Int3dHandler
+ *          INT_Int3dHandler (WPROCS.161)
  *
  * Handler for int 3d (FLOATING POINT EMULATION - STANDALONE FWAIT).
  */
diff --git a/msdos/int41.c b/msdos/int41.c
index 905218a..cba7337 100644
--- a/msdos/int41.c
+++ b/msdos/int41.c
@@ -11,7 +11,7 @@
 DEFAULT_DEBUG_CHANNEL(int);
 
 /***********************************************************************
- *           INT_Int41Handler
+ *           INT_Int41Handler (WPROCS.165)
  *
  */
 void WINAPI INT_Int41Handler( CONTEXT86 *context )
diff --git a/msdos/int4b.c b/msdos/int4b.c
index 64215e9..0943224 100644
--- a/msdos/int4b.c
+++ b/msdos/int4b.c
@@ -9,7 +9,7 @@
 DEFAULT_DEBUG_CHANNEL(int);
 
 /***********************************************************************
- *           INT_Int4bHandler
+ *           INT_Int4bHandler (WPROCS.175)
  *
  */
 void WINAPI INT_Int4bHandler( CONTEXT86 *context )
diff --git a/msdos/interrupts.c b/msdos/interrupts.c
index cea83b4..d630758 100644
--- a/msdos/interrupts.c
+++ b/msdos/interrupts.c
@@ -184,7 +184,7 @@
 
 
 /**********************************************************************
- *         INT_DefaultHandler
+ *         INT_DefaultHandler (WPROCS.356)
  *
  * Default interrupt handler.
  */
diff --git a/msdos/vxd.c b/msdos/vxd.c
index a4a35c6..f8640ae 100644
--- a/msdos/vxd.c
+++ b/msdos/vxd.c
@@ -42,7 +42,7 @@
 }
 
 /***********************************************************************
- *           VXD_VMM
+ *           VXD_VMM (WPROCS.401)
  */
 void WINAPI VXD_VMM ( CONTEXT86 *context )
 {
@@ -69,7 +69,7 @@
 }
 
 /***********************************************************************
- *           VXD_PageFile
+ *           VXD_PageFile (WPROCS.433)
  */
 void WINAPI VXD_PageFile( CONTEXT86 *context )
 {
@@ -115,7 +115,7 @@
 }
 
 /***********************************************************************
- *           VXD_Reboot
+ *           VXD_Reboot (WPROCS.409)
  */
 void WINAPI VXD_Reboot ( CONTEXT86 *context )
 {
@@ -136,7 +136,7 @@
 }
 
 /***********************************************************************
- *           VXD_VDD
+ *           VXD_VDD (WPROCS.410)
  */
 void WINAPI VXD_VDD ( CONTEXT86 *context )
 {
@@ -157,7 +157,7 @@
 }
 
 /***********************************************************************
- *           VXD_VMD
+ *           VXD_VMD (WPROCS.412)
  */
 void WINAPI VXD_VMD ( CONTEXT86 *context )
 {
@@ -178,7 +178,7 @@
 }
 
 /***********************************************************************
- *           VXD_VXDLoader
+ *           VXD_VXDLoader (WPROCS.439)
  */
 void WINAPI VXD_VXDLoader( CONTEXT86 *context )
 {
@@ -220,7 +220,7 @@
 }
 
 /***********************************************************************
- *           VXD_Shell
+ *           VXD_Shell (WPROCS.423)
  */
 void WINAPI VXD_Shell( CONTEXT86 *context )
 {
@@ -313,7 +313,7 @@
 
 
 /***********************************************************************
- *           VXD_Comm
+ *           VXD_Comm (WPROCS.414)
  */
 void WINAPI VXD_Comm( CONTEXT86 *context )
 {
@@ -338,7 +338,7 @@
 }
 
 /***********************************************************************
- *           VXD_Timer
+ *           VXD_Timer (WPROCS.405)
  */
 void WINAPI VXD_Timer( CONTEXT86 *context )
 {
@@ -371,7 +371,7 @@
 }
 
 /***********************************************************************
- *           VXD_TimerAPI
+ *           VXD_TimerAPI (WPROCS.1490)
  */
 static DWORD System_Time = 0;
 static WORD  System_Time_Selector = 0;
@@ -406,7 +406,7 @@
 }
 
 /***********************************************************************
- *           VXD_ConfigMG
+ *           VXD_ConfigMG (WPROCS.451)
  */
 void WINAPI VXD_ConfigMG ( CONTEXT86 *context )
 {
@@ -427,7 +427,7 @@
 }
 
 /***********************************************************************
- *           VXD_Enable
+ *           VXD_Enable (WPROCS.455)
  */
 void WINAPI VXD_Enable ( CONTEXT86 *context )
 {
@@ -448,7 +448,7 @@
 }
 
 /***********************************************************************
- *           VXD_APM
+ *           VXD_APM (WPROCS.438)
  */
 void WINAPI VXD_APM ( CONTEXT86 *context )
 {
@@ -469,7 +469,7 @@
 }
 
 /***********************************************************************
- *           VXD_Win32s
+ *           VXD_Win32s (WPROCS.445)
  *
  * This is an implementation of the services of the Win32s VxD.
  * Since official documentation of these does not seem to be available,
diff --git a/objects/font.c b/objects/font.c
index da129d0..7f81e13 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -1268,7 +1268,7 @@
 
 
 /***********************************************************************
- *		GetOutlineTextMetrics (GDI.207)
+ *		GetOutlineTextMetrics (GDI.308)
  *		GetOutlineTextMetricsA (GDI32.@)
  * Gets metrics for TrueType fonts.
  *
diff --git a/objects/region.c b/objects/region.c
index d5b4685..33a328c 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -3239,7 +3239,7 @@
 
 
 /***********************************************************************
- *           SetMetaRgn    (GDI.455)
+ *           SetMetaRgn    (GDI.506)
  *           SetMetaRgn    (GDI32.@)
  */
 INT WINAPI SetMetaRgn( HDC hdc )
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index e38ac06..4a51329 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -30,7 +30,7 @@
 }
 
 /***********************************************************************
- *           InitializeCriticalSectionAndSpinCount   (KERNEL32)
+ *           InitializeCriticalSectionAndSpinCount   (KERNEL32.@)
  */
 BOOL WINAPI InitializeCriticalSectionAndSpinCount( CRITICAL_SECTION *crit, DWORD spincount )
 {
@@ -40,7 +40,7 @@
 }
 
 /***********************************************************************
- *           SetCriticalSectionSpinCount   (KERNEL32)
+ *           SetCriticalSectionSpinCount   (KERNEL32.@)
  * This function is available on NT4SP3 or later, but not Win98
  * It is SMP related
  */
diff --git a/scheduler/thread.c b/scheduler/thread.c
index 2e24959..8bfa25a 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -796,7 +796,7 @@
 }
 
 /**********************************************************************
- *		GetLastError (KERNEL.10)
+ *		GetLastError (KERNEL.148)
  *              GetLastError (KERNEL32.@)
  *              GetLastError (WIN32S16.10)
  *