Documentation ordinal fixes (using winapi_fixup).

diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c
index 1c3a66c..a027ef4 100644
--- a/dlls/gdi/wing.c
+++ b/dlls/gdi/wing.c
@@ -107,7 +107,7 @@
 }
 
 /***********************************************************************
- *  WinGSetDIBColorTable   (WING.1004)
+ *  WinGSetDIBColorTable   (WING.1006)
  */
 UINT16 WINAPI WinGSetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
                                      RGBQUAD *colors)
diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index 935a27b..e390e1c 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -1523,7 +1523,7 @@
 
 
 /**************************************************************************
- *         BuildCommDCBA		(KERNEL32.113)
+ *         BuildCommDCBA		(KERNEL32.@)
  *
  *  Updates a device control block data structure with values from an
  *  ascii device control string.  The device control string has two forms
@@ -1541,7 +1541,7 @@
 }
 
 /**************************************************************************
- *         BuildCommDCBAndTimeoutsA	(KERNEL32.114)
+ *         BuildCommDCBAndTimeoutsA	(KERNEL32.@)
  *
  *  Updates a device control block data structure with values from an
  *  ascii device control string.  Taking time out values from a time outs
@@ -1675,7 +1675,7 @@
 }
 
 /**************************************************************************
- *         BuildCommDCBAndTimeoutsW		(KERNEL32.115)
+ *         BuildCommDCBAndTimeoutsW		(KERNEL32.@)
  *
  *  Updates a device control block data structure with values from an
  *  unicode device control string.  Taking time out values from a time outs
@@ -1704,7 +1704,7 @@
 }
 
 /**************************************************************************
- *         BuildCommDCBW		(KERNEL32.116)
+ *         BuildCommDCBW		(KERNEL32.@)
  *
  *  Updates a device control block structure with values from an
  *  unicode device control string.  The device control string has two forms
@@ -1725,7 +1725,7 @@
 int commerror=0;
 
 /*****************************************************************************
- *	SetCommBreak		(KERNEL32.616)
+ *	SetCommBreak		(KERNEL32.@)
  *
  *  Halts the transmission of characters to a communications device.
  *
@@ -1766,7 +1766,7 @@
 }
 
 /*****************************************************************************
- *	ClearCommBreak		(KERNEL32.135)
+ *	ClearCommBreak		(KERNEL32.@)
  *
  *  Resumes character transmission from a communication device.
  *
@@ -1806,7 +1806,7 @@
 }
 
 /*****************************************************************************
- *	EscapeCommFunction	(KERNEL32.213)
+ *	EscapeCommFunction	(KERNEL32.@)
  *
  *  Directs a communication device to perform an extended function.
  *
@@ -1924,7 +1924,7 @@
 }
 
 /********************************************************************
- *      PurgeComm        (KERNEL32.558)
+ *      PurgeComm        (KERNEL32.@)
  *
  *  Terminates pending operations and/or discards buffers on a
  *  communication resource.
@@ -1966,7 +1966,7 @@
 }
 
 /*****************************************************************************
- *	ClearCommError	(KERNEL32.136)
+ *	ClearCommError	(KERNEL32.@)
  *
  *  Enables further I/O operations on a communications resource after
  *  supplying error and current status information.
@@ -2025,7 +2025,7 @@
 }
 
 /*****************************************************************************
- *      SetupComm       (KERNEL32.677)
+ *      SetupComm       (KERNEL32.@)
  *
  *  Called after CreateFile to hint to the communication resource to use
  *  specified sizes for input and output buffers rather than the default values.
@@ -2056,7 +2056,7 @@
 } 
 
 /*****************************************************************************
- *	GetCommMask	(KERNEL32.284)
+ *	GetCommMask	(KERNEL32.@)
  *
  *  Obtain the events associated with a communication device that will cause a call
  *  WaitCommEvent to return.
@@ -2086,7 +2086,7 @@
 }
 
 /*****************************************************************************
- *	SetCommMask	(KERNEL32.618)
+ *	SetCommMask	(KERNEL32.@)
  *
  *  There be some things we need to hear about yon there communications device.
  *  (Set which events associated with a communication device should cause
@@ -2116,7 +2116,7 @@
 }
 
 /*****************************************************************************
- *	SetCommState    (KERNEL32.619)
+ *	SetCommState    (KERNEL32.@)
  *
  *  Re-initializes all hardware and control settings of a communications device,
  *  with values from a device control block without effecting the input and output
@@ -2425,7 +2425,7 @@
 
 
 /*****************************************************************************
- *	GetCommState	(KERNEL32.287)
+ *	GetCommState	(KERNEL32.@)
  *
  *  Fills in a device control block with information from a communications device.
  *
@@ -2629,7 +2629,7 @@
 }
 
 /*****************************************************************************
- *	TransmitCommChar	(KERNEL32.697)
+ *	TransmitCommChar	(KERNEL32.@)
  *
  *  Transmits a single character in front of any pending characters in the
  *  output buffer.  Usually used to send an interrupt character to a host.
@@ -2652,7 +2652,7 @@
 }
 
 /*****************************************************************************
- *	GetCommTimeouts		(KERNEL32.288)
+ *	GetCommTimeouts		(KERNEL32.@)
  *
  *  Obtains the request time out values for the communications device.
  *
@@ -2692,7 +2692,7 @@
 }
 
 /*****************************************************************************
- *	SetCommTimeouts		(KERNEL32.620)
+ *	SetCommTimeouts		(KERNEL32.@)
  *
  * Sets the timeouts used when reading and writing data to/from COMM ports.
  *
@@ -2777,7 +2777,7 @@
 }
 
 /***********************************************************************
- *           GetCommModemStatus   (KERNEL32.285)
+ *           GetCommModemStatus   (KERNEL32.@)
  *
  *  Obtains the four control register bits if supported by the hardware.
  *
@@ -2931,7 +2931,7 @@
 }
 
 /***********************************************************************
- *           WaitCommEvent   (KERNEL32.719)
+ *           WaitCommEvent   (KERNEL32.@)
  *
  * Wait until something interesting happens on a COMM port.
  * Interesting things (events) are set by calling SetCommMask before
@@ -2979,7 +2979,7 @@
 }
   
 /***********************************************************************
- *           GetCommProperties   (KERNEL32.286)
+ *           GetCommProperties   (KERNEL32.@)
  *
  * This function fills in a structure with the capabilities of the 
  * communications port driver.
@@ -3044,7 +3044,7 @@
 
 
 /***********************************************************************
- *           CommConfigDialogA   (KERNEL32.140)
+ *           CommConfigDialogA   (KERNEL32.@)
  *
  * Raises a dialog that allows the user to configure a comm port.
  * Fills the COMMCONFIG struct with information specified by the user.
@@ -3088,7 +3088,7 @@
 }
 
 /***********************************************************************
- *           CommConfigDialogW   (KERNEL32.141)
+ *           CommConfigDialogW   (KERNEL32.@)
  *
  * see CommConfigDialogA for more info
  */
@@ -3152,7 +3152,7 @@
 }
 
 /***********************************************************************
- *           SetCommConfig     (KERNEL32.617)
+ *           SetCommConfig     (KERNEL32.@)
  *
  *  Sets the configuration of the commications device.
  *
@@ -3169,7 +3169,7 @@
 }
 
 /***********************************************************************
- *           SetDefaultCommConfigA   (KERNEL32.638)
+ *           SetDefaultCommConfigA   (KERNEL32.@)
  *
  *  Initializes the default configuration for the specified communication
  *  device. (ascii)
@@ -3207,7 +3207,7 @@
 
 
 /***********************************************************************
- *           SetDefaultCommConfigW     (KERNEL32.639)
+ *           SetDefaultCommConfigW     (KERNEL32.@)
  *
  *  Initializes the default configuration for the specified
  *  communication device. (unicode)
@@ -3235,7 +3235,7 @@
 
 
 /***********************************************************************
- *           GetDefaultCommConfigA   (KERNEL32.313)
+ *           GetDefaultCommConfigA   (KERNEL32.@)
  *
  *   Acquires the default configuration of the specified communication device. (unicode)
  *
@@ -3283,7 +3283,7 @@
 }
 
 /**************************************************************************
- *         GetDefaultCommConfigW		(KERNEL32.314)
+ *         GetDefaultCommConfigW		(KERNEL32.@)
  *
  *   Acquires the default configuration of the specified communication device. (unicode)
  *
diff --git a/dlls/kernel/debugger.c b/dlls/kernel/debugger.c
index 74705ba..86f55c8 100644
--- a/dlls/kernel/debugger.c
+++ b/dlls/kernel/debugger.c
@@ -17,7 +17,7 @@
 
 
 /******************************************************************************
- *           WaitForDebugEvent   (KERNEL32.720)
+ *           WaitForDebugEvent   (KERNEL32.@)
  *
  *  Waits for a debugging event to occur in a process being debugged before
  *  filling out the debug event structure.
@@ -119,7 +119,7 @@
 
 
 /**********************************************************************
- *           ContinueDebugEvent   (KERNEL32.146)
+ *           ContinueDebugEvent   (KERNEL32.@)
  *           ContinueDebugEvent   (WIN32S16.5)
  *
  *  Enables a thread that previously produced a debug event to continue.
@@ -148,7 +148,7 @@
 
 
 /**********************************************************************
- *           DebugActiveProcess   (KERNEL32.180)
+ *           DebugActiveProcess   (KERNEL32.@)
  *
  *  Attempts to attach the dugger to a process.
  *
@@ -171,7 +171,7 @@
 
 
 /***********************************************************************
- *           OutputDebugStringA   (KERNEL32.548)
+ *           OutputDebugStringA   (KERNEL32.@)
  *
  *  Output by an application of a unicode string to a debugger (if attached)
  *  and program log.
@@ -192,7 +192,7 @@
 
 
 /***********************************************************************
- *           OutputDebugStringW   (KERNEL32.549)
+ *           OutputDebugStringW   (KERNEL32.@)
  *
  *  Output by an appliccation of a unicode string to a debugger (if attached)
  *  and program log.
@@ -226,7 +226,7 @@
 
 
 /***********************************************************************
- *           DebugBreak   (KERNEL32.181)
+ *           DebugBreak   (KERNEL32.@)
  *
  *  Raises an exception so that a debugger (if attached)
  *  can take some action.
@@ -264,7 +264,7 @@
 
 
 /***********************************************************************
- *           IsDebuggerPresent   (KERNEL32.827)
+ *           IsDebuggerPresent   (KERNEL32.@)
  *
  *  Allows a process to determine if there is a debugger attached.
  *
diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c
index 1e88145..34a9289 100644
--- a/dlls/kernel/format_msg.c
+++ b/dlls/kernel/format_msg.c
@@ -130,7 +130,7 @@
 
 
 /***********************************************************************
- *           FormatMessageA   (KERNEL32.265)
+ *           FormatMessageA   (KERNEL32.@)
  * FIXME: missing wrap,
  */
 DWORD WINAPI FormatMessageA(
@@ -356,7 +356,7 @@
 
 
 /***********************************************************************
- *           FormatMessageW   (KERNEL32.266)
+ *           FormatMessageW   (KERNEL32.@)
  */
 DWORD WINAPI FormatMessageW(
 	DWORD	dwFlags,
diff --git a/dlls/kernel/string.c b/dlls/kernel/string.c
index 4cdd139..96537a9 100644
--- a/dlls/kernel/string.c
+++ b/dlls/kernel/string.c
@@ -34,7 +34,7 @@
 
 
 /***********************************************************************
- *		k32CharToOemBuffA   (KERNEL32.@)
+ *		k32CharToOemBuffA   (KERNEL32.11)
  */
 BOOL WINAPI k32CharToOemBuffA(LPCSTR s, LPSTR d, DWORD len)
 {
@@ -51,7 +51,7 @@
 
 
 /***********************************************************************
- *		k32CharToOemA   (KERNEL32.@)
+ *		k32CharToOemA   (KERNEL32.10)
  */
 BOOL WINAPI k32CharToOemA(LPCSTR s, LPSTR d)
 {
@@ -61,7 +61,7 @@
 
 
 /***********************************************************************
- *		k32OemToCharBuffA   (KERNEL32.@)
+ *		k32OemToCharBuffA   (KERNEL32.13)
  */
 BOOL WINAPI k32OemToCharBuffA(LPCSTR s, LPSTR d, DWORD len)
 {
@@ -78,7 +78,7 @@
 
 
 /***********************************************************************
- *		k32OemToCharA   (KERNEL32.@)
+ *		k32OemToCharA   (KERNEL32.12)
  */
 BOOL WINAPI k32OemToCharA(LPCSTR s, LPSTR d)
 {
@@ -87,7 +87,7 @@
 
 
 /**********************************************************************
- *		k32LoadStringA   (KERNEL32.@)
+ *		k32LoadStringA   (KERNEL32.14)
  */
 INT WINAPI k32LoadStringA(HINSTANCE instance, UINT resource_id,
                           LPSTR buffer, INT buflen)
@@ -98,7 +98,7 @@
 
 
 /***********************************************************************
- *		k32wvsprintfA   (KERNEL32.@)
+ *		k32wvsprintfA   (KERNEL32.16)
  */
 INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, va_list args)
 {
@@ -108,7 +108,7 @@
 
 
 /***********************************************************************
- *		k32wsprintfA   (KERNEL32.@)
+ *		k32wsprintfA   (KERNEL32.15)
  */
 INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...)
 {
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 1c924d3..8bf578e 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -19,7 +19,7 @@
 
 
 /***********************************************************************
- *           CreateEventA    (KERNEL32.156)
+ *           CreateEventA    (KERNEL32.@)
  */
 HANDLE WINAPI CreateEventA( SECURITY_ATTRIBUTES *sa, BOOL manual_reset,
                             BOOL initial_state, LPCSTR name )
@@ -47,7 +47,7 @@
 
 
 /***********************************************************************
- *           CreateEventW    (KERNEL32.157)
+ *           CreateEventW    (KERNEL32.@)
  */
 HANDLE WINAPI CreateEventW( SECURITY_ATTRIBUTES *sa, BOOL manual_reset,
                             BOOL initial_state, LPCWSTR name )
@@ -93,7 +93,7 @@
 
 
 /***********************************************************************
- *           OpenEventA    (KERNEL32.536)
+ *           OpenEventA    (KERNEL32.@)
  */
 HANDLE WINAPI OpenEventA( DWORD access, BOOL inherit, LPCSTR name )
 {
@@ -118,7 +118,7 @@
 
 
 /***********************************************************************
- *           OpenEventW    (KERNEL32.537)
+ *           OpenEventW    (KERNEL32.@)
  */
 HANDLE WINAPI OpenEventW( DWORD access, BOOL inherit, LPCWSTR name )
 {
@@ -162,7 +162,7 @@
 
 
 /***********************************************************************
- *           PulseEvent    (KERNEL32.557)
+ *           PulseEvent    (KERNEL32.@)
  */
 BOOL WINAPI PulseEvent( HANDLE handle )
 {
@@ -172,7 +172,7 @@
 
 /***********************************************************************
  *           SetEvent    (KERNEL.458)
- *           SetEvent    (KERNEL32.644)
+ *           SetEvent    (KERNEL32.@)
  */
 BOOL WINAPI SetEvent( HANDLE handle )
 {
@@ -182,7 +182,7 @@
 
 /***********************************************************************
  *           ResetEvent    (KERNEL.459)
- *           ResetEvent    (KERNEL32.586)
+ *           ResetEvent    (KERNEL32.@)
  */
 BOOL WINAPI ResetEvent( HANDLE handle )
 {
@@ -237,7 +237,7 @@
 
 
 /***********************************************************************
- *           CreateMutexA   (KERNEL32.166)
+ *           CreateMutexA   (KERNEL32.@)
  */
 HANDLE WINAPI CreateMutexA( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCSTR name )
 {
@@ -263,7 +263,7 @@
 
 
 /***********************************************************************
- *           CreateMutexW   (KERNEL32.167)
+ *           CreateMutexW   (KERNEL32.@)
  */
 HANDLE WINAPI CreateMutexW( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCWSTR name )
 {
@@ -294,7 +294,7 @@
 
 
 /***********************************************************************
- *           OpenMutexA   (KERNEL32.541)
+ *           OpenMutexA   (KERNEL32.@)
  */
 HANDLE WINAPI OpenMutexA( DWORD access, BOOL inherit, LPCSTR name )
 {
@@ -319,7 +319,7 @@
 
 
 /***********************************************************************
- *           OpenMutexW   (KERNEL32.542)
+ *           OpenMutexW   (KERNEL32.@)
  */
 HANDLE WINAPI OpenMutexW( DWORD access, BOOL inherit, LPCWSTR name )
 {
@@ -344,7 +344,7 @@
 
 
 /***********************************************************************
- *           ReleaseMutex   (KERNEL32.582)
+ *           ReleaseMutex   (KERNEL32.@)
  */
 BOOL WINAPI ReleaseMutex( HANDLE handle )
 {
@@ -365,7 +365,7 @@
 
 
 /***********************************************************************
- *           CreateSemaphoreA   (KERNEL32.174)
+ *           CreateSemaphoreA   (KERNEL32.@)
  */
 HANDLE WINAPI CreateSemaphoreA( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, LPCSTR name )
 {
@@ -401,7 +401,7 @@
 
 
 /***********************************************************************
- *           CreateSemaphoreW   (KERNEL32.175)
+ *           CreateSemaphoreW   (KERNEL32.@)
  */
 HANDLE WINAPI CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial,
                                     LONG max, LPCWSTR name )
@@ -438,7 +438,7 @@
 
 
 /***********************************************************************
- *           OpenSemaphoreA   (KERNEL32.545)
+ *           OpenSemaphoreA   (KERNEL32.@)
  */
 HANDLE WINAPI OpenSemaphoreA( DWORD access, BOOL inherit, LPCSTR name )
 {
@@ -463,7 +463,7 @@
 
 
 /***********************************************************************
- *           OpenSemaphoreW   (KERNEL32.546)
+ *           OpenSemaphoreW   (KERNEL32.@)
  */
 HANDLE WINAPI OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name )
 {
@@ -488,7 +488,7 @@
 
 
 /***********************************************************************
- *           ReleaseSemaphore   (KERNEL32.583)
+ *           ReleaseSemaphore   (KERNEL32.@)
  */
 BOOL WINAPI ReleaseSemaphore( HANDLE handle, LONG count, LONG *previous )
 {
@@ -504,7 +504,7 @@
 
 
 /***********************************************************************
- *           CreateNamedPipeA   (KERNEL32.168)
+ *           CreateNamedPipeA   (KERNEL32.@)
  */
 HANDLE WINAPI CreateNamedPipeA( LPCSTR name, DWORD dwOpenMode,
                                 DWORD dwPipeMode, DWORD nMaxInstances,
@@ -520,7 +520,7 @@
 
 
 /***********************************************************************
- *           CreateNamedPipeW   (KERNEL32.169)
+ *           CreateNamedPipeW   (KERNEL32.@)
  */
 HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode,
                                 DWORD dwPipeMode, DWORD nMaxInstances,
@@ -537,7 +537,7 @@
 
 
 /***********************************************************************
- *           PeekNamedPipe   (KERNEL32.552)
+ *           PeekNamedPipe   (KERNEL32.@)
  */
 BOOL WINAPI PeekNamedPipe( HANDLE hPipe, LPVOID lpvBuffer, DWORD cbBuffer,
                            LPDWORD lpcbRead, LPDWORD lpcbAvail, LPDWORD lpcbMessage )
@@ -550,7 +550,7 @@
 
 
 /***********************************************************************
- *           WaitNamedPipeA   (KERNEL32.725)
+ *           WaitNamedPipeA   (KERNEL32.@)
  */
 BOOL WINAPI WaitNamedPipeA (LPCSTR lpNamedPipeName, DWORD nTimeOut)
 {
@@ -561,7 +561,7 @@
 
 
 /***********************************************************************
- *           WaitNamedPipeW   (KERNEL32.726)
+ *           WaitNamedPipeW   (KERNEL32.@)
  */
 BOOL WINAPI WaitNamedPipeW (LPCWSTR lpNamedPipeName, DWORD nTimeOut)
 {
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index be00534..02b363f 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -190,7 +190,7 @@
 }
 
 /***********************************************************************
- *		ThunkConnect32		(KERNEL32.688)
+ *		ThunkConnect32		(KERNEL32.@)
  * Connects a 32bit and a 16bit thunkbuffer.
  */
 UINT WINAPI ThunkConnect32( 
@@ -279,7 +279,7 @@
 }
 
 /**********************************************************************
- * 		QT_Thunk			(KERNEL32.559)
+ * 		QT_Thunk			(KERNEL32.@)
  *
  * The target address is in EDX.
  * The 16 bit arguments start at ESP.
@@ -314,7 +314,7 @@
 
 
 /**********************************************************************
- * 		FT_Prolog			(KERNEL32.233)
+ * 		FT_Prolog			(KERNEL32.@)
  * 
  * The set of FT_... thunk routines is used instead of QT_Thunk,
  * if structures have to be converted from 32-bit to 16-bit
@@ -379,7 +379,7 @@
 }
 
 /**********************************************************************
- * 		FT_Thunk			(KERNEL32.234)
+ * 		FT_Thunk			(KERNEL32.@)
  *
  * This routine performs the actual call to 16-bit code, 
  * similar to QT_Thunk. The differences are:
@@ -475,77 +475,77 @@
 }
 
 /***********************************************************************
- *		FT_Exit0 (KERNEL32.218)
+ *		FT_Exit0 (KERNEL32.@)
  */
 void WINAPI FT_Exit0 (CONTEXT86 *context) { FT_Exit(context,  0); }
 
 /***********************************************************************
- *		FT_Exit4 (KERNEL32.226)
+ *		FT_Exit4 (KERNEL32.@)
  */
 void WINAPI FT_Exit4 (CONTEXT86 *context) { FT_Exit(context,  4); }
 
 /***********************************************************************
- *		FT_Exit8 (KERNEL32.232)
+ *		FT_Exit8 (KERNEL32.@)
  */
 void WINAPI FT_Exit8 (CONTEXT86 *context) { FT_Exit(context,  8); }
 
 /***********************************************************************
- *		FT_Exit12 (KERNEL32.219)
+ *		FT_Exit12 (KERNEL32.@)
  */
 void WINAPI FT_Exit12(CONTEXT86 *context) { FT_Exit(context, 12); }
 
 /***********************************************************************
- *		FT_Exit16 (KERNEL32.220)
+ *		FT_Exit16 (KERNEL32.@)
  */
 void WINAPI FT_Exit16(CONTEXT86 *context) { FT_Exit(context, 16); }
 
 /***********************************************************************
- *		FT_Exit20 (KERNEL32.221)
+ *		FT_Exit20 (KERNEL32.@)
  */
 void WINAPI FT_Exit20(CONTEXT86 *context) { FT_Exit(context, 20); }
 
 /***********************************************************************
- *		FT_Exit24 (KERNEL32.222)
+ *		FT_Exit24 (KERNEL32.@)
  */
 void WINAPI FT_Exit24(CONTEXT86 *context) { FT_Exit(context, 24); }
 
 /***********************************************************************
- *		FT_Exit28 (KERNEL32.223)
+ *		FT_Exit28 (KERNEL32.@)
  */
 void WINAPI FT_Exit28(CONTEXT86 *context) { FT_Exit(context, 28); }
 
 /***********************************************************************
- *		FT_Exit32 (KERNEL32.224)
+ *		FT_Exit32 (KERNEL32.@)
  */
 void WINAPI FT_Exit32(CONTEXT86 *context) { FT_Exit(context, 32); }
 
 /***********************************************************************
- *		FT_Exit36 (KERNEL32.225)
+ *		FT_Exit36 (KERNEL32.@)
  */
 void WINAPI FT_Exit36(CONTEXT86 *context) { FT_Exit(context, 36); }
 
 /***********************************************************************
- *		FT_Exit40 (KERNEL32.227)
+ *		FT_Exit40 (KERNEL32.@)
  */
 void WINAPI FT_Exit40(CONTEXT86 *context) { FT_Exit(context, 40); }
 
 /***********************************************************************
- *		FT_Exit44 (KERNEL32.228)
+ *		FT_Exit44 (KERNEL32.@)
  */
 void WINAPI FT_Exit44(CONTEXT86 *context) { FT_Exit(context, 44); }
 
 /***********************************************************************
- *		FT_Exit48 (KERNEL32.229)
+ *		FT_Exit48 (KERNEL32.@)
  */
 void WINAPI FT_Exit48(CONTEXT86 *context) { FT_Exit(context, 48); }
 
 /***********************************************************************
- *		FT_Exit52 (KERNEL32.230)
+ *		FT_Exit52 (KERNEL32.@)
  */
 void WINAPI FT_Exit52(CONTEXT86 *context) { FT_Exit(context, 52); }
 
 /***********************************************************************
- *		FT_Exit56 (KERNEL32.231)
+ *		FT_Exit56 (KERNEL32.@)
  */
 void WINAPI FT_Exit56(CONTEXT86 *context) { FT_Exit(context, 56); }
 
@@ -964,7 +964,7 @@
 }
 
 /**********************************************************************
- *			AllocSLCallback		(KERNEL32.105)
+ *			AllocSLCallback		(KERNEL32.@)
  *
  * Win95 uses some structchains for callbacks. It allocates them
  * in blocks of 100 entries, size 32 bytes each, layout:
@@ -1016,7 +1016,7 @@
 }
 
 /**********************************************************************
- * 		FreeSLCallback		(KERNEL32.274)
+ * 		FreeSLCallback		(KERNEL32.@)
  * Frees the specified 16->32 callback
  */
 void WINAPI
@@ -1067,7 +1067,7 @@
 
 
 /***********************************************************************
- *           K32Thk1632Prolog			(KERNEL32.491)
+ *           K32Thk1632Prolog			(KERNEL32.@)
  */
 void WINAPI K32Thk1632Prolog( CONTEXT86 *context )
 {
@@ -1128,7 +1128,7 @@
 }
 
 /***********************************************************************
- *           K32Thk1632Epilog			(KERNEL32.490)
+ *           K32Thk1632Epilog			(KERNEL32.@)
  */
 void WINAPI K32Thk1632Epilog( CONTEXT86 *context )
 {
@@ -1653,7 +1653,7 @@
 
 /***********************************************************************
  *     AllocLSThunkletCallback             (KERNEL.561)
- *     AllocLSThunkletCallback             (KERNEL.606)
+ *     AllocLSThunkletCallback_dup         (KERNEL.606)
  */
 FARPROC WINAPI AllocLSThunkletCallback16( SEGPTR target, DWORD relay )
 {
@@ -1662,7 +1662,7 @@
 
 /***********************************************************************
  *     AllocSLThunkletCallback             (KERNEL.562)
- *     AllocSLThunkletCallback             (KERNEL.605)
+ *     AllocSLThunkletCallback_dup         (KERNEL.605)
  */
 SEGPTR WINAPI AllocSLThunkletCallback16( FARPROC target, DWORD relay )
 {
@@ -1671,7 +1671,7 @@
 
 /***********************************************************************
  *     FindLSThunkletCallback              (KERNEL.563)
- *     FindLSThunkletCallback              (KERNEL.609)
+ *     FindLSThunkletCallback_dup          (KERNEL.609)
  */
 FARPROC WINAPI FindLSThunkletCallback( SEGPTR target, DWORD relay )
 {
@@ -1688,7 +1688,7 @@
 
 /***********************************************************************
  *     FindSLThunkletCallback              (KERNEL.564)
- *     FindSLThunkletCallback              (KERNEL.610)
+ *     FindSLThunkletCallback_dup          (KERNEL.610)
  */
 SEGPTR WINAPI FindSLThunkletCallback( FARPROC target, DWORD relay )
 {
@@ -1849,7 +1849,7 @@
 
 
 /***********************************************************************
- *           Get16DLLAddress       (KERNEL32.1599)
+ *           Get16DLLAddress       (KERNEL32.@)
  *
  * This function is used by a Win32s DLL if it wants to call a Win16 function.
  * A 16:16 segmented pointer to the function is returned.
diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c
index 2122a64..50baa19 100644
--- a/dlls/kernel/time.c
+++ b/dlls/kernel/time.c
@@ -267,7 +267,7 @@
 
 
 /***********************************************************************
- *              SetLocalTime            (KERNEL32.655)
+ *              SetLocalTime            (KERNEL32.@)
  *
  *  Sets the local time using current time zone and daylight
  *  savings settings.
@@ -320,7 +320,7 @@
 
 
 /***********************************************************************
- *           GetSystemTimeAdjustment     (KERNEL32.407)
+ *           GetSystemTimeAdjustment     (KERNEL32.@)
  *
  *  Indicates the period between clock interrupt and the amount the clock
  *  is adjusted each interrupt so as to keep it insync with an external source.
@@ -347,7 +347,7 @@
 
 
 /***********************************************************************
- *              SetSystemTime            (KERNEL32.665)
+ *              SetSystemTime            (KERNEL32.@)
  *
  *  Sets the system time (utc).
  *
@@ -408,7 +408,7 @@
 
 
 /***********************************************************************
- *              GetTimeZoneInformation  (KERNEL32.424)
+ *              GetTimeZoneInformation  (KERNEL32.@)
  *
  *  Fills in the a time zone information structure with values based on
  *  the current local time.
@@ -440,7 +440,7 @@
 
 
 /***********************************************************************
- *              SetTimeZoneInformation  (KERNEL32.673)
+ *              SetTimeZoneInformation  (KERNEL32.@)
  *
  *  Set the local time zone with values based on the time zone structure.
  *
@@ -468,7 +468,7 @@
 
 
 /***********************************************************************
- *              SystemTimeToTzSpecificLocalTime  (KERNEL32.683)
+ *              SystemTimeToTzSpecificLocalTime  (KERNEL32.@)
  *
  *  Converts the system time (utc) to the local time in the specified time zone.
  *
@@ -492,7 +492,7 @@
 
 
 /***********************************************************************
- *              GetSystemTimeAsFileTime  (KERNEL32.408)
+ *              GetSystemTimeAsFileTime  (KERNEL32.@)
  *
  *  Fills in a file time structure with the current time in UTC format.
  */
@@ -520,7 +520,7 @@
 }
 
 /*********************************************************************
- *	GetProcessTimes				(KERNEL32.378)
+ *	GetProcessTimes				(KERNEL32.@)
  *
  *  Returns the user and kernel execution times of a process,
  *  along with the creation and exit times if known.
diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c
index 2702553..7e5dd39 100644
--- a/dlls/kernel/toolhelp.c
+++ b/dlls/kernel/toolhelp.c
@@ -187,7 +187,7 @@
 
 
 /***********************************************************************
- *           CreateToolhelp32Snapshot			(KERNEL32.179)
+ *           CreateToolhelp32Snapshot			(KERNEL32.@)
  */
 HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) 
 {
@@ -250,7 +250,7 @@
 }
 
 /***********************************************************************
- *		Thread32First    (KERNEL32.686)
+ *		Thread32First    (KERNEL32.@)
  *
  * Return info about the first thread in a toolhelp32 snapshot
  */
@@ -260,7 +260,7 @@
 }
 
 /***********************************************************************
- *		Thread32Next   (KERNEL32.687)
+ *		Thread32Next   (KERNEL32.@)
  *
  * Return info about the "next" thread in a toolhelp32 snapshot
  */
@@ -307,7 +307,7 @@
 
 
 /***********************************************************************
- *		Process32First    (KERNEL32.555)
+ *		Process32First    (KERNEL32.@)
  *
  * Return info about the first process in a toolhelp32 snapshot
  */
@@ -317,7 +317,7 @@
 }
 
 /***********************************************************************
- *		Process32Next   (KERNEL32.556)
+ *		Process32Next   (KERNEL32.@)
  *
  * Return info about the "next" process in a toolhelp32 snapshot
  */
@@ -364,7 +364,7 @@
 }
 
 /***********************************************************************
- *		Module32First   (KERNEL32.527)
+ *		Module32First   (KERNEL32.@)
  *
  * Return info about the "first" module in a toolhelp32 snapshot
  */
@@ -374,7 +374,7 @@
 }
 
 /***********************************************************************
- *		Module32Next   (KERNEL32.528)
+ *		Module32Next   (KERNEL32.@)
  *
  * Return info about the "next" module in a toolhelp32 snapshot
  */
diff --git a/dlls/kernel/utthunk.c b/dlls/kernel/utthunk.c
index 9497b60..236b10d 100644
--- a/dlls/kernel/utthunk.c
+++ b/dlls/kernel/utthunk.c
@@ -213,7 +213,7 @@
 
 
 /****************************************************************************
- *		UTRegister (KERNEL32.698)
+ *		UTRegister (KERNEL32.@)
  */
 BOOL WINAPI UTRegister( HMODULE hModule, LPSTR lpsz16BITDLL, 
                         LPSTR lpszInitName, LPSTR lpszProcName,
@@ -270,7 +270,7 @@
 }
 
 /****************************************************************************
- *		UTUnRegister (KERNEL32.699)
+ *		UTUnRegister (KERNEL32.@)
  */
 VOID WINAPI UTUnRegister( HMODULE hModule )
 {
diff --git a/dlls/user/ddeml.c b/dlls/user/ddeml.c
index 4469210..181f234 100644
--- a/dlls/user/ddeml.c
+++ b/dlls/user/ddeml.c
@@ -1185,7 +1185,8 @@
 
 
 /*****************************************************************
- *            DdeReconnect   (DDEML.37) (USER32.@)
+ *            DdeReconnect   (DDEML.37)
+ *            DdeReconnect   (USER32.@)
  */
 HCONV WINAPI DdeReconnect( HCONV hConv )
 {
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index bd384af..c929f45 100644
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
@@ -465,7 +465,8 @@
 
 
 /***********************************************************************
- *           IsCharLowerA   (USER.436) (USER32.@)
+ *           IsCharLowerA   (USER.436)
+ *           IsCharLowerA   (USER32.@)
  * FIXME: handle current locale
  */
 BOOL WINAPI IsCharLowerA(CHAR x)
@@ -484,7 +485,8 @@
 
 
 /***********************************************************************
- *           IsCharUpperA   (USER.435) (USER32.@)
+ *           IsCharUpperA   (USER.435)
+ *           IsCharUpperA   (USER32.@)
  * FIXME: handle current locale
  */
 BOOL WINAPI IsCharUpperA(CHAR x)
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index ef84242..9c8202e 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -559,7 +559,7 @@
 
 
 /*****************************************************************************
- *          DeviceCapabilitiesW        [WINSPOOL.152]
+ *          DeviceCapabilitiesW        [WINSPOOL.@]
  *
  * Call DeviceCapabilitiesA since we later call 16bit stuff anyway
  *
@@ -610,7 +610,7 @@
 }
 
 /******************************************************************
- *              DocumentPropertiesA   [WINSPOOL.155]
+ *              DocumentPropertiesA   [WINSPOOL.@]
  *
  */
 LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter,
@@ -687,7 +687,7 @@
 }
 
 /******************************************************************
- *              OpenPrinterA        [WINSPOOL.196]
+ *              OpenPrinterA        [WINSPOOL.@]
  *
  */
 BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter,
@@ -715,7 +715,7 @@
 }
 
 /******************************************************************
- *              OpenPrinterW        [WINSPOOL.197]
+ *              OpenPrinterW        [WINSPOOL.@]
  *
  */
 BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter,
@@ -763,7 +763,7 @@
 }
 
 /******************************************************************
- *              AddMonitorA        [WINSPOOL.107]
+ *              AddMonitorA        [WINSPOOL.@]
  *
  */
 BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors)
@@ -774,7 +774,7 @@
 }
 
 /******************************************************************
- *              DeletePrinterDriverA        [WINSPOOL.146]
+ *              DeletePrinterDriverA        [WINSPOOL.@]
  *
  */
 BOOL WINAPI
@@ -788,7 +788,7 @@
 
 
 /******************************************************************
- *              DeleteMonitorA        [WINSPOOL.135]
+ *              DeleteMonitorA        [WINSPOOL.@]
  *
  */
 BOOL WINAPI
@@ -802,7 +802,7 @@
 
 
 /******************************************************************
- *              DeletePortA        [WINSPOOL.137]
+ *              DeletePortA        [WINSPOOL.@]
  *
  */
 BOOL WINAPI
@@ -815,7 +815,7 @@
 }
 
 /******************************************************************************
- *    SetPrinterW  [WINSPOOL.214]
+ *    SetPrinterW  [WINSPOOL.@]
  */
 BOOL WINAPI
 SetPrinterW(
@@ -830,7 +830,7 @@
 }
 
 /******************************************************************************
- *    WritePrinter  [WINSPOOL.223]
+ *    WritePrinter  [WINSPOOL.@]
  */
 BOOL WINAPI
 WritePrinter( 
@@ -845,7 +845,7 @@
 }
 
 /*****************************************************************************
- *          AddFormA  [WINSPOOL.103]
+ *          AddFormA  [WINSPOOL.@]
  */
 BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
 {
@@ -854,7 +854,7 @@
 }
 
 /*****************************************************************************
- *          AddFormW  [WINSPOOL.104]
+ *          AddFormW  [WINSPOOL.@]
  */
 BOOL WINAPI AddFormW(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
 {
@@ -863,7 +863,7 @@
 }
 
 /*****************************************************************************
- *          AddJobA  [WINSPOOL.105]
+ *          AddJobA  [WINSPOOL.@]
  */
 BOOL WINAPI AddJobA(HANDLE hPrinter, DWORD Level, LPBYTE pData,
                         DWORD cbBuf, LPDWORD pcbNeeded)
@@ -874,7 +874,7 @@
 }
 
 /*****************************************************************************
- *          AddJobW  [WINSPOOL.106]
+ *          AddJobW  [WINSPOOL.@]
  */
 BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf,
                         LPDWORD pcbNeeded)
@@ -942,7 +942,7 @@
 }
 
 /*****************************************************************************
- *          AddPrinterW  [WINSPOOL.122]
+ *          AddPrinterW  [WINSPOOL.@]
  */
 HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
 {
@@ -1097,7 +1097,7 @@
 }
 
 /*****************************************************************************
- *          AddPrinterA  [WINSPOOL.117]
+ *          AddPrinterA  [WINSPOOL.@]
  */
 HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter)
 {
@@ -1124,7 +1124,7 @@
 
 
 /*****************************************************************************
- *          ClosePrinter  [WINSPOOL.126]
+ *          ClosePrinter  [WINSPOOL.@]
  */
 BOOL WINAPI ClosePrinter(HANDLE hPrinter)
 {
@@ -1139,7 +1139,7 @@
 }
 
 /*****************************************************************************
- *          DeleteFormA  [WINSPOOL.133]
+ *          DeleteFormA  [WINSPOOL.@]
  */
 BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName)
 {
@@ -1148,7 +1148,7 @@
 }
 
 /*****************************************************************************
- *          DeleteFormW  [WINSPOOL.134]
+ *          DeleteFormW  [WINSPOOL.@]
  */
 BOOL WINAPI DeleteFormW(HANDLE hPrinter, LPWSTR pFormName)
 {
@@ -1157,7 +1157,7 @@
 }
 
 /*****************************************************************************
- *          DeletePrinter  [WINSPOOL.143]
+ *          DeletePrinter  [WINSPOOL.@]
  */
 BOOL WINAPI DeletePrinter(HANDLE hPrinter)
 {
@@ -1183,7 +1183,7 @@
 }
 
 /*****************************************************************************
- *          SetPrinterA  [WINSPOOL.211]
+ *          SetPrinterA  [WINSPOOL.@]
  */
 BOOL WINAPI SetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
                            DWORD Command)
@@ -1193,7 +1193,7 @@
 }
 
 /*****************************************************************************
- *          SetJobA  [WINSPOOL.209]
+ *          SetJobA  [WINSPOOL.@]
  */
 BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
                        LPBYTE pJob, DWORD Command)
@@ -1204,7 +1204,7 @@
 }
 
 /*****************************************************************************
- *          SetJobW  [WINSPOOL.210]
+ *          SetJobW  [WINSPOOL.@]
  */
 BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level,
                        LPBYTE pJob, DWORD Command)
@@ -1215,7 +1215,7 @@
 }
 
 /*****************************************************************************
- *          GetFormA  [WINSPOOL.181]
+ *          GetFormA  [WINSPOOL.@]
  */
 BOOL WINAPI GetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
                  LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded)
@@ -1226,7 +1226,7 @@
 }
 
 /*****************************************************************************
- *          GetFormW  [WINSPOOL.182]
+ *          GetFormW  [WINSPOOL.@]
  */
 BOOL WINAPI GetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level,
                  LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded)
@@ -1237,7 +1237,7 @@
 }
 
 /*****************************************************************************
- *          SetFormA  [WINSPOOL.207]
+ *          SetFormA  [WINSPOOL.@]
  */
 BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
                         LPBYTE pForm)
@@ -1247,7 +1247,7 @@
 }
 
 /*****************************************************************************
- *          SetFormW  [WINSPOOL.208]
+ *          SetFormW  [WINSPOOL.@]
  */
 BOOL WINAPI SetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level,
                         LPBYTE pForm)
@@ -1257,7 +1257,7 @@
 }
 
 /*****************************************************************************
- *          ReadPrinter  [WINSPOOL.202]
+ *          ReadPrinter  [WINSPOOL.@]
  */
 BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf,
                            LPDWORD pNoBytesRead)
@@ -1267,7 +1267,7 @@
 }
 
 /*****************************************************************************
- *          ResetPrinterA  [WINSPOOL.203]
+ *          ResetPrinterA  [WINSPOOL.@]
  */
 BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault)
 {
@@ -1276,7 +1276,7 @@
 }
 
 /*****************************************************************************
- *          ResetPrinterW  [WINSPOOL.204]
+ *          ResetPrinterW  [WINSPOOL.@]
  */
 BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault)
 {
@@ -1711,7 +1711,7 @@
 }
 
 /*****************************************************************************
- *          GetPrinterW  [WINSPOOL.194]
+ *          GetPrinterW  [WINSPOOL.@]
  */
 BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
 			DWORD cbBuf, LPDWORD pcbNeeded)
@@ -1721,7 +1721,7 @@
 }
 
 /*****************************************************************************
- *          GetPrinterA  [WINSPOOL.187]
+ *          GetPrinterA  [WINSPOOL.@]
  */
 BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
                     DWORD cbBuf, LPDWORD pcbNeeded)
@@ -1871,7 +1871,7 @@
 
 
 /******************************************************************
- *              EnumPrintersW        [WINSPOOL.175]
+ *              EnumPrintersW        [WINSPOOL.@]
  *
  *    Enumerates the available printers, print servers and print
  *    providers, depending on the specified flags, name and level.
@@ -1935,7 +1935,7 @@
 }
 
 /******************************************************************
- *              EnumPrintersA        [WINSPOOL.174]
+ *              EnumPrintersA        [WINSPOOL.@]
  *
  */
 BOOL WINAPI EnumPrintersA(DWORD dwType, LPSTR lpszName,
@@ -2210,7 +2210,7 @@
 }
 
 /*****************************************************************************
- *          GetPrinterDriverA  [WINSPOOL.190]
+ *          GetPrinterDriverA  [WINSPOOL.@]
  */
 BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment,
 			      DWORD Level, LPBYTE pDriverInfo,
@@ -2224,7 +2224,7 @@
     return ret;
 }
 /*****************************************************************************
- *          GetPrinterDriverW  [WINSPOOL.193]
+ *          GetPrinterDriverW  [WINSPOOL.@]
  */
 BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment,
                                   DWORD Level, LPBYTE pDriverInfo, 
@@ -2235,7 +2235,7 @@
 }
 
 /*****************************************************************************
- *       GetPrinterDriverDirectoryA  [WINSPOOL.191]
+ *       GetPrinterDriverDirectoryA  [WINSPOOL.@]
  */
 BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
 				       DWORD Level, LPBYTE pDriverDirectory,
@@ -2272,7 +2272,7 @@
 
 
 /*****************************************************************************
- *       GetPrinterDriverDirectoryW  [WINSPOOL.192]
+ *       GetPrinterDriverDirectoryW  [WINSPOOL.@]
  */
 BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment,
 				       DWORD Level, LPBYTE pDriverDirectory,
@@ -2296,7 +2296,7 @@
 }
 
 /*****************************************************************************
- *          AddPrinterDriverA  [WINSPOOL.120]
+ *          AddPrinterDriverA  [WINSPOOL.@]
  */
 BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo)
 {
@@ -2375,7 +2375,7 @@
     return TRUE;
 }
 /*****************************************************************************
- *          AddPrinterDriverW  [WINSPOOL.121]
+ *          AddPrinterDriverW  [WINSPOOL.@]
  */
 BOOL WINAPI AddPrinterDriverW(LPWSTR printerName,DWORD level, 
 				   LPBYTE pDriverInfo)
@@ -2387,7 +2387,7 @@
 
 
 /*****************************************************************************
- *          PrinterProperties  [WINSPOOL.201]
+ *          PrinterProperties  [WINSPOOL.@]
  *
  *     Displays a dialog to set the properties of the printer.
  *
@@ -2406,7 +2406,7 @@
 }
 
 /*****************************************************************************
- *          EnumJobsA [WINSPOOL.162]
+ *          EnumJobsA [WINSPOOL.@]
  *
  */
 BOOL WINAPI EnumJobsA(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs,
@@ -2421,7 +2421,7 @@
 
 
 /*****************************************************************************
- *          EnumJobsW [WINSPOOL.163]
+ *          EnumJobsW [WINSPOOL.@]
  *
  */
 BOOL WINAPI EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs,
@@ -2543,7 +2543,7 @@
 }
 
 /*****************************************************************************
- *          EnumPrinterDriversW  [WINSPOOL.173]
+ *          EnumPrinterDriversW  [WINSPOOL.@]
  *
  *    see function EnumPrinterDrivers for RETURNS, BUGS
  */
@@ -2556,7 +2556,7 @@
 }
 
 /*****************************************************************************
- *          EnumPrinterDriversA  [WINSPOOL.172]
+ *          EnumPrinterDriversA  [WINSPOOL.@]
  *
  *    see function EnumPrinterDrivers for RETURNS, BUGS
  */
@@ -2583,7 +2583,7 @@
 
 
 /******************************************************************************
- *		EnumPortsA   (WINSPOOL.166)
+ *		EnumPortsA   (WINSPOOL.@)
  */
 BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,
                        LPDWORD bufneeded,LPDWORD bufreturned)
@@ -2753,7 +2753,7 @@
 }
 
 /*******************************************************************************
- *		EnumPrinterDataExW	[WINSPOOL.197]
+ *		EnumPrinterDataExW	[WINSPOOL.@]
  */
 DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
 				LPBYTE pEnumValues, DWORD cbEnumValues,
@@ -2986,7 +2986,7 @@
 }
 
 /*******************************************************************************
- *		EnumPrinterDataExA	[WINSPOOL.196]
+ *		EnumPrinterDataExA	[WINSPOOL.@]
  *
  * This functions returns value names and REG_SZ, REG_EXPAND_SZ, and
  * REG_MULTI_SZ values as ASCII strings in Unicode-sized buffers.  This is
diff --git a/files/change.c b/files/change.c
index ea3a08f..8d19da8 100644
--- a/files/change.c
+++ b/files/change.c
@@ -23,7 +23,7 @@
 DEFAULT_DEBUG_CHANNEL(file);
 
 /****************************************************************************
- *		FindFirstChangeNotificationA (KERNEL32.248)
+ *		FindFirstChangeNotificationA (KERNEL32.@)
  */
 HANDLE WINAPI FindFirstChangeNotificationA( LPCSTR lpPathName, BOOL bWatchSubtree,
                                             DWORD dwNotifyFilter ) 
@@ -43,7 +43,7 @@
 }
 
 /****************************************************************************
- *		FindFirstChangeNotificationW (KERNEL32.249)
+ *		FindFirstChangeNotificationW (KERNEL32.@)
  */
 HANDLE WINAPI FindFirstChangeNotificationW( LPCWSTR lpPathName,
                                                 BOOL bWatchSubtree,
@@ -57,7 +57,7 @@
 }
 
 /****************************************************************************
- *		FindNextChangeNotification (KERNEL32.252)
+ *		FindNextChangeNotification (KERNEL32.@)
  */
 BOOL WINAPI FindNextChangeNotification( HANDLE handle ) 
 {
@@ -66,7 +66,7 @@
 }
 
 /****************************************************************************
- *		FindCloseChangeNotification (KERNEL32.247)
+ *		FindCloseChangeNotification (KERNEL32.@)
  */
 BOOL WINAPI FindCloseChangeNotification( HANDLE handle) 
 {
diff --git a/files/directory.c b/files/directory.c
index ef6786b..31e10cc 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -162,7 +162,7 @@
 
 
 /***********************************************************************
- *           GetTempPathA   (KERNEL32.292)
+ *           GetTempPathA   (KERNEL32.@)
  */
 UINT WINAPI GetTempPathA( UINT count, LPSTR path )
 {
@@ -181,7 +181,7 @@
 
 
 /***********************************************************************
- *           GetTempPathW   (KERNEL32.293)
+ *           GetTempPathW   (KERNEL32.@)
  */
 UINT WINAPI GetTempPathW( UINT count, LPWSTR path )
 {
@@ -260,7 +260,7 @@
 
 
 /***********************************************************************
- *           GetWindowsDirectoryA   (KERNEL32.311)
+ *           GetWindowsDirectoryA   (KERNEL32.@)
  */
 UINT WINAPI GetWindowsDirectoryA( LPSTR path, UINT count )
 {
@@ -270,7 +270,7 @@
 
 
 /***********************************************************************
- *           GetWindowsDirectoryW   (KERNEL32.312)
+ *           GetWindowsDirectoryW   (KERNEL32.@)
  */
 UINT WINAPI GetWindowsDirectoryW( LPWSTR path, UINT count )
 {
@@ -312,7 +312,7 @@
 
 
 /***********************************************************************
- *           GetSystemDirectoryA   (KERNEL32.282)
+ *           GetSystemDirectoryA   (KERNEL32.@)
  */
 UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count )
 {
@@ -322,7 +322,7 @@
 
 
 /***********************************************************************
- *           GetSystemDirectoryW   (KERNEL32.283)
+ *           GetSystemDirectoryW   (KERNEL32.@)
  */
 UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count )
 {
@@ -347,7 +347,7 @@
 
 
 /***********************************************************************
- *           CreateDirectoryA   (KERNEL32.39)
+ *           CreateDirectoryA   (KERNEL32.@)
  * RETURNS:
  *	TRUE : success
  *	FALSE : failure
@@ -385,7 +385,7 @@
 
 
 /***********************************************************************
- *           CreateDirectoryW   (KERNEL32.42)
+ *           CreateDirectoryW   (KERNEL32.@)
  */
 BOOL WINAPI CreateDirectoryW( LPCWSTR path,
                                   LPSECURITY_ATTRIBUTES lpsecattribs )
@@ -398,7 +398,7 @@
 
 
 /***********************************************************************
- *           CreateDirectoryExA   (KERNEL32.40)
+ *           CreateDirectoryExA   (KERNEL32.@)
  */
 BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path,
                                     LPSECURITY_ATTRIBUTES lpsecattribs)
@@ -408,7 +408,7 @@
 
 
 /***********************************************************************
- *           CreateDirectoryExW   (KERNEL32.41)
+ *           CreateDirectoryExW   (KERNEL32.@)
  */
 BOOL WINAPI CreateDirectoryExW( LPCWSTR template, LPCWSTR path,
                                     LPSECURITY_ATTRIBUTES lpsecattribs)
@@ -427,7 +427,7 @@
 
 
 /***********************************************************************
- *           RemoveDirectoryA   (KERNEL32.437)
+ *           RemoveDirectoryA   (KERNEL32.@)
  */
 BOOL WINAPI RemoveDirectoryA( LPCSTR path )
 {
@@ -452,7 +452,7 @@
 
 
 /***********************************************************************
- *           RemoveDirectoryW   (KERNEL32.438)
+ *           RemoveDirectoryW   (KERNEL32.@)
  */
 BOOL WINAPI RemoveDirectoryW( LPCWSTR path )
 {
@@ -651,7 +651,7 @@
 
 
 /***********************************************************************
- * SearchPathA [KERNEL32.447]
+ * SearchPathA [KERNEL32.@]
  *
  * Searches for a specified file in the search path.
  *
@@ -705,7 +705,7 @@
 
 
 /***********************************************************************
- *           SearchPathW   (KERNEL32.448)
+ *           SearchPathW   (KERNEL32.@)
  */
 DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext,
                             DWORD buflen, LPWSTR buffer, LPWSTR *lastpart )
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 0d8e794..7a885b8 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -978,7 +978,7 @@
 
 
 /***********************************************************************
- *           GetShortPathNameA   (KERNEL32.271)
+ *           GetShortPathNameA   (KERNEL32.@)
  *
  * NOTES
  *  observed:
@@ -1081,7 +1081,7 @@
 
 
 /***********************************************************************
- *           GetShortPathNameW   (KERNEL32.272)
+ *           GetShortPathNameW   (KERNEL32.@)
  */
 DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath,
                                   DWORD shortlen )
@@ -1159,7 +1159,7 @@
 
 
 /***********************************************************************
- *           GetLongPathNameW   (KERNEL32.269)
+ *           GetLongPathNameW   (KERNEL32.@)
  */
 DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath,
                                   DWORD longlen )
@@ -1335,7 +1335,7 @@
 
 
 /***********************************************************************
- *           GetFullPathNameA   (KERNEL32.272)
+ *           GetFullPathNameA   (KERNEL32.@)
  * NOTES
  *   if the path closed with '\', *lastpart is 0 
  */
@@ -1359,7 +1359,7 @@
 
 
 /***********************************************************************
- *           GetFullPathNameW   (KERNEL32.273)
+ *           GetFullPathNameW   (KERNEL32.@)
  */
 DWORD WINAPI GetFullPathNameW( LPCWSTR name, DWORD len, LPWSTR buffer,
                                  LPWSTR *lastpart )
@@ -1633,7 +1633,7 @@
 }
 
 /*************************************************************************
- *           FindFirstFileA   (KERNEL32.123)
+ *           FindFirstFileA   (KERNEL32.@)
  */
 HANDLE WINAPI FindFirstFileA(
 	LPCSTR lpFileName,
@@ -1702,7 +1702,7 @@
 }
 
 /*************************************************************************
- *           FindFirstFileW   (KERNEL32.124)
+ *           FindFirstFileW   (KERNEL32.@)
  */
 HANDLE WINAPI FindFirstFileW( LPCWSTR lpFileName, WIN32_FIND_DATAW *lpFindData )
 {
@@ -1711,7 +1711,7 @@
 }
 
 /*************************************************************************
- *           FindNextFileA   (KERNEL32.126)
+ *           FindNextFileA   (KERNEL32.@)
  */
 BOOL WINAPI FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *data )
 {
@@ -1742,7 +1742,7 @@
 
 
 /*************************************************************************
- *           FindNextFileW   (KERNEL32.127)
+ *           FindNextFileW   (KERNEL32.@)
  */
 BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data )
 {
@@ -1763,7 +1763,7 @@
 }
 
 /*************************************************************************
- *           FindClose   (KERNEL32.119)
+ *           FindClose   (KERNEL32.@)
  */
 BOOL WINAPI FindClose( HANDLE handle )
 {
@@ -2012,7 +2012,7 @@
 
 
 /***********************************************************************
- *           MulDiv   (KERNEL32.391)
+ *           MulDiv   (KERNEL32.@)
  * RETURNS
  *	Result of multiplication and division
  *	-1: Overflow occurred or Divisor was 0
@@ -2065,7 +2065,7 @@
 
 
 /***********************************************************************
- *           DosDateTimeToFileTime   (KERNEL32.76)
+ *           DosDateTimeToFileTime   (KERNEL32.@)
  */
 BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft)
 {
@@ -2083,7 +2083,7 @@
 
 
 /***********************************************************************
- *           FileTimeToDosDateTime   (KERNEL32.111)
+ *           FileTimeToDosDateTime   (KERNEL32.@)
  */
 BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate,
                                      LPWORD fattime )
@@ -2100,7 +2100,7 @@
 
 
 /***********************************************************************
- *           LocalFileTimeToFileTime   (KERNEL32.373)
+ *           LocalFileTimeToFileTime   (KERNEL32.@)
  */
 BOOL WINAPI LocalFileTimeToFileTime( const FILETIME *localft,
                                        LPFILETIME utcft )
@@ -2117,7 +2117,7 @@
 
 
 /***********************************************************************
- *           FileTimeToLocalFileTime   (KERNEL32.112)
+ *           FileTimeToLocalFileTime   (KERNEL32.@)
  */
 BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
                                        LPFILETIME localft )
@@ -2147,7 +2147,7 @@
 
 
 /***********************************************************************
- *           FileTimeToSystemTime   (KERNEL32.113)
+ *           FileTimeToSystemTime   (KERNEL32.@)
  */
 BOOL WINAPI FileTimeToSystemTime( const FILETIME *ft, LPSYSTEMTIME syst )
 {
@@ -2167,7 +2167,7 @@
 }
 
 /***********************************************************************
- *           QueryDosDeviceA   (KERNEL32.413)
+ *           QueryDosDeviceA   (KERNEL32.@)
  *
  * returns array of strings terminated by \0, terminated by \0
  */
@@ -2209,7 +2209,7 @@
 
 
 /***********************************************************************
- *           QueryDosDeviceW   (KERNEL32.414)
+ *           QueryDosDeviceW   (KERNEL32.@)
  *
  * returns array of strings terminated by \0, terminated by \0
  */
@@ -2227,7 +2227,7 @@
 
 
 /***********************************************************************
- *           SystemTimeToFileTime   (KERNEL32.526)
+ *           SystemTimeToFileTime   (KERNEL32.@)
  */
 BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
 {
@@ -2263,7 +2263,7 @@
 }
 
 /***********************************************************************
- *           DefineDosDeviceA       (KERNEL32.182)
+ *           DefineDosDeviceA       (KERNEL32.@)
  */
 BOOL WINAPI DefineDosDeviceA(DWORD flags,LPCSTR devname,LPCSTR targetpath) {
 	FIXME("(0x%08lx,%s,%s),stub!\n",flags,devname,targetpath);
diff --git a/files/drive.c b/files/drive.c
index 8e790e4..d4482b5 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -963,7 +963,7 @@
 
 
 /***********************************************************************
- *           GetDiskFreeSpaceA   (KERNEL32.206)
+ *           GetDiskFreeSpaceA   (KERNEL32.@)
  *
  * Fails if expression resulting from current drive's dir and "root"
  * is not a root dir of the target drive.
@@ -1049,7 +1049,7 @@
 
 
 /***********************************************************************
- *           GetDiskFreeSpaceW   (KERNEL32.207)
+ *           GetDiskFreeSpaceW   (KERNEL32.@)
  */
 BOOL WINAPI GetDiskFreeSpaceW( LPCWSTR root, LPDWORD cluster_sectors,
                                    LPDWORD sector_bytes, LPDWORD free_clusters,
@@ -1067,7 +1067,7 @@
 
 
 /***********************************************************************
- *           GetDiskFreeSpaceExA   (KERNEL32.871)
+ *           GetDiskFreeSpaceExA   (KERNEL32.@)
  *
  *  This function is used to acquire the size of the available and
  *  total space on a logical volume.
@@ -1143,7 +1143,7 @@
 }
 
 /***********************************************************************
- *           GetDiskFreeSpaceExW   (KERNEL32.873)
+ *           GetDiskFreeSpaceExW   (KERNEL32.@)
  */
 BOOL WINAPI GetDiskFreeSpaceExW( LPCWSTR root, PULARGE_INTEGER avail,
 				     PULARGE_INTEGER total,
@@ -1179,7 +1179,7 @@
 
 
 /***********************************************************************
- *           GetDriveTypeA   (KERNEL32.208)
+ *           GetDriveTypeA   (KERNEL32.@)
  *
  * Returns the type of the disk drive specified. If root is NULL the
  * root of the current directory is used.
@@ -1216,7 +1216,7 @@
 
 
 /***********************************************************************
- *           GetDriveTypeW   (KERNEL32.209)
+ *           GetDriveTypeW   (KERNEL32.@)
  */
 UINT WINAPI GetDriveTypeW( LPCWSTR root )
 {
@@ -1237,7 +1237,7 @@
 
 
 /***********************************************************************
- *           GetCurrentDirectoryA   (KERNEL32.196)
+ *           GetCurrentDirectoryA   (KERNEL32.@)
  */
 UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf )
 {
@@ -1257,7 +1257,7 @@
 }
 
 /***********************************************************************
- *           GetCurrentDirectoryW   (KERNEL32.197)
+ *           GetCurrentDirectoryW   (KERNEL32.@)
  */
 UINT WINAPI GetCurrentDirectoryW( UINT buflen, LPWSTR buf )
 {
@@ -1279,7 +1279,7 @@
 
 
 /***********************************************************************
- *           SetCurrentDirectoryA   (KERNEL32.479)
+ *           SetCurrentDirectoryA   (KERNEL32.@)
  */
 BOOL WINAPI SetCurrentDirectoryA( LPCSTR dir )
 {
@@ -1311,7 +1311,7 @@
 
 
 /***********************************************************************
- *           SetCurrentDirectoryW   (KERNEL32.480)
+ *           SetCurrentDirectoryW   (KERNEL32.@)
  */
 BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dirW )
 {
@@ -1323,7 +1323,7 @@
 
 
 /***********************************************************************
- *           GetLogicalDriveStringsA   (KERNEL32.231)
+ *           GetLogicalDriveStringsA   (KERNEL32.@)
  */
 UINT WINAPI GetLogicalDriveStringsA( UINT len, LPSTR buffer )
 {
@@ -1352,7 +1352,7 @@
 
 
 /***********************************************************************
- *           GetLogicalDriveStringsW   (KERNEL32.232)
+ *           GetLogicalDriveStringsW   (KERNEL32.@)
  */
 UINT WINAPI GetLogicalDriveStringsW( UINT len, LPWSTR buffer )
 {
@@ -1378,7 +1378,7 @@
 
 
 /***********************************************************************
- *           GetLogicalDrives   (KERNEL32.233)
+ *           GetLogicalDrives   (KERNEL32.@)
  */
 DWORD WINAPI GetLogicalDrives(void)
 {
@@ -1396,7 +1396,7 @@
 
 
 /***********************************************************************
- *           GetVolumeInformationA   (KERNEL32.309)
+ *           GetVolumeInformationA   (KERNEL32.@)
  */
 BOOL WINAPI GetVolumeInformationA( LPCSTR root, LPSTR label,
                                        DWORD label_len, DWORD *serial,
@@ -1457,7 +1457,7 @@
 
 
 /***********************************************************************
- *           GetVolumeInformationW   (KERNEL32.310)
+ *           GetVolumeInformationW   (KERNEL32.@)
  */
 BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label,
                                        DWORD label_len, DWORD *serial,
@@ -1482,7 +1482,7 @@
 }
 
 /***********************************************************************
- *           SetVolumeLabelA   (KERNEL32.675)
+ *           SetVolumeLabelA   (KERNEL32.@)
  */
 BOOL WINAPI SetVolumeLabelA( LPCSTR root, LPCSTR volname )
 {
@@ -1510,7 +1510,7 @@
 }
 
 /***********************************************************************
- *           SetVolumeLabelW   (KERNEL32.676)
+ *           SetVolumeLabelW   (KERNEL32.@)
  */
 BOOL WINAPI SetVolumeLabelW(LPCWSTR rootpath,LPCWSTR volname)
 {
diff --git a/files/file.c b/files/file.c
index 00beaf3..16d1737 100644
--- a/files/file.c
+++ b/files/file.c
@@ -341,7 +341,7 @@
 
 
 /*************************************************************************
- * CreateFileA [KERNEL32.45]  Creates or opens a file or other object
+ * CreateFileA [KERNEL32.@]  Creates or opens a file or other object
  *
  * Creates or opens an object, and returns a handle that can be used to
  * access that object.
@@ -473,7 +473,7 @@
 
 
 /*************************************************************************
- *              CreateFileW              (KERNEL32.48)
+ *              CreateFileW              (KERNEL32.@)
  */
 HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
                               LPSECURITY_ATTRIBUTES sa, DWORD creation,
@@ -549,7 +549,7 @@
 
 
 /***********************************************************************
- *             GetFileInformationByHandle   (KERNEL32.219)
+ *             GetFileInformationByHandle   (KERNEL32.@)
  */
 DWORD WINAPI GetFileInformationByHandle( HANDLE hFile,
                                          BY_HANDLE_FILE_INFORMATION *info )
@@ -603,7 +603,7 @@
 
 
 /**************************************************************************
- *           GetFileAttributesA   (KERNEL32.217)
+ *           GetFileAttributesA   (KERNEL32.@)
  */
 DWORD WINAPI GetFileAttributesA( LPCSTR name )
 {
@@ -623,7 +623,7 @@
 
 
 /**************************************************************************
- *           GetFileAttributesW   (KERNEL32.218)
+ *           GetFileAttributesW   (KERNEL32.@)
  */
 DWORD WINAPI GetFileAttributesW( LPCWSTR name )
 {
@@ -635,7 +635,7 @@
 
 
 /***********************************************************************
- *           GetFileSize   (KERNEL32.220)
+ *           GetFileSize   (KERNEL32.@)
  */
 DWORD WINAPI GetFileSize( HANDLE hFile, LPDWORD filesizehigh )
 {
@@ -647,7 +647,7 @@
 
 
 /***********************************************************************
- *           GetFileTime   (KERNEL32.221)
+ *           GetFileTime   (KERNEL32.@)
  */
 BOOL WINAPI GetFileTime( HANDLE hFile, FILETIME *lpCreationTime,
                            FILETIME *lpLastAccessTime,
@@ -662,7 +662,7 @@
 }
 
 /***********************************************************************
- *           CompareFileTime   (KERNEL32.28)
+ *           CompareFileTime   (KERNEL32.@)
  */
 INT WINAPI CompareFileTime( LPFILETIME x, LPFILETIME y )
 {
@@ -745,7 +745,7 @@
 
 
 /***********************************************************************
- *           GetTempFileNameA   (KERNEL32.290)
+ *           GetTempFileNameA   (KERNEL32.@)
  */
 UINT WINAPI GetTempFileNameA( LPCSTR path, LPCSTR prefix, UINT unique,
                                   LPSTR buffer)
@@ -754,7 +754,7 @@
 }
 
 /***********************************************************************
- *           GetTempFileNameW   (KERNEL32.291)
+ *           GetTempFileNameW   (KERNEL32.@)
  */
 UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique,
                                   LPWSTR buffer )
@@ -980,7 +980,7 @@
 
 
 /***********************************************************************
- *           OpenFile16   (KERNEL.74)
+ *           OpenFile16   (KERNEL.360)
  */
 HFILE16 WINAPI OpenFile16( LPCSTR name, OFSTRUCT *ofs, UINT16 mode )
 {
@@ -989,7 +989,7 @@
 
 
 /***********************************************************************
- *           OpenFile   (KERNEL32.396)
+ *           OpenFile   (KERNEL32.@)
  */
 HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode )
 {
@@ -1144,7 +1144,7 @@
 
 
 /***********************************************************************
- *           _lclose   (KERNEL32.592)
+ *           _lclose   (KERNEL32.@)
  */
 HFILE WINAPI _lclose( HFILE hFile )
 {
@@ -1153,7 +1153,7 @@
 }
 
 /***********************************************************************
- *              GetOverlappedResult     (KERNEL32.360)
+ *              GetOverlappedResult     (KERNEL32.@)
  *
  * Check the result of an Asynchronous data transfer from a file.
  *
@@ -1350,7 +1350,7 @@
 
 
 /***********************************************************************
- *              ReadFile                (KERNEL32.577)
+ *              ReadFile                (KERNEL32.@)
  */
 BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead,
                         LPDWORD bytesRead, LPOVERLAPPED overlapped )
@@ -1514,7 +1514,7 @@
 
 
 /***********************************************************************
- *             WriteFile               (KERNEL32.738)
+ *             WriteFile               (KERNEL32.@)
  */
 BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite,
                          LPDWORD bytesWritten, LPOVERLAPPED overlapped )
@@ -1598,7 +1598,7 @@
 
 
 /***********************************************************************
- *           _lread   (KERNEL32.596)
+ *           _lread   (KERNEL32.@)
  */
 UINT WINAPI _lread( HFILE handle, LPVOID buffer, UINT count )
 {
@@ -1627,7 +1627,7 @@
 
 
 /***********************************************************************
- *           _lcreat   (KERNEL32.593)
+ *           _lcreat   (KERNEL32.@)
  */
 HFILE WINAPI _lcreat( LPCSTR path, INT attr )
 {
@@ -1641,7 +1641,7 @@
 
 
 /***********************************************************************
- *           SetFilePointer   (KERNEL32.492)
+ *           SetFilePointer   (KERNEL32.@)
  */
 DWORD WINAPI SetFilePointer( HANDLE hFile, LONG distance, LONG *highword,
                              DWORD method )
@@ -1685,7 +1685,7 @@
 
 
 /***********************************************************************
- *           _llseek   (KERNEL32.594)
+ *           _llseek   (KERNEL32.@)
  */
 LONG WINAPI _llseek( HFILE hFile, LONG lOffset, INT nOrigin )
 {
@@ -1703,7 +1703,7 @@
 
 
 /***********************************************************************
- *           _lopen   (KERNEL32.595)
+ *           _lopen   (KERNEL32.@)
  */
 HFILE WINAPI _lopen( LPCSTR path, INT mode )
 {
@@ -1724,7 +1724,7 @@
 }
 
 /***********************************************************************
- *           _lwrite   (KERNEL32.761)
+ *           _lwrite   (KERNEL32.@)
  */
 UINT WINAPI _lwrite( HFILE hFile, LPCSTR buffer, UINT count )
 {
@@ -1742,7 +1742,7 @@
 
 
 /***********************************************************************
- *           _hread   (KERNEL32.590)
+ *           _hread   (KERNEL32.@)
  */
 LONG WINAPI _hread( HFILE hFile, LPVOID buffer, LONG count)
 {
@@ -1760,7 +1760,7 @@
 
 
 /***********************************************************************
- *           _hwrite   (KERNEL32.591)
+ *           _hwrite   (KERNEL32.@)
  *
  *	experimentation yields that _lwrite:
  *		o truncates the file at the current position with 
@@ -1797,7 +1797,7 @@
 
 
 /*************************************************************************
- *           SetHandleCount   (KERNEL32.494)
+ *           SetHandleCount   (KERNEL32.@)
  */
 UINT WINAPI SetHandleCount( UINT count )
 {
@@ -1806,7 +1806,7 @@
 
 
 /***********************************************************************
- *           FlushFileBuffers   (KERNEL32.133)
+ *           FlushFileBuffers   (KERNEL32.@)
  */
 BOOL WINAPI FlushFileBuffers( HANDLE hFile )
 {
@@ -1822,7 +1822,7 @@
 
 
 /**************************************************************************
- *           SetEndOfFile   (KERNEL32.483)
+ *           SetEndOfFile   (KERNEL32.@)
  */
 BOOL WINAPI SetEndOfFile( HANDLE hFile )
 {
@@ -1847,7 +1847,7 @@
 
 
 /***********************************************************************
- *           DeleteFileA   (KERNEL32.71)
+ *           DeleteFileA   (KERNEL32.@)
  */
 BOOL WINAPI DeleteFileA( LPCSTR path )
 {
@@ -1878,7 +1878,7 @@
 
 
 /***********************************************************************
- *           DeleteFileW   (KERNEL32.72)
+ *           DeleteFileW   (KERNEL32.@)
  */
 BOOL WINAPI DeleteFileW( LPCWSTR path )
 {
@@ -1890,7 +1890,7 @@
 
 
 /***********************************************************************
- *           GetFileType   (KERNEL32.222)
+ *           GetFileType   (KERNEL32.@)
  */
 DWORD WINAPI GetFileType( HANDLE hFile )
 {
@@ -2003,7 +2003,7 @@
 
 
 /**************************************************************************
- *           MoveFileA   (KERNEL32.387)
+ *           MoveFileA   (KERNEL32.@)
  *
  *  Move file or directory
  */
@@ -2051,7 +2051,7 @@
 
 
 /**************************************************************************
- *           MoveFileW   (KERNEL32.390)
+ *           MoveFileW   (KERNEL32.@)
  */
 BOOL WINAPI MoveFileW( LPCWSTR fn1, LPCWSTR fn2 )
 {
@@ -2065,7 +2065,7 @@
 
 
 /**************************************************************************
- *           CopyFileA   (KERNEL32.36)
+ *           CopyFileA   (KERNEL32.@)
  */
 BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists )
 {
@@ -2110,7 +2110,7 @@
 
 
 /**************************************************************************
- *           CopyFileW   (KERNEL32.37)
+ *           CopyFileW   (KERNEL32.@)
  */
 BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists)
 {
@@ -2124,7 +2124,7 @@
 
 
 /**************************************************************************
- *           CopyFileExA   (KERNEL32.858)
+ *           CopyFileExA   (KERNEL32.@)
  *
  * This implementation ignores most of the extra parameters passed-in into
  * the "ex" version of the method and calls the CopyFile method.
@@ -2151,7 +2151,7 @@
 }
 
 /**************************************************************************
- *           CopyFileExW   (KERNEL32.859)
+ *           CopyFileExW   (KERNEL32.@)
  */
 BOOL WINAPI CopyFileExW(LPCWSTR            sourceFilename,
                            LPCWSTR            destFilename,
@@ -2178,7 +2178,7 @@
 
 
 /***********************************************************************
- *              SetFileTime   (KERNEL32.650)
+ *              SetFileTime   (KERNEL32.@)
  */
 BOOL WINAPI SetFileTime( HANDLE hFile,
                            const FILETIME *lpCreationTime,
@@ -2205,7 +2205,7 @@
 
 
 /**************************************************************************
- *           LockFile   (KERNEL32.511)
+ *           LockFile   (KERNEL32.@)
  */
 BOOL WINAPI LockFile( HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
                         DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh )
@@ -2225,7 +2225,7 @@
 }
 
 /**************************************************************************
- * LockFileEx [KERNEL32.512]
+ * LockFileEx [KERNEL32.@]
  *
  * Locks a byte range within an open file for shared or exclusive access.
  *
@@ -2256,7 +2256,7 @@
 
 
 /**************************************************************************
- *           UnlockFile   (KERNEL32.703)
+ *           UnlockFile   (KERNEL32.@)
  */
 BOOL WINAPI UnlockFile( HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
                           DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh )
@@ -2277,7 +2277,7 @@
 
 
 /**************************************************************************
- *           UnlockFileEx   (KERNEL32.705)
+ *           UnlockFileEx   (KERNEL32.@)
  */
 BOOL WINAPI UnlockFileEx(
 		HFILE hFile,
@@ -2405,7 +2405,7 @@
 
 
 /**************************************************************************
- *           LockFile   (KERNEL32.511)
+ *           LockFile   (KERNEL32.@)
  */
 BOOL WINAPI LockFile(
 	HFILE hFile,DWORD dwFileOffsetLow,DWORD dwFileOffsetHigh,
@@ -2456,7 +2456,7 @@
 
 
 /**************************************************************************
- *           UnlockFile   (KERNEL32.703)
+ *           UnlockFile   (KERNEL32.@)
  */
 BOOL WINAPI UnlockFile(
 	HFILE hFile,DWORD dwFileOffsetLow,DWORD dwFileOffsetHigh,
@@ -2496,7 +2496,7 @@
 #endif
 
 /**************************************************************************
- * GetFileAttributesExA [KERNEL32.874]
+ * GetFileAttributesExA [KERNEL32.@]
  */
 BOOL WINAPI GetFileAttributesExA(
 	LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId,
@@ -2531,7 +2531,7 @@
 
 
 /**************************************************************************
- * GetFileAttributesExW [KERNEL32.875]
+ * GetFileAttributesExW [KERNEL32.@]
  */
 BOOL WINAPI GetFileAttributesExW(
 	LPCWSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId,
diff --git a/files/profile.c b/files/profile.c
index 116060d..6eb92b0 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -1138,7 +1138,7 @@
 
 
 /***********************************************************************
- *           GetProfileIntA   (KERNEL32.264)
+ *           GetProfileIntA   (KERNEL32.@)
  */
 UINT WINAPI GetProfileIntA( LPCSTR section, LPCSTR entry, INT def_val )
 {
@@ -1146,7 +1146,7 @@
 }
 
 /***********************************************************************
- *           GetProfileIntW   (KERNEL32.264)
+ *           GetProfileIntW   (KERNEL32.@)
  */
 UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val )
 {
@@ -1223,7 +1223,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileStringA   (KERNEL32.255)
+ *           GetPrivateProfileStringA   (KERNEL32.@)
  */
 INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry,
 				     LPCSTR def_val, LPSTR buffer,
@@ -1234,7 +1234,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileStringW   (KERNEL32.256)
+ *           GetPrivateProfileStringW   (KERNEL32.@)
  */
 INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
 				     LPCWSTR def_val, LPWSTR buffer,
@@ -1268,7 +1268,7 @@
 }
 
 /***********************************************************************
- *           GetProfileStringA   (KERNEL32.268)
+ *           GetProfileStringA   (KERNEL32.@)
  */
 INT WINAPI GetProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val,
 			      LPSTR buffer, UINT len )
@@ -1278,7 +1278,7 @@
 }
 
 /***********************************************************************
- *           GetProfileStringW   (KERNEL32.269)
+ *           GetProfileStringW   (KERNEL32.@)
  */
 INT WINAPI GetProfileStringW( LPCWSTR section, LPCWSTR entry,
 			      LPCWSTR def_val, LPWSTR buffer, UINT len )
@@ -1297,7 +1297,7 @@
 }
 
 /***********************************************************************
- *           WriteProfileStringA   (KERNEL32.587)
+ *           WriteProfileStringA   (KERNEL32.@)
  */
 BOOL WINAPI WriteProfileStringA( LPCSTR section, LPCSTR entry,
 				 LPCSTR string )
@@ -1306,7 +1306,7 @@
 }
 
 /***********************************************************************
- *           WriteProfileStringW   (KERNEL32.588)
+ *           WriteProfileStringW   (KERNEL32.@)
  */
 BOOL WINAPI WriteProfileStringW( LPCWSTR section, LPCWSTR entry,
                                      LPCWSTR string )
@@ -1330,7 +1330,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileIntA   (KERNEL32.251)
+ *           GetPrivateProfileIntA   (KERNEL32.@)
  */
 UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry,
 				   INT def_val, LPCSTR filename )
@@ -1348,7 +1348,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileIntW   (KERNEL32.252)
+ *           GetPrivateProfileIntW   (KERNEL32.@)
  */
 UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry,
 				   INT def_val, LPCWSTR filename )
@@ -1373,7 +1373,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileSectionA   (KERNEL32.255)
+ *           GetPrivateProfileSectionA   (KERNEL32.@)
  */
 INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer,
 				      DWORD len, LPCSTR filename )
@@ -1392,7 +1392,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileSectionW   (KERNEL32.256)
+ *           GetPrivateProfileSectionW   (KERNEL32.@)
  */
 
 INT WINAPI GetPrivateProfileSectionW (LPCWSTR section, LPWSTR buffer,
@@ -1420,7 +1420,7 @@
 }
 
 /***********************************************************************
- *           GetProfileSectionA   (KERNEL32.268)
+ *           GetProfileSectionA   (KERNEL32.@)
  */
 INT WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len )
 {
@@ -1446,7 +1446,7 @@
 }
 
 /***********************************************************************
- *           WritePrivateProfileStringA   (KERNEL32.582)
+ *           WritePrivateProfileStringA   (KERNEL32.@)
  */
 BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry,
 					LPCSTR string, LPCSTR filename )
@@ -1468,7 +1468,7 @@
 }
 
 /***********************************************************************
- *           WritePrivateProfileStringW   (KERNEL32.583)
+ *           WritePrivateProfileStringW   (KERNEL32.@)
  */
 BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
 					LPCWSTR string, LPCWSTR filename )
@@ -1558,7 +1558,7 @@
 }
 
 /***********************************************************************
- *           WriteProfileSectionA   (KERNEL32.747)
+ *           WriteProfileSectionA   (KERNEL32.@)
  */
 BOOL WINAPI WriteProfileSectionA( LPCSTR section, LPCSTR keys_n_values)
                                      
@@ -1567,7 +1567,7 @@
 }
 
 /***********************************************************************
- *           WriteProfileSectionW   (KERNEL32.748)
+ *           WriteProfileSectionW   (KERNEL32.@)
  */
 BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values)
 {
@@ -1604,7 +1604,7 @@
 
 
 /***********************************************************************
- *           GetPrivateProfileSectionNamesA  (KERNEL32.365)
+ *           GetPrivateProfileSectionNamesA  (KERNEL32.@)
  */
 DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size,
 					     LPCSTR filename)
@@ -1615,7 +1615,7 @@
 
 
 /***********************************************************************
- *           GetPrivateProfileSectionNamesW  (KERNEL32.366)
+ *           GetPrivateProfileSectionNamesW  (KERNEL32.@)
  */
 DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size,
 					     LPCWSTR filename)
@@ -1643,7 +1643,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileStructA (KERNEL32.370)
+ *           GetPrivateProfileStructA (KERNEL32.@)
  *
  * Should match Win95's behaviour pretty much
  */
@@ -1718,7 +1718,7 @@
 }
 
 /***********************************************************************
- *           GetPrivateProfileStructW (KERNEL32.543)
+ *           GetPrivateProfileStructW (KERNEL32.@)
  */
 BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key,
 				      LPVOID buffer, UINT len, LPCWSTR filename)
@@ -1752,7 +1752,7 @@
 }
 
 /***********************************************************************
- *           WritePrivateProfileStructA (KERNEL32.744)
+ *           WritePrivateProfileStructA (KERNEL32.@)
  */
 BOOL WINAPI WritePrivateProfileStructA (LPCSTR section, LPCSTR key, 
                                         LPVOID buf, UINT bufsize, LPCSTR filename)
@@ -1791,7 +1791,7 @@
 }
 
 /***********************************************************************
- *           WritePrivateProfileStructW (KERNEL32.544)
+ *           WritePrivateProfileStructW (KERNEL32.@)
  */
 BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key,
 					LPVOID buf, UINT bufsize, LPCWSTR filename)
diff --git a/files/tape.c b/files/tape.c
index 7e1862b..a9c17b1 100644
--- a/files/tape.c
+++ b/files/tape.c
@@ -16,7 +16,7 @@
 
 
 /************************************************************************
- *		BackupRead  (KERNEL32.107)
+ *		BackupRead  (KERNEL32.@)
  */
 BOOL WINAPI BackupRead( HANDLE hFile, LPBYTE lpBuffer, DWORD nNumberOfBytesToRead,
 		LPDWORD lpNumberOfBytesRead, BOOL bAbort,
@@ -33,7 +33,7 @@
 
 
 /************************************************************************
- *		BackupSeek  (KERNEL32.108)
+ *		BackupSeek  (KERNEL32.@)
  */
 BOOL WINAPI BackupSeek( HANDLE hFile, DWORD dwLowBytesToSeek, DWORD dwHighBytesToSeek,
          	LPDWORD lpdwLowByteSeeked, LPDWORD lpdwHighByteSeeked,
@@ -49,7 +49,7 @@
 
 
 /************************************************************************
- *		BackupWrite  (KERNEL32.109)
+ *		BackupWrite  (KERNEL32.@)
  */
 BOOL WINAPI BackupWrite( HANDLE hFile, LPBYTE lpBuffer, DWORD nNumberOfBytesToWrite,
 		LPDWORD lpNumberOfBytesWritten, BOOL bAbort,
@@ -66,7 +66,7 @@
 
 
 /************************************************************************
- *		CreateTapePartition  (KERNEL32.177)
+ *		CreateTapePartition  (KERNEL32.@)
  */
 DWORD WINAPI CreateTapePartition( HANDLE hDevice, DWORD dwPartitionMethod,
 			DWORD dwCount, DWORD dwSize )
@@ -81,7 +81,7 @@
 
 
 /************************************************************************
- *		EraseTape  (KERNEL32.212)
+ *		EraseTape  (KERNEL32.@)
  */
 DWORD WINAPI EraseTape( HANDLE hDevice, DWORD dwEraseType, BOOL bImmediate )
 {
@@ -94,7 +94,7 @@
 
 
 /************************************************************************
- *		GetTapeParameters  (KERNEL32.409)
+ *		GetTapeParameters  (KERNEL32.@)
  */
 DWORD WINAPI GetTapeParameters( HANDLE hDevice, DWORD dwOperation,
 			LPDWORD lpdwSize, LPVOID lpTapeInformation )
@@ -109,7 +109,7 @@
 
 
 /************************************************************************
- *		GetTapePosition  (KERNEL32.410)
+ *		GetTapePosition  (KERNEL32.@)
  */
 DWORD WINAPI GetTapePosition( HANDLE hDevice, DWORD dwPositionType,
 			LPDWORD lpdwPartition, LPDWORD lpdwOffsetLow,
@@ -125,7 +125,7 @@
 
 
 /************************************************************************
- *		GetTapeStatus  (KERNEL32.411)
+ *		GetTapeStatus  (KERNEL32.@)
  */
 DWORD WINAPI GetTapeStatus( HANDLE hDevice )
 {
@@ -138,7 +138,7 @@
 
 
 /************************************************************************
- *		PrepareTape  (KERNEL32.554)
+ *		PrepareTape  (KERNEL32.@)
  */
 DWORD WINAPI PrepareTape( HANDLE hDevice,  DWORD dwOperation,  BOOL bImmediate )
 { 
@@ -151,7 +151,7 @@
 
 
 /************************************************************************
- *		SetTapeParameters  (KERNEL32.667)
+ *		SetTapeParameters  (KERNEL32.@)
  */
 DWORD WINAPI SetTapeParameters( HANDLE hDevice, DWORD dwOperation,
                          LPVOID lpTapeInformation )
@@ -165,7 +165,7 @@
 
 
 /************************************************************************
- *		SetTapePosition  (KERNEL32.668)
+ *		SetTapePosition  (KERNEL32.@)
  */
 DWORD WINAPI SetTapePosition( HANDLE hDevice, DWORD dwPositionMethod, DWORD
                        dwPartition, DWORD dwOffsetLow, DWORD dwOffsetHigh,
@@ -181,7 +181,7 @@
 
 
 /************************************************************************
- *		WriteTapemark  (KERNEL32.751)
+ *		WriteTapemark  (KERNEL32.@)
  */
 DWORD WINAPI WriteTapemark( HANDLE hDevice,  DWORD dwTapemarkType, DWORD
                      dwTapemarkCount, BOOL bImmediate )
diff --git a/loader/module.c b/loader/module.c
index 279f6a1..8edf183 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -306,7 +306,7 @@
 }
 
 /****************************************************************************
- *              DisableThreadLibraryCalls (KERNEL32.74)
+ *              DisableThreadLibraryCalls (KERNEL32.@)
  *
  * Don't call DllEntryPoint for DLL_THREAD_{ATTACH,DETACH} if set.
  */
@@ -671,7 +671,7 @@
 }
 
 /***********************************************************************
- *             GetBinaryTypeA                     [KERNEL32.280]
+ *             GetBinaryTypeA                     [KERNEL32.@]
  */
 BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType )
 {
@@ -704,7 +704,7 @@
 }
 
 /***********************************************************************
- *             GetBinaryTypeW                      [KERNEL32.281]
+ *             GetBinaryTypeW                      [KERNEL32.@]
  */
 BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType )
 {
@@ -826,7 +826,7 @@
 }
 
 /***********************************************************************
- *           WinExec   (KERNEL32.566)
+ *           WinExec   (KERNEL32.@)
  */
 HINSTANCE WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow )
 {
@@ -865,7 +865,7 @@
 }
 
 /**********************************************************************
- *	    LoadModule    (KERNEL32.499)
+ *	    LoadModule    (KERNEL32.@)
  */
 HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) 
 {
@@ -1006,7 +1006,7 @@
 
 
 /**********************************************************************
- *       CreateProcessA          (KERNEL32.171)
+ *       CreateProcessA          (KERNEL32.@)
  */
 BOOL WINAPI CreateProcessA( LPCSTR lpApplicationName, LPSTR lpCommandLine, 
                             LPSECURITY_ATTRIBUTES lpProcessAttributes,
@@ -1128,7 +1128,7 @@
 }
 
 /**********************************************************************
- *       CreateProcessW          (KERNEL32.172)
+ *       CreateProcessW          (KERNEL32.@)
  * NOTES
  *  lpReserved is not converted
  */
@@ -1170,7 +1170,7 @@
 }
 
 /***********************************************************************
- *              GetModuleHandleA         (KERNEL32.237)
+ *              GetModuleHandleA         (KERNEL32.@)
  */
 HMODULE WINAPI GetModuleHandleA(LPCSTR module)
 {
@@ -1198,7 +1198,7 @@
 
 
 /***********************************************************************
- *              GetModuleFileNameA      (KERNEL32.235)
+ *              GetModuleFileNameA      (KERNEL32.@)
  *
  * GetModuleFileNameA seems to *always* return the long path;
  * it's only GetModuleFileName16 that decides between short/long path
@@ -1225,7 +1225,7 @@
  
 
 /***********************************************************************
- *              GetModuleFileNameW      (KERNEL32.236)
+ *              GetModuleFileNameW      (KERNEL32.@)
  */
 DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName,
                                    DWORD size )
@@ -1466,7 +1466,7 @@
 }
 
 /***********************************************************************
- *           LoadLibrary32_16   (KERNEL.452)
+ *           LoadLibrary32_16   (KERNEL.482)
  */
 HMODULE WINAPI LoadLibrary32_16( LPCSTR libname )
 {
@@ -1656,7 +1656,7 @@
 
 
 /***********************************************************************
- *           WIN32_GetProcAddress16   (KERNEL32.36)
+ *           WIN32_GetProcAddress16   (KERNEL32.37)
  * Get procaddress in 16bit module from win32... (kernel32 undoc. ordinal func)
  */
 FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE hModule, LPCSTR name )
@@ -1704,7 +1704,7 @@
 
 
 /***********************************************************************
- *           GetProcAddress   		(KERNEL32.257)
+ *           GetProcAddress   		(KERNEL32.@)
  */
 FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function )
 {
diff --git a/loader/ne/module.c b/loader/ne/module.c
index c3a4c7c..ad794b6 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -1679,7 +1679,7 @@
 }
 
 /***************************************************************************
- *		MapHModuleLS			(KERNEL32.520)
+ *		MapHModuleLS			(KERNEL32.@)
  */
 HMODULE16 WINAPI MapHModuleLS(HMODULE hmod) {
 	NE_MODULE	*pModule;
@@ -1698,7 +1698,7 @@
 }
 
 /***************************************************************************
- *		MapHModuleSL			(KERNEL32.521)
+ *		MapHModuleSL			(KERNEL32.@)
  */
 HMODULE WINAPI MapHModuleSL(HMODULE16 hmod) {
 	NE_MODULE	*pModule;
@@ -1716,7 +1716,8 @@
 }
 
 /***************************************************************************
- *		MapHInstLS			(KERNEL32.516)(KERNEL.472)
+ *		MapHInstLS			(KERNEL32.@)
+ *		MapHInstLS			(KERNEL.472)
  */
 void WINAPI MapHInstLS( CONTEXT86 *context )
 {
@@ -1724,7 +1725,8 @@
 }
 
 /***************************************************************************
- *		MapHInstSL			(KERNEL32.518)(KERNEL.473)
+ *		MapHInstSL			(KERNEL32.@)
+ *		MapHInstSL			(KERNEL.473)
  */
 void WINAPI MapHInstSL( CONTEXT86 *context )
 {
@@ -1732,7 +1734,7 @@
 }
 
 /***************************************************************************
- *		MapHInstLS_PN			(KERNEL32.517)
+ *		MapHInstLS_PN			(KERNEL32.@)
  */
 void WINAPI MapHInstLS_PN( CONTEXT86 *context )
 {
@@ -1740,7 +1742,7 @@
 }
 
 /***************************************************************************
- *		MapHInstSL_PN			(KERNEL32.519)
+ *		MapHInstSL_PN			(KERNEL32.@)
  */
 void WINAPI MapHInstSL_PN( CONTEXT86 *context )
 {
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index cb0d196..ebd9d39 100644
--- a/loader/ne/resource.c
+++ b/loader/ne/resource.c
@@ -266,7 +266,7 @@
 
 
 /**********************************************************************
- *	SetResourceHandler	(KERNEL.43)
+ *	SetResourceHandler	(KERNEL.67)
  */
 FARPROC16 WINAPI SetResourceHandler16( HMODULE16 hModule, LPCSTR typeId,
                                      FARPROC16 resourceHandler )
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
index cf58350..31340f1 100644
--- a/loader/pe_resource.c
+++ b/loader/pe_resource.c
@@ -289,7 +289,7 @@
 
 
 /**********************************************************************
- *	EnumResourceTypesA	(KERNEL32.90)
+ *	EnumResourceTypesA	(KERNEL32.@)
  */
 BOOL WINAPI EnumResourceTypesA( HMODULE hmod, ENUMRESTYPEPROCA lpfun, LONG lparam)
 {
@@ -331,7 +331,7 @@
 
 
 /**********************************************************************
- *	EnumResourceTypesW	(KERNEL32.91)
+ *	EnumResourceTypesW	(KERNEL32.@)
  */
 BOOL WINAPI EnumResourceTypesW( HMODULE hmod, ENUMRESTYPEPROCW lpfun, LONG lparam)
 {
@@ -370,7 +370,7 @@
 
 
 /**********************************************************************
- *	EnumResourceNamesA	(KERNEL32.88)
+ *	EnumResourceNamesA	(KERNEL32.@)
  */
 BOOL WINAPI EnumResourceNamesA( HMODULE hmod, LPCSTR type, ENUMRESNAMEPROCA lpfun, LONG lparam )
 {
@@ -415,7 +415,7 @@
 
 
 /**********************************************************************
- *	EnumResourceNamesW	(KERNEL32.89)
+ *	EnumResourceNamesW	(KERNEL32.@)
  */
 BOOL WINAPI EnumResourceNamesW( HMODULE hmod, LPCWSTR type, ENUMRESNAMEPROCW lpfun, LONG lparam )
 {
@@ -457,7 +457,7 @@
 
 
 /**********************************************************************
- *	EnumResourceLanguagesA	(KERNEL32.86)
+ *	EnumResourceLanguagesA	(KERNEL32.@)
  */
 BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name,
                                     ENUMRESLANGPROCA lpfun, LONG lparam )
@@ -485,7 +485,7 @@
 
 
 /**********************************************************************
- *	EnumResourceLanguagesW	(KERNEL32.87)
+ *	EnumResourceLanguagesW	(KERNEL32.@)
  */
 BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name,
                                     ENUMRESLANGPROCW lpfun, LONG lparam )
diff --git a/loader/resource.c b/loader/resource.c
index 341fe1f..aa83220 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -322,7 +322,7 @@
 }
 
 /**********************************************************************
- *	    FindResourceA    (KERNEL32.128)
+ *	    FindResourceA    (KERNEL32.@)
  */
 HRSRC WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type )
 {
@@ -331,7 +331,7 @@
 }
 
 /**********************************************************************
- *	    FindResourceExA  (KERNEL32.129)
+ *	    FindResourceExA  (KERNEL32.@)
  */
 HRSRC WINAPI FindResourceExA( HMODULE hModule, 
                                LPCSTR type, LPCSTR name, WORD lang )
@@ -341,7 +341,7 @@
 }
 
 /**********************************************************************
- *	    FindResourceExW  (KERNEL32.130)
+ *	    FindResourceExW  (KERNEL32.@)
  */
 HRSRC WINAPI FindResourceExW( HMODULE hModule, 
                               LPCWSTR type, LPCWSTR name, WORD lang )
@@ -351,7 +351,7 @@
 }
 
 /**********************************************************************
- *	    FindResourceW    (KERNEL32.131)
+ *	    FindResourceW    (KERNEL32.@)
  */
 HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type)
 {
@@ -368,7 +368,7 @@
 }
 
 /**********************************************************************
- *	    LoadResource     (KERNEL32.370)
+ *	    LoadResource     (KERNEL32.@)
  */
 HGLOBAL WINAPI LoadResource( HINSTANCE hModule, HRSRC hRsrc )
 {
@@ -394,7 +394,7 @@
 }
 
 /**********************************************************************
- *	    LockResource     (KERNEL32.384)
+ *	    LockResource     (KERNEL32.@)
  */
 LPVOID WINAPI LockResource( HGLOBAL handle )
 {
@@ -434,7 +434,7 @@
 }
 
 /**********************************************************************
- *	    FreeResource     (KERNEL32.145)
+ *	    FreeResource     (KERNEL32.@)
  */
 BOOL WINAPI FreeResource( HGLOBAL handle )
 {
@@ -452,7 +452,7 @@
 }
 
 /**********************************************************************
- *	    SizeofResource   (KERNEL32.522)
+ *	    SizeofResource   (KERNEL32.@)
  */
 DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc )
 {
diff --git a/loader/task.c b/loader/task.c
index 7f82e01..c1fdf58 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -1562,7 +1562,7 @@
 
 
 /***********************************************************************
- *           GetAppCompatFlags   (USER32.206)
+ *           GetAppCompatFlags   (USER32.@)
  */
 DWORD WINAPI GetAppCompatFlags( HTASK hTask )
 {
diff --git a/memory/atom.c b/memory/atom.c
index dc21a72..0e79a59 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -397,7 +397,7 @@
 }
 
 /***********************************************************************
- *           InitAtomTable   (KERNEL32.471)
+ *           InitAtomTable   (KERNEL32.@)
  */
 BOOL WINAPI InitAtomTable( DWORD entries )
 {
@@ -437,7 +437,8 @@
 
 
 /***********************************************************************
- *           GlobalAddAtomA   (USER.268) (KERNEL32.313)
+ *           GlobalAddAtomA   (USER.268)
+ *           GlobalAddAtomA   (KERNEL32.@)
  *
  * Adds a character string to the global atom table and returns a unique
  * value identifying the string.
@@ -453,7 +454,7 @@
 
 
 /***********************************************************************
- *           AddAtomA   (KERNEL32.0)
+ *           AddAtomA   (KERNEL32.@)
  * Adds a string to the atom table and returns the atom identifying the
  * string.
  *
@@ -492,7 +493,7 @@
 
 
 /***********************************************************************
- *           GlobalAddAtomW   (KERNEL32.314)
+ *           GlobalAddAtomW   (KERNEL32.@)
  */
 ATOM WINAPI GlobalAddAtomW( LPCWSTR str )
 {
@@ -501,7 +502,7 @@
 
 
 /***********************************************************************
- *           AddAtomW   (KERNEL32.1)
+ *           AddAtomW   (KERNEL32.@)
  */
 ATOM WINAPI AddAtomW( LPCWSTR str )
 {
@@ -528,7 +529,8 @@
 
 
 /***********************************************************************
- *           GlobalDeleteAtom   (USER.269) (KERNEL32.317)
+ *           GlobalDeleteAtom   (USER.269)
+ *           GlobalDeleteAtom   (KERNEL32.@)
  * Decrements the reference count of a string atom.  If the count is
  * zero, the string associated with the atom is removed from the table.
  *
@@ -543,7 +545,7 @@
 
 
 /***********************************************************************
- *           DeleteAtom   (KERNEL32.69)
+ *           DeleteAtom   (KERNEL32.@)
  * Decrements the reference count of a string atom.  If count becomes
  * zero, the string associated with the atom is removed from the table.
  *
@@ -582,7 +584,8 @@
 
 
 /***********************************************************************
- *           GlobalFindAtomA   (USER.270) (KERNEL32.318)
+ *           GlobalFindAtomA   (USER.270)
+ *           GlobalFindAtomA   (KERNEL32.@)
  *
  * Searches the atom table for the string and returns the atom
  * associated with it.
@@ -597,7 +600,7 @@
 }
 
 /***********************************************************************
- *           FindAtomA   (KERNEL32.117)
+ *           FindAtomA   (KERNEL32.@)
  * Searches the local atom table for the string and returns the atom
  * associated with that string.
  *
@@ -636,7 +639,7 @@
 
 
 /***********************************************************************
- *           GlobalFindAtomW   (KERNEL32.319)
+ *           GlobalFindAtomW   (KERNEL32.@)
  */
 ATOM WINAPI GlobalFindAtomW( LPCWSTR str )
 {
@@ -645,7 +648,7 @@
 
 
 /***********************************************************************
- *           FindAtomW   (KERNEL32.118)
+ *           FindAtomW   (KERNEL32.@)
  */
 ATOM WINAPI FindAtomW( LPCWSTR str )
 {
@@ -704,7 +707,8 @@
 
 
 /***********************************************************************
- *           GlobalGetAtomNameA   (USER.271) (KERNEL32.323)
+ *           GlobalGetAtomNameA   (USER.271)
+ *           GlobalGetAtomNameA   (KERNEL32.@)
  *
  * Retrieves a copy of the string associated with an atom.
  *
@@ -722,7 +726,7 @@
 
 
 /***********************************************************************
- *           GetAtomNameA   (KERNEL32.149)
+ *           GetAtomNameA   (KERNEL32.@)
  * Retrieves a copy of the string associated with the atom.
  *
  * RETURNS
@@ -788,7 +792,7 @@
 
 
 /***********************************************************************
- *           GlobalGetAtomNameW   (KERNEL32.324)
+ *           GlobalGetAtomNameW   (KERNEL32.@)
  */
 UINT WINAPI GlobalGetAtomNameW( ATOM atom, LPWSTR buffer, INT count )
 {
@@ -797,7 +801,7 @@
 
 
 /***********************************************************************
- *           GetAtomNameW   (KERNEL32.150)
+ *           GetAtomNameW   (KERNEL32.@)
  */
 UINT WINAPI GetAtomNameW( ATOM atom, LPWSTR buffer, INT count )
 {
diff --git a/memory/environ.c b/memory/environ.c
index e7bf71c..82de436 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -208,7 +208,7 @@
 
 
 /***********************************************************************
- *           GetCommandLineA      (KERNEL32.289)
+ *           GetCommandLineA      (KERNEL32.@)
  */
 LPSTR WINAPI GetCommandLineA(void)
 {
@@ -216,7 +216,7 @@
 }
 
 /***********************************************************************
- *           GetCommandLineW      (KERNEL32.290)
+ *           GetCommandLineW      (KERNEL32.@)
  */
 LPWSTR WINAPI GetCommandLineW(void)
 {
@@ -225,7 +225,8 @@
 
 
 /***********************************************************************
- *           GetEnvironmentStringsA   (KERNEL32.319) (KERNEL32.320)
+ *           GetEnvironmentStringsA   (KERNEL32.@)
+ *           GetEnvironmentStringsA   (KERNEL32.@)
  */
 LPSTR WINAPI GetEnvironmentStringsA(void)
 {
@@ -234,7 +235,7 @@
 
 
 /***********************************************************************
- *           GetEnvironmentStringsW   (KERNEL32.321)
+ *           GetEnvironmentStringsW   (KERNEL32.@)
  */
 LPWSTR WINAPI GetEnvironmentStringsW(void)
 {
@@ -255,7 +256,7 @@
 
 
 /***********************************************************************
- *           FreeEnvironmentStringsA   (KERNEL32.268)
+ *           FreeEnvironmentStringsA   (KERNEL32.@)
  */
 BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr )
 {
@@ -269,7 +270,7 @@
 
 
 /***********************************************************************
- *           FreeEnvironmentStringsW   (KERNEL32.269)
+ *           FreeEnvironmentStringsW   (KERNEL32.@)
  */
 BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr )
 {
@@ -278,7 +279,7 @@
 
 
 /***********************************************************************
- *           GetEnvironmentVariableA   (KERNEL32.322)
+ *           GetEnvironmentVariableA   (KERNEL32.@)
  */
 DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size )
 {
@@ -311,7 +312,7 @@
 
 
 /***********************************************************************
- *           GetEnvironmentVariableW   (KERNEL32.323)
+ *           GetEnvironmentVariableW   (KERNEL32.@)
  */
 DWORD WINAPI GetEnvironmentVariableW( LPCWSTR nameW, LPWSTR valW, DWORD size)
 {
@@ -330,7 +331,7 @@
 
 
 /***********************************************************************
- *           SetEnvironmentVariableA   (KERNEL32.641)
+ *           SetEnvironmentVariableA   (KERNEL32.@)
  */
 BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value )
 {
@@ -386,7 +387,7 @@
 
 
 /***********************************************************************
- *           SetEnvironmentVariableW   (KERNEL32.642)
+ *           SetEnvironmentVariableW   (KERNEL32.@)
  */
 BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value )
 {
@@ -400,7 +401,7 @@
 
 
 /***********************************************************************
- *           ExpandEnvironmentStringsA   (KERNEL32.216)
+ *           ExpandEnvironmentStringsA   (KERNEL32.@)
  *
  * Note: overlapping buffers are not supported; this is how it should be.
  */
@@ -468,7 +469,7 @@
 
 
 /***********************************************************************
- *           ExpandEnvironmentStringsW   (KERNEL32.217)
+ *           ExpandEnvironmentStringsW   (KERNEL32.@)
  */
 DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len )
 {
@@ -495,7 +496,7 @@
 
 
 /***********************************************************************
- *           GetStdHandle    (KERNEL32.276)
+ *           GetStdHandle    (KERNEL32.@)
  */
 HANDLE WINAPI GetStdHandle( DWORD std_handle )
 {
@@ -511,7 +512,7 @@
 
 
 /***********************************************************************
- *           SetStdHandle    (KERNEL32.506)
+ *           SetStdHandle    (KERNEL32.@)
  */
 BOOL WINAPI SetStdHandle( DWORD std_handle, HANDLE handle )
 {
@@ -527,7 +528,7 @@
 
 
 /***********************************************************************
- *              GetStartupInfoA         (KERNEL32.273)
+ *              GetStartupInfoA         (KERNEL32.@)
  */
 VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info )
 {
@@ -536,7 +537,7 @@
 
 
 /***********************************************************************
- *              GetStartupInfoW         (KERNEL32.274)
+ *              GetStartupInfoW         (KERNEL32.@)
  */
 VOID WINAPI GetStartupInfoW( LPSTARTUPINFOW info )
 {
diff --git a/memory/global.c b/memory/global.c
index c6f744a..45fbaa5 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -418,7 +418,8 @@
 
 
 /**********************************************************************
- *           K32WOWGlobalLock16         (WOW32.11) (KERNEL32.60)
+ *           K32WOWGlobalLock16         (WOW32.11)
+ *           K32WOWGlobalLock16         (KERNEL32.60)
  */
 SEGPTR WINAPI K32WOWGlobalLock16( HGLOBAL16 hMem )
 {
@@ -731,7 +732,7 @@
 
 
 /***********************************************************************
- *           GlobalPageLock   (KERNEL.191)
+ *           GlobalPageLock   (KERNEL.230)
  */
 WORD WINAPI GlobalPageLock16( HGLOBAL16 handle )
 {
@@ -745,7 +746,7 @@
 
 
 /***********************************************************************
- *           GlobalPageUnlock   (KERNEL.192)
+ *           GlobalPageUnlock   (KERNEL.231)
  */
 WORD WINAPI GlobalPageUnlock16( HGLOBAL16 handle )
 {
@@ -993,7 +994,7 @@
 
 
 /***********************************************************************
- *           GlobalAlloc   (KERNEL32.315)
+ *           GlobalAlloc   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -1047,7 +1048,7 @@
 
 
 /***********************************************************************
- *           GlobalLock   (KERNEL32.326)
+ *           GlobalLock   (KERNEL32.@)
  * RETURNS
  *	Pointer to first byte of block
  *	NULL: Failure
@@ -1082,7 +1083,7 @@
 
 
 /***********************************************************************
- *           GlobalUnlock   (KERNEL32.332)
+ *           GlobalUnlock   (KERNEL32.@)
  * RETURNS
  *	TRUE: Object is still locked
  *	FALSE: Object is unlocked
@@ -1119,7 +1120,7 @@
 
 
 /***********************************************************************
- *           GlobalHandle   (KERNEL32.325)
+ *           GlobalHandle   (KERNEL32.@)
  * Returns the handle associated with the specified pointer.
  *
  * RETURNS
@@ -1178,7 +1179,7 @@
 
 
 /***********************************************************************
- *           GlobalReAlloc   (KERNEL32.328)
+ *           GlobalReAlloc   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -1284,7 +1285,7 @@
 
 
 /***********************************************************************
- *           GlobalFree   (KERNEL32.322)
+ *           GlobalFree   (KERNEL32.@)
  * RETURNS
  *	NULL: Success
  *	Handle: Failure
@@ -1325,7 +1326,7 @@
 
 
 /***********************************************************************
- *           GlobalSize   (KERNEL32.329)
+ *           GlobalSize   (KERNEL32.@)
  * RETURNS
  *	Size in bytes of the global memory object
  *	0: Failure
@@ -1367,7 +1368,7 @@
 
 
 /***********************************************************************
- *           GlobalWire   (KERNEL32.333)
+ *           GlobalWire   (KERNEL32.@)
  */
 LPVOID WINAPI GlobalWire(HGLOBAL hmem)
 {
@@ -1376,7 +1377,7 @@
 
 
 /***********************************************************************
- *           GlobalUnWire   (KERNEL32.330)
+ *           GlobalUnWire   (KERNEL32.@)
  */
 BOOL WINAPI GlobalUnWire(HGLOBAL hmem)
 {
@@ -1385,7 +1386,7 @@
 
 
 /***********************************************************************
- *           GlobalFix   (KERNEL32.320)
+ *           GlobalFix   (KERNEL32.@)
  */
 VOID WINAPI GlobalFix(HGLOBAL hmem)
 {
@@ -1394,7 +1395,7 @@
 
 
 /***********************************************************************
- *           GlobalUnfix   (KERNEL32.331)
+ *           GlobalUnfix   (KERNEL32.@)
  */
 VOID WINAPI GlobalUnfix(HGLOBAL hmem)
 {
@@ -1403,7 +1404,7 @@
 
 
 /***********************************************************************
- *           GlobalFlags   (KERNEL32.321)
+ *           GlobalFlags   (KERNEL32.@)
  * Returns information about the specified global memory object
  *
  * NOTES
@@ -1445,7 +1446,7 @@
 
 
 /***********************************************************************
- *           GlobalCompact   (KERNEL32.316)
+ *           GlobalCompact   (KERNEL32.@)
  */
 DWORD WINAPI GlobalCompact( DWORD minfree )
 {
@@ -1454,7 +1455,7 @@
 
 
 /***********************************************************************
- *           GlobalMemoryStatus   (KERNEL32.327)
+ *           GlobalMemoryStatus   (KERNEL32.@)
  * RETURNS
  *	None
  */
diff --git a/memory/heap.c b/memory/heap.c
index 66e1f45..27c1280 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -896,7 +896,7 @@
 }
 
 /***********************************************************************
- *           MapLS   (KERNEL32.522)
+ *           MapLS   (KERNEL32.@)
  *
  * Maps linear pointer to segmented.
  */
@@ -924,7 +924,7 @@
 
 
 /***********************************************************************
- *           UnMapLS   (KERNEL32.700)
+ *           UnMapLS   (KERNEL32.@)
  *
  * Free mapped selector.
  */
@@ -1061,7 +1061,7 @@
 
 
 /***********************************************************************
- *           HeapCreate   (KERNEL32.336)
+ *           HeapCreate   (KERNEL32.@)
  * RETURNS
  *	Handle of heap: Success
  *	NULL: Failure
@@ -1117,7 +1117,7 @@
 }
 
 /***********************************************************************
- *           HeapDestroy   (KERNEL32.337)
+ *           HeapDestroy   (KERNEL32.@)
  * RETURNS
  *	TRUE: Success
  *	FALSE: Failure
@@ -1164,7 +1164,7 @@
 
 
 /***********************************************************************
- *           HeapAlloc   (KERNEL32.334)
+ *           HeapAlloc   (KERNEL32.@)
  * RETURNS
  *	Pointer to allocated memory block
  *	NULL: Failure
@@ -1235,7 +1235,7 @@
 
 
 /***********************************************************************
- *           HeapFree   (KERNEL32.338)
+ *           HeapFree   (KERNEL32.@)
  * RETURNS
  *	TRUE: Success
  *	FALSE: Failure
@@ -1282,7 +1282,7 @@
 
 
 /***********************************************************************
- *           HeapReAlloc   (KERNEL32.340)
+ *           HeapReAlloc   (KERNEL32.@)
  * RETURNS
  *	Pointer to reallocated memory block
  *	NULL: Failure
@@ -1406,7 +1406,7 @@
 
 
 /***********************************************************************
- *           HeapCompact   (KERNEL32.335)
+ *           HeapCompact   (KERNEL32.@)
  */
 DWORD WINAPI HeapCompact( HANDLE heap, DWORD flags )
 {
@@ -1416,7 +1416,7 @@
 
 
 /***********************************************************************
- *           HeapLock   (KERNEL32.339)
+ *           HeapLock   (KERNEL32.@)
  * Attempts to acquire the critical section object for a specified heap.
  *
  * RETURNS
@@ -1434,7 +1434,7 @@
 
 
 /***********************************************************************
- *           HeapUnlock   (KERNEL32.342)
+ *           HeapUnlock   (KERNEL32.@)
  * Releases ownership of the critical section object.
  *
  * RETURNS
@@ -1452,7 +1452,7 @@
 
 
 /***********************************************************************
- *           HeapSize   (KERNEL32.341)
+ *           HeapSize   (KERNEL32.@)
  * RETURNS
  *	Size in bytes of allocated memory
  *	0xffffffff: Failure
@@ -1489,7 +1489,7 @@
 
 
 /***********************************************************************
- *           HeapValidate   (KERNEL32.343)
+ *           HeapValidate   (KERNEL32.@)
  * Validates a specified heap.
  *
  * NOTES
@@ -1512,7 +1512,7 @@
 
 
 /***********************************************************************
- *           HeapWalk   (KERNEL32.344)
+ *           HeapWalk   (KERNEL32.@)
  * Enumerates the memory blocks in a specified heap.
  * See HEAP_Dump() for info on heap structure.
  *
@@ -1636,7 +1636,7 @@
 
 
 /***********************************************************************
- *           GetProcessHeap    (KERNEL32.259)
+ *           GetProcessHeap    (KERNEL32.@)
  */
 HANDLE WINAPI GetProcessHeap(void)
 {
@@ -1645,7 +1645,7 @@
 
 
 /***********************************************************************
- *           GetProcessHeaps    (KERNEL32.376)
+ *           GetProcessHeaps    (KERNEL32.@)
  */
 DWORD WINAPI GetProcessHeaps( DWORD count, HANDLE *heaps )
 {
@@ -2136,7 +2136,8 @@
 }
 
 /***********************************************************************
- *           Local32Info   (KERNEL.444)  (TOOLHELP.84)
+ *           Local32Info   (KERNEL.444)
+ *           Local32Info   (TOOLHELP.84)
  */
 BOOL16 WINAPI Local32Info16( LOCAL32INFO *pLocal32Info, HGLOBAL16 handle )
 {
@@ -2190,7 +2191,8 @@
 }
 
 /***********************************************************************
- *           Local32First   (KERNEL.445)  (TOOLHELP.85)
+ *           Local32First   (KERNEL.445)
+ *           Local32First   (TOOLHELP.85)
  */
 BOOL16 WINAPI Local32First16( LOCAL32ENTRY *pLocal32Entry, HGLOBAL16 handle )
 {
@@ -2199,7 +2201,8 @@
 }
 
 /***********************************************************************
- *           Local32Next   (KERNEL.446)  (TOOLHELP.86)
+ *           Local32Next   (KERNEL.446)
+ *           Local32Next   (TOOLHELP.86)
  */
 BOOL16 WINAPI Local32Next16( LOCAL32ENTRY *pLocal32Entry )
 {
diff --git a/memory/local.c b/memory/local.c
index b43ff4e..277925f 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -1813,7 +1813,7 @@
 
 
 /***********************************************************************
- *           LocalAlloc   (KERNEL32.371)
+ *           LocalAlloc   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -1827,7 +1827,7 @@
 
 
 /***********************************************************************
- *           LocalCompact   (KERNEL32.372)
+ *           LocalCompact   (KERNEL32.@)
  */
 UINT WINAPI LocalCompact( UINT minfree )
 {
@@ -1836,7 +1836,7 @@
 
 
 /***********************************************************************
- *           LocalFlags   (KERNEL32.374)
+ *           LocalFlags   (KERNEL32.@)
  * RETURNS
  *	Value specifying allocation flags and lock count.
  *	LMEM_INVALID_HANDLE: Failure
@@ -1849,7 +1849,7 @@
 
 
 /***********************************************************************
- *           LocalFree   (KERNEL32.375)
+ *           LocalFree   (KERNEL32.@)
  * RETURNS
  *	NULL: Success
  *	Handle: Failure
@@ -1862,7 +1862,7 @@
 
 
 /***********************************************************************
- *           LocalHandle   (KERNEL32.376)
+ *           LocalHandle   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -1875,7 +1875,7 @@
 
 
 /***********************************************************************
- *           LocalLock   (KERNEL32.377)
+ *           LocalLock   (KERNEL32.@)
  * Locks a local memory object and returns pointer to the first byte
  * of the memory block.
  *
@@ -1891,7 +1891,7 @@
 
 
 /***********************************************************************
- *           LocalReAlloc   (KERNEL32.378)
+ *           LocalReAlloc   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -1906,7 +1906,7 @@
 
 
 /***********************************************************************
- *           LocalShrink   (KERNEL32.379)
+ *           LocalShrink   (KERNEL32.@)
  */
 UINT WINAPI LocalShrink( HGLOBAL handle, UINT newsize )
 {
@@ -1915,7 +1915,7 @@
 
 
 /***********************************************************************
- *           LocalSize   (KERNEL32.380)
+ *           LocalSize   (KERNEL32.@)
  * RETURNS
  *	Size: Success
  *	0: Failure
@@ -1928,7 +1928,7 @@
 
 
 /***********************************************************************
- *           LocalUnlock   (KERNEL32.381)
+ *           LocalUnlock   (KERNEL32.@)
  * RETURNS
  *	TRUE: Object is still locked
  *	FALSE: Object is unlocked
diff --git a/memory/registry.c b/memory/registry.c
index bc0cc58..0c34811b 100644
--- a/memory/registry.c
+++ b/memory/registry.c
@@ -36,7 +36,7 @@
 
 
 /******************************************************************************
- *           RegCreateKeyExA   [ADVAPI32.130]
+ *           RegCreateKeyExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class,
                               DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, 
@@ -74,7 +74,7 @@
 
 
 /******************************************************************************
- *           RegCreateKeyA   [ADVAPI32.129]
+ *           RegCreateKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -85,7 +85,7 @@
 
 
 /******************************************************************************
- *           RegOpenKeyExA   [ADVAPI32.149]
+ *           RegOpenKeyExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, LPHKEY retkey )
 {
@@ -113,7 +113,7 @@
 
 
 /******************************************************************************
- *           RegOpenKeyA   [ADVAPI32.148]
+ *           RegOpenKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -122,7 +122,7 @@
 
 
 /******************************************************************************
- *           RegEnumKeyExA   [ADVAPI32.138]
+ *           RegEnumKeyExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_len,
                             LPDWORD reserved, LPSTR class, LPDWORD class_len, FILETIME *ft )
@@ -189,7 +189,7 @@
 
 
 /******************************************************************************
- *           RegEnumKeyA   [ADVAPI32.137]
+ *           RegEnumKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegEnumKeyA( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 {
@@ -198,7 +198,7 @@
 
 
 /******************************************************************************
- *           RegQueryInfoKeyA   [ADVAPI32.152]
+ *           RegQueryInfoKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDWORD reserved,
                                LPDWORD subkeys, LPDWORD max_subkey, LPDWORD max_class,
@@ -269,7 +269,7 @@
 
 
 /******************************************************************************
- *           RegCloseKey   [ADVAPI32.126]
+ *           RegCloseKey   [ADVAPI32.@]
  *
  * Releases the handle of the specified key
  *
@@ -288,7 +288,7 @@
 
 
 /******************************************************************************
- *           RegDeleteKeyA   [ADVAPI32.133]
+ *           RegDeleteKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name )
 {
@@ -307,7 +307,7 @@
 
 
 /******************************************************************************
- *           RegSetValueExA   [ADVAPI32.169]
+ *           RegSetValueExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
                              CONST BYTE *data, DWORD count )
@@ -346,7 +346,7 @@
 
 
 /******************************************************************************
- *           RegSetValueA   [ADVAPI32.168]
+ *           RegSetValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegSetValueA( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count )
 {
@@ -369,7 +369,7 @@
 
 
 /******************************************************************************
- *           RegQueryValueExA   [ADVAPI32.157]
+ *           RegQueryValueExA   [ADVAPI32.@]
  *
  * NOTES:
  * the documentation is wrong: if the buffer is too small it remains untouched 
@@ -459,7 +459,7 @@
 
 
 /******************************************************************************
- *           RegQueryValueA   [ADVAPI32.156]
+ *           RegQueryValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegQueryValueA( HKEY hkey, LPCSTR name, LPSTR data, LPLONG count )
 {
@@ -486,7 +486,7 @@
 
 
 /******************************************************************************
- *           RegEnumValueA   [ADVAPI32.141]
+ *           RegEnumValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_count,
                             LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count )
@@ -582,7 +582,7 @@
 
 
 /******************************************************************************
- *           RegDeleteValueA   [ADVAPI32.135]
+ *           RegDeleteValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name )
 {
@@ -602,7 +602,7 @@
 
 
 /******************************************************************************
- *           RegLoadKeyA   [ADVAPI32.184]
+ *           RegLoadKeyA   [ADVAPI32.@]
  */
 LONG WINAPI RegLoadKeyA( HKEY hkey, LPCSTR subkey, LPCSTR filename )
 {
@@ -642,7 +642,7 @@
 
 
 /******************************************************************************
- *           RegSaveKeyA   [ADVAPI32.165]
+ *           RegSaveKeyA   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey   [I] Handle of key where save begins
diff --git a/memory/selector.c b/memory/selector.c
index 12b449a..164ee53 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -233,7 +233,7 @@
 
 
 /***********************************************************************
- *           AllocCStoDSAlias   (KERNEL.170)
+ *           AllocCStoDSAlias   (KERNEL.172)
  */
 WORD WINAPI AllocCStoDSAlias16( WORD sel )
 {
@@ -517,7 +517,7 @@
  */
 
 /***********************************************************************
- *           MapSL   (KERNEL32.523)
+ *           MapSL   (KERNEL32.@)
  *
  * Maps fixed segmented pointer to linear.
  */
@@ -527,7 +527,7 @@
 }
 
 /***********************************************************************
- *           MapSLFix   (KERNEL32.524)
+ *           MapSLFix   (KERNEL32.@)
  *
  * FIXME: MapSLFix and UnMapSLFixArray should probably prevent
  * unexpected linear address change when GlobalCompact() shuffles
@@ -540,7 +540,7 @@
 }
 
 /***********************************************************************
- *           UnMapSLFixArray   (KERNEL32.701)
+ *           UnMapSLFixArray   (KERNEL32.@)
  */
 
 void WINAPI UnMapSLFixArray( SEGPTR sptr[], INT length, CONTEXT86 *context )
@@ -638,52 +638,52 @@
 }
 
 /***********************************************************************
- *		SMapLS_IP_EBP_8 (KERNEL32.601)
+ *		SMapLS_IP_EBP_8 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_8 (CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context, 8);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_12 (KERNEL32.593)
+ *		SMapLS_IP_EBP_12 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_12(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,12);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_16 (KERNEL32.594)
+ *		SMapLS_IP_EBP_16 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_16(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,16);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_20 (KERNEL32.595)
+ *		SMapLS_IP_EBP_20 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_20(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,20);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_24 (KERNEL32.596)
+ *		SMapLS_IP_EBP_24 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_24(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,24);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_28 (KERNEL32.597)
+ *		SMapLS_IP_EBP_28 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_28(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,28);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_32 (KERNEL32.598)
+ *		SMapLS_IP_EBP_32 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_32(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,32);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_36 (KERNEL32.599)
+ *		SMapLS_IP_EBP_36 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_36(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,36);}
 
 /***********************************************************************
- *		SMapLS_IP_EBP_40 (KERNEL32.600)
+ *		SMapLS_IP_EBP_40 (KERNEL32.@)
  */
 void WINAPI SMapLS_IP_EBP_40(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,40);}
 
 /***********************************************************************
- *		SMapLS (KERNEL32.592)
+ *		SMapLS (KERNEL32.@)
  */
 void WINAPI SMapLS( CONTEXT86 *context )
 {
@@ -697,7 +697,7 @@
 }
 
 /***********************************************************************
- *		SUnMapLS (KERNEL32.602)
+ *		SUnMapLS (KERNEL32.@)
  */
 
 void WINAPI SUnMapLS( CONTEXT86 *context )
@@ -716,47 +716,47 @@
 }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_8 (KERNEL32.611)
+ *		SUnMapLS_IP_EBP_8 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_8 (CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context, 8); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_12 (KERNEL32.603)
+ *		SUnMapLS_IP_EBP_12 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_12(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,12); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_16 (KERNEL32.604)
+ *		SUnMapLS_IP_EBP_16 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_16(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,16); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_20 (KERNEL32.605)
+ *		SUnMapLS_IP_EBP_20 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_20(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,20); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_24 (KERNEL32.606)
+ *		SUnMapLS_IP_EBP_24 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_24(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,24); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_28 (KERNEL32.607)
+ *		SUnMapLS_IP_EBP_28 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_28(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,28); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_32 (KERNEL32.608)
+ *		SUnMapLS_IP_EBP_32 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_32(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,32); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_36 (KERNEL32.609)
+ *		SUnMapLS_IP_EBP_36 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_36(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,36); }
 
 /***********************************************************************
- *		SUnMapLS_IP_EBP_40 (KERNEL32.610)
+ *		SUnMapLS_IP_EBP_40 (KERNEL32.@)
  */
 void WINAPI SUnMapLS_IP_EBP_40(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,40); }
 
diff --git a/memory/string.c b/memory/string.c
index 3ee7044..33d01a0 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -49,7 +49,7 @@
 
 
 /***********************************************************************
- *           lstrcatA   (KERNEL32.599)
+ *           lstrcatA   (KERNEL32.@)
  */
 LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src )
 {
@@ -68,7 +68,7 @@
 
 
 /***********************************************************************
- *           lstrcatW   (KERNEL32.600)
+ *           lstrcatW   (KERNEL32.@)
  */
 LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src )
 {
@@ -129,7 +129,7 @@
 
 
 /***********************************************************************
- *           lstrcmpiA   (KERNEL32.605)
+ *           lstrcmpiA   (KERNEL32.@)
  */
 INT WINAPI lstrcmpiA( LPCSTR str1, LPCSTR str2 )
 {    TRACE("strcmpi %s and %s\n",
@@ -139,7 +139,7 @@
 
 
 /***********************************************************************
- *           lstrcmpiW   (KERNEL32.606)
+ *           lstrcmpiW   (KERNEL32.@)
  */
 INT WINAPI lstrcmpiW( LPCWSTR str1, LPCWSTR str2 )
 {
@@ -162,7 +162,7 @@
 
 
 /***********************************************************************
- *           lstrcpyA   (KERNEL32.608)
+ *           lstrcpyA   (KERNEL32.@)
  */
 LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src )
 {
@@ -183,7 +183,7 @@
 
 
 /***********************************************************************
- *           lstrcpyW   (KERNEL32.609)
+ *           lstrcpyW   (KERNEL32.@)
  */
 LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src )
 {
@@ -212,7 +212,7 @@
 
 
 /***********************************************************************
- *           lstrcpynA   (KERNEL32.611)
+ *           lstrcpynA   (KERNEL32.@)
  * Note: this function differs from the UNIX strncpy, it _always_ writes
  * a terminating \0
  */
@@ -235,7 +235,7 @@
 
 
 /***********************************************************************
- *           lstrcpynW   (KERNEL32.612)
+ *           lstrcpynW   (KERNEL32.@)
  * Note: this function differs from the UNIX strncpy, it _always_ writes
  * a terminating \0
  */
@@ -267,7 +267,7 @@
 
 
 /***********************************************************************
- *           lstrlenA   (KERNEL32.614)
+ *           lstrlenA   (KERNEL32.@)
  */
 INT WINAPI lstrlenA( LPCSTR str )
 {
@@ -287,7 +287,7 @@
 
 
 /***********************************************************************
- *           lstrlenW   (KERNEL32.615)
+ *           lstrlenW   (KERNEL32.@)
  */
 INT WINAPI lstrlenW( LPCWSTR str )
 {
diff --git a/memory/virtual.c b/memory/virtual.c
index 2a6c8ae..68902c7 100644
--- a/memory/virtual.c
+++ b/memory/virtual.c
@@ -700,7 +700,7 @@
 
 
 /***********************************************************************
- *             VirtualAlloc   (KERNEL32.548)
+ *             VirtualAlloc   (KERNEL32.@)
  * Reserves or commits a region of pages in virtual address space
  *
  * RETURNS
@@ -833,7 +833,7 @@
 
 
 /***********************************************************************
- *             VirtualAllocEx   (KERNEL32.548)
+ *             VirtualAllocEx   (KERNEL32.@)
  *
  * Seems to be just as VirtualAlloc, but with process handle.
  */
@@ -852,7 +852,7 @@
 
 
 /***********************************************************************
- *             VirtualFree   (KERNEL32.550)
+ *             VirtualFree   (KERNEL32.@)
  * Release or decommits a region of pages in virtual address space.
  * 
  * RETURNS
@@ -914,7 +914,7 @@
 
 
 /***********************************************************************
- *             VirtualLock   (KERNEL32.551)
+ *             VirtualLock   (KERNEL32.@)
  * Locks the specified region of virtual address space
  * 
  * NOTE
@@ -933,7 +933,7 @@
 
 
 /***********************************************************************
- *             VirtualUnlock   (KERNEL32.556)
+ *             VirtualUnlock   (KERNEL32.@)
  * Unlocks a range of pages in the virtual address space
  *
  * NOTE
@@ -952,7 +952,7 @@
 
 
 /***********************************************************************
- *             VirtualProtect   (KERNEL32.552)
+ *             VirtualProtect   (KERNEL32.@)
  * Changes the access protection on a region of committed pages
  *
  * RETURNS
@@ -1005,7 +1005,7 @@
 
 
 /***********************************************************************
- *             VirtualProtectEx   (KERNEL32.553)
+ *             VirtualProtectEx   (KERNEL32.@)
  * Changes the access protection on a region of committed pages in the
  * virtual address space of a specified process
  *
@@ -1028,7 +1028,7 @@
 
 
 /***********************************************************************
- *             VirtualQuery   (KERNEL32.554)
+ *             VirtualQuery   (KERNEL32.@)
  * Provides info about a range of pages in virtual address space
  *
  * RETURNS
@@ -1104,7 +1104,7 @@
 
 
 /***********************************************************************
- *             VirtualQueryEx   (KERNEL32.555)
+ *             VirtualQueryEx   (KERNEL32.@)
  * Provides info about a range of pages in virtual address space of a
  * specified process
  *
@@ -1125,7 +1125,7 @@
 
 
 /***********************************************************************
- *             IsBadReadPtr   (KERNEL32.354)
+ *             IsBadReadPtr   (KERNEL32.@)
  *
  * RETURNS
  *	FALSE: Process has read access to entire block
@@ -1158,7 +1158,7 @@
 
 
 /***********************************************************************
- *             IsBadWritePtr   (KERNEL32.357)
+ *             IsBadWritePtr   (KERNEL32.@)
  *
  * RETURNS
  *	FALSE: Process has write access to entire block
@@ -1190,7 +1190,7 @@
 
 
 /***********************************************************************
- *             IsBadHugeReadPtr   (KERNEL32.352)
+ *             IsBadHugeReadPtr   (KERNEL32.@)
  * RETURNS
  *	FALSE: Process has read access to entire block
  *      TRUE: Otherwise
@@ -1204,7 +1204,7 @@
 
 
 /***********************************************************************
- *             IsBadHugeWritePtr   (KERNEL32.353)
+ *             IsBadHugeWritePtr   (KERNEL32.@)
  * RETURNS
  *	FALSE: Process has write access to entire block
  *      TRUE: Otherwise
@@ -1218,7 +1218,7 @@
 
 
 /***********************************************************************
- *             IsBadCodePtr   (KERNEL32.351)
+ *             IsBadCodePtr   (KERNEL32.@)
  *
  * RETURNS
  *	FALSE: Process has read access to specified memory
@@ -1231,7 +1231,7 @@
 
 
 /***********************************************************************
- *             IsBadStringPtrA   (KERNEL32.355)
+ *             IsBadStringPtrA   (KERNEL32.@)
  *
  * RETURNS
  *	FALSE: Read access to all bytes in string
@@ -1253,7 +1253,7 @@
 
 
 /***********************************************************************
- *             IsBadStringPtrW   (KERNEL32.356)
+ *             IsBadStringPtrW   (KERNEL32.@)
  * See IsBadStringPtrA
  */
 BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max )
@@ -1270,7 +1270,7 @@
 
 
 /***********************************************************************
- *             CreateFileMappingA   (KERNEL32.46)
+ *             CreateFileMappingA   (KERNEL32.@)
  * Creates a named or unnamed file-mapping object for the specified file
  *
  * RETURNS
@@ -1334,7 +1334,7 @@
 
 
 /***********************************************************************
- *             CreateFileMappingW   (KERNEL32.47)
+ *             CreateFileMappingW   (KERNEL32.@)
  * See CreateFileMappingA
  */
 HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, 
@@ -1390,7 +1390,7 @@
 
 
 /***********************************************************************
- *             OpenFileMappingA   (KERNEL32.397)
+ *             OpenFileMappingA   (KERNEL32.@)
  * Opens a named file-mapping object.
  *
  * RETURNS
@@ -1423,7 +1423,7 @@
 
 
 /***********************************************************************
- *             OpenFileMappingW   (KERNEL32.398)
+ *             OpenFileMappingW   (KERNEL32.@)
  * See OpenFileMappingA
  */
 HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name)
@@ -1449,7 +1449,7 @@
 
 
 /***********************************************************************
- *             MapViewOfFile   (KERNEL32.385)
+ *             MapViewOfFile   (KERNEL32.@)
  * Maps a view of a file into the address space
  *
  * RETURNS
@@ -1469,7 +1469,7 @@
 
 
 /***********************************************************************
- *             MapViewOfFileEx   (KERNEL32.386)
+ *             MapViewOfFileEx   (KERNEL32.@)
  * Maps a view of a file into the address space
  *
  * RETURNS
@@ -1612,7 +1612,7 @@
 
 
 /***********************************************************************
- *             FlushViewOfFile   (KERNEL32.262)
+ *             FlushViewOfFile   (KERNEL32.@)
  * Writes to the disk a byte range within a mapped view of a file
  *
  * RETURNS
@@ -1642,7 +1642,7 @@
 
 
 /***********************************************************************
- *             UnmapViewOfFile   (KERNEL32.540)
+ *             UnmapViewOfFile   (KERNEL32.@)
  * Unmaps a mapped view of a file.
  *
  * NOTES
diff --git a/misc/cpu.c b/misc/cpu.c
index 227f7f4..dc11293 100644
--- a/misc/cpu.c
+++ b/misc/cpu.c
@@ -21,7 +21,7 @@
 static BYTE PF[64] = {0,};
 
 /***********************************************************************
- * 			GetSystemInfo            	[KERNEL32.404]
+ * 			GetSystemInfo            	[KERNEL32.@]
  *
  * Gets the current system information.
  *
@@ -220,7 +220,7 @@
 
 
 /***********************************************************************
- * 			IsProcessorFeaturePresent	[KERNEL32.880]
+ * 			IsProcessorFeaturePresent	[KERNEL32.@]
  * RETURNS:
  *	TRUE if processorfeature present
  *	FALSE otherwise
diff --git a/misc/lstr.c b/misc/lstr.c
index 5b674db..d16ca0a 100644
--- a/misc/lstr.c
+++ b/misc/lstr.c
@@ -29,7 +29,8 @@
 extern const WORD OLE2NLS_CT_CType3_LUT[]; /* FIXME: does not belong here */
 
 /***********************************************************************
- *           IsCharAlphaA   (USER.433) (USER32.331)
+ *           IsCharAlphaA   (USER.433)
+ *           IsCharAlphaA   (USER32.@)
  * FIXME: handle current locale
  */
 BOOL WINAPI IsCharAlphaA(CHAR x)
@@ -38,7 +39,8 @@
 }
 
 /***********************************************************************
- *           IsCharAlphaNumericA   (USER.434) (USER32.332)
+ *           IsCharAlphaNumericA   (USER.434)
+ *           IsCharAlphaNumericA   (USER32.@)
  * FIXME: handle current locale
  */
 BOOL WINAPI IsCharAlphaNumericA(CHAR x)
diff --git a/misc/main.c b/misc/main.c
index 90998ea..d4a8812 100644
--- a/misc/main.c
+++ b/misc/main.c
@@ -28,7 +28,7 @@
 
 
 /***********************************************************************
- *           Beep   (KERNEL32.11)
+ *           Beep   (KERNEL32.@)
  */
 BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur )
 {
@@ -49,7 +49,9 @@
 }
 
 /***********************************************************************
- *           GetTickCount   (USER.13) (KERNEL32.299)
+ *           GetTickCount   (USER.13)
+ *           GetCurrentTime (USER.15)
+ *           GetTickCount   (KERNEL32.@)
  *
  * Returns the number of milliseconds, modulo 2^32, since the start
  * of the wineserver.
diff --git a/misc/registry.c b/misc/registry.c
index 5efb3c1..1cc3ddb 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -1574,7 +1574,8 @@
 /***************************************************************************/
 
 /******************************************************************************
- * RegFlushKey [KERNEL.227] [ADVAPI32.@]
+ * RegFlushKey [KERNEL.227]
+ * RegFlushKey [ADVAPI32.@]
  * Immediately writes key to registry.
  * Only returns after data has been written to disk.
  *
@@ -1667,7 +1668,8 @@
 }
 
 /******************************************************************************
- *           RegEnumKey16   [KERNEL.216] [SHELL.7]
+ *           RegEnumKey16   [KERNEL.216]
+ *           RegEnumKey16   [SHELL.7]
  */
 DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 {
@@ -1676,7 +1678,8 @@
 }
 
 /******************************************************************************
- *           RegOpenKey16   [KERNEL.217] [SHELL.1]
+ *           RegOpenKey16   [KERNEL.217]
+ *           RegOpenKey16   [SHELL.1]
  */
 DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -1685,7 +1688,8 @@
 }
 
 /******************************************************************************
- *           RegCreateKey16   [KERNEL.218] [SHELL.2]
+ *           RegCreateKey16   [KERNEL.218]
+ *           RegCreateKey16   [SHELL.2]
  */
 DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -1694,7 +1698,8 @@
 }
 
 /******************************************************************************
- *           RegDeleteKey16   [KERNEL.219] [SHELL.4]
+ *           RegDeleteKey16   [KERNEL.219]
+ *           RegDeleteKey16   [SHELL.4]
  */
 DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name )
 {
@@ -1703,7 +1708,8 @@
 }
 
 /******************************************************************************
- *           RegCloseKey16   [KERNEL.220] [SHELL.3]
+ *           RegCloseKey16   [KERNEL.220]
+ *           RegCloseKey16   [SHELL.3]
  */
 DWORD WINAPI RegCloseKey16( HKEY hkey )
 {
@@ -1712,7 +1718,8 @@
 }
 
 /******************************************************************************
- *           RegSetValue16   [KERNEL.221] [SHELL.5]
+ *           RegSetValue16   [KERNEL.221]
+ *           RegSetValue16   [SHELL.5]
  */
 DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count )
 {
@@ -1740,7 +1747,8 @@
 }
 
 /******************************************************************************
- *           RegQueryValue16   [KERNEL.224] [SHELL.6]
+ *           RegQueryValue16   [KERNEL.224]
+ *           RegQueryValue16   [SHELL.6]
  *
  * NOTES
  *    Is this HACK still applicable?
diff --git a/misc/version.c b/misc/version.c
index 807f434..6d081ab 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -381,7 +381,7 @@
 
 
 /***********************************************************************
- *         GetVersion   (KERNEL32.427)
+ *         GetVersion   (KERNEL32.@)
  */
 LONG WINAPI GetVersion(void)
 {
@@ -412,7 +412,7 @@
 
 
 /***********************************************************************
- *         GetVersionExA   (KERNEL32.428)
+ *         GetVersionExA   (KERNEL32.@)
  */
 BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v)
 {
@@ -434,7 +434,7 @@
 
 
 /***********************************************************************
- *         GetVersionExW   (KERNEL32.429)
+ *         GetVersionExW   (KERNEL32.@)
  */
 BOOL WINAPI GetVersionExW(OSVERSIONINFOW *v)
 {
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index 67fa333..8067324 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -725,7 +725,7 @@
 }
 
 /******************************************************************************
- *		SetLocaleInfoA	[KERNEL32.656]
+ *		SetLocaleInfoA	[KERNEL32.@]
  */
 BOOL WINAPI SetLocaleInfoA(DWORD lcid, DWORD lctype, LPCSTR data)
 {
@@ -755,7 +755,7 @@
 }
 
 /******************************************************************************
- *		IsValidLocale	[KERNEL32.489]
+ *		IsValidLocale	[KERNEL32.@]
  */
 BOOL WINAPI IsValidLocale(LCID lcid,DWORD flags)
 {
@@ -778,7 +778,7 @@
 }
 
 /******************************************************************************
- *		EnumSystemLocalesW	[KERNEL32.209]
+ *		EnumSystemLocalesW	[KERNEL32.@]
  */
 BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum,
                                     DWORD flags )
@@ -802,7 +802,7 @@
 }
 
 /******************************************************************************
- *		EnumSystemLocalesA	[KERNEL32.208]
+ *		EnumSystemLocalesA	[KERNEL32.@]
  */
 BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA lpfnLocaleEnum,
                                    DWORD flags)
@@ -1335,7 +1335,7 @@
 };
 
 /******************************************************************************
- *		GetStringTypeA	[KERNEL32.396]
+ *		GetStringTypeA	[KERNEL32.@]
  */
 BOOL WINAPI GetStringTypeA(LCID locale,DWORD dwInfoType,LPCSTR src,
                                INT cchSrc,LPWORD chartype)
@@ -1344,7 +1344,7 @@
 }
 
 /******************************************************************************
- *		GetStringTypeExA	[KERNEL32.397]
+ *		GetStringTypeExA	[KERNEL32.@]
  *
  * FIXME: Ignores the locale.
  */
@@ -1402,7 +1402,8 @@
 }
 
 /***********************************************************************
- *           VerLanguageNameA              [KERNEL32.709][VERSION.9]
+ *           VerLanguageNameA              [KERNEL32.@]
+ *           VerLanguageNameA              [VERSION.9]
  */
 DWORD WINAPI VerLanguageNameA( UINT wLang, LPSTR szLang, UINT nSize )
 {
@@ -1413,7 +1414,8 @@
 }
 
 /***********************************************************************
- *           VerLanguageNameW              [KERNEL32.710][VERSION.10]
+ *           VerLanguageNameW              [KERNEL32.@]
+ *           VerLanguageNameW              [VERSION.10]
  */
 DWORD WINAPI VerLanguageNameW( UINT wLang, LPWSTR szLang, UINT nSize )
 {
@@ -1857,7 +1859,7 @@
 }
 
 /*************************************************************************
- *              LCMapStringA                [KERNEL32.492]
+ *              LCMapStringA                [KERNEL32.@]
  *
  * Convert a string, or generate a sort key from it.
  *
@@ -2119,7 +2121,7 @@
 }
 		     
 /*************************************************************************
- *              LCMapStringW                [KERNEL32.493]
+ *              LCMapStringW                [KERNEL32.@]
  *
  * Convert a string, or generate a sort key from it.
  *
@@ -2438,7 +2440,7 @@
 }
 
 /******************************************************************************
- *		CompareStringA	[KERNEL32.143]
+ *		CompareStringA	[KERNEL32.@]
  * Compares two strings using locale
  *
  * RETURNS
@@ -2520,7 +2522,7 @@
 }
 
 /******************************************************************************
- *		CompareStringW	[KERNEL32.144]
+ *		CompareStringW	[KERNEL32.@]
  * This implementation ignores the locale
  * FIXME :  Does only string sort.  Should
  * be reimplemented the same way as CompareStringA.
@@ -3024,7 +3026,7 @@
 
 
 /******************************************************************************
- *		GetDateFormatA	[KERNEL32.310]
+ *		GetDateFormatA	[KERNEL32.@]
  * Makes an ASCII string of the date
  *
  * This function uses format to format the date,  or,  if format
@@ -3113,7 +3115,7 @@
 }
 
 /******************************************************************************
- *		GetDateFormatW	[KERNEL32.311]
+ *		GetDateFormatW	[KERNEL32.@]
  * Makes a Unicode string of the date
  *
  * Acts the same as GetDateFormatA(),  except that it's Unicode.
@@ -3135,7 +3137,7 @@
 }
 
 /**************************************************************************
- *              EnumDateFormatsA	(KERNEL32.198)
+ *              EnumDateFormatsA	(KERNEL32.@)
  */
 BOOL WINAPI EnumDateFormatsA(
   DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale,  DWORD dwFlags)
@@ -3400,7 +3402,7 @@
 }
 
 /**************************************************************************
- *              EnumDateFormatsW	(KERNEL32.199)
+ *              EnumDateFormatsW	(KERNEL32.@)
  */
 BOOL WINAPI EnumDateFormatsW(
   DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags)
@@ -3411,7 +3413,7 @@
 }
 
 /**************************************************************************
- *              EnumTimeFormatsA	(KERNEL32.210)
+ *              EnumTimeFormatsA	(KERNEL32.@)
  */
 BOOL WINAPI EnumTimeFormatsA(
   TIMEFMT_ENUMPROCA lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags)
@@ -3482,7 +3484,7 @@
 }
 
 /**************************************************************************
- *              EnumTimeFormatsW	(KERNEL32.211)
+ *              EnumTimeFormatsW	(KERNEL32.@)
  */
 BOOL WINAPI EnumTimeFormatsW(
   TIMEFMT_ENUMPROCW lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags)
@@ -3612,7 +3614,7 @@
 }
 
 /**************************************************************************
- *              GetNumberFormatA	(KERNEL32.355)
+ *              GetNumberFormatA	(KERNEL32.@)
  */
 INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
 			       LPCSTR lpvalue,   const NUMBERFMTA * lpFormat,
@@ -3870,7 +3872,7 @@
 }
 
 /**************************************************************************
- *              GetCurrencyFormatA	(KERNEL32.302)
+ *              GetCurrencyFormatA	(KERNEL32.@)
  */
 INT WINAPI GetCurrencyFormatA(LCID locale, DWORD dwflags,
 			       LPCSTR lpvalue,   const CURRENCYFMTA * lpFormat,
@@ -4111,7 +4113,7 @@
 }
 
 /**************************************************************************
- *              GetCurrencyFormatW	(KERNEL32.303)
+ *              GetCurrencyFormatW	(KERNEL32.@)
  */
 INT WINAPI GetCurrencyFormatW(LCID locale, DWORD dwflags,
 			       LPCWSTR lpvalue,   const CURRENCYFMTW * lpFormat,
@@ -4141,7 +4143,7 @@
 	}
 }
 /******************************************************************************
- *		GetTimeFormatA	[KERNEL32.422]
+ *		GetTimeFormatA	[KERNEL32.@]
  * Makes an ASCII string of the time
  *
  * Formats date according to format,  or locale default if format is
@@ -4204,7 +4206,7 @@
 
 
 /******************************************************************************
- *		GetTimeFormatW	[KERNEL32.423]
+ *		GetTimeFormatW	[KERNEL32.@]
  * Makes a Unicode string of the time
  */
 INT WINAPI 
@@ -4252,7 +4254,7 @@
 }
 
 /******************************************************************************
- *		EnumCalendarInfoA	[KERNEL32.196]
+ *		EnumCalendarInfoA	[KERNEL32.@]
  */
 BOOL WINAPI EnumCalendarInfoA(
 	CALINFO_ENUMPROCA calinfoproc,LCID locale,CALID calendar,CALTYPE caltype
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index 7645ea0..e38ac06 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -21,7 +21,7 @@
 DECLARE_DEBUG_CHANNEL(relay);
 
 /***********************************************************************
- *           InitializeCriticalSection   (KERNEL32.472)
+ *           InitializeCriticalSection   (KERNEL32.@)
  */
 void WINAPI InitializeCriticalSection( CRITICAL_SECTION *crit )
 {
@@ -53,7 +53,7 @@
 }
 
 /***********************************************************************
- *           MakeCriticalSectionGlobal   (KERNEL32.515)
+ *           MakeCriticalSectionGlobal   (KERNEL32.@)
  */
 void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit )
 {
@@ -65,7 +65,7 @@
 
 
 /***********************************************************************
- *           ReinitializeCriticalSection   (KERNEL32.581)
+ *           ReinitializeCriticalSection   (KERNEL32.@)
  */
 void WINAPI ReinitializeCriticalSection( CRITICAL_SECTION *crit )
 {
@@ -75,7 +75,7 @@
 
 
 /***********************************************************************
- *           UninitializeCriticalSection   (KERNEL32.703)
+ *           UninitializeCriticalSection   (KERNEL32.@)
  */
 void WINAPI UninitializeCriticalSection( CRITICAL_SECTION *crit )
 {
diff --git a/scheduler/handle.c b/scheduler/handle.c
index 81d4672..bbdaed9 100644
--- a/scheduler/handle.c
+++ b/scheduler/handle.c
@@ -36,7 +36,7 @@
 
 
 /*********************************************************************
- *           GetHandleInformation   (KERNEL32.336)
+ *           GetHandleInformation   (KERNEL32.@)
  */
 BOOL WINAPI GetHandleInformation( HANDLE handle, LPDWORD flags )
 {
@@ -56,7 +56,7 @@
 
 
 /*********************************************************************
- *           SetHandleInformation   (KERNEL32.653)
+ *           SetHandleInformation   (KERNEL32.@)
  */
 BOOL WINAPI SetHandleInformation( HANDLE handle, DWORD mask, DWORD flags )
 {
@@ -75,7 +75,7 @@
 
 
 /*********************************************************************
- *           DuplicateHandle   (KERNEL32.192)
+ *           DuplicateHandle   (KERNEL32.@)
  */
 BOOL WINAPI DuplicateHandle( HANDLE source_process, HANDLE source,
                                HANDLE dest_process, HANDLE *dest,
diff --git a/scheduler/pipe.c b/scheduler/pipe.c
index fd502f9..f7c7b48 100644
--- a/scheduler/pipe.c
+++ b/scheduler/pipe.c
@@ -11,7 +11,7 @@
 
 
 /***********************************************************************
- *	CreatePipe    (KERNEL32.170)
+ *	CreatePipe    (KERNEL32.@)
  */
 BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe,
                           LPSECURITY_ATTRIBUTES sa, DWORD size )
diff --git a/scheduler/process.c b/scheduler/process.c
index 85be03f..9178849 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -893,7 +893,7 @@
 }
 
 /******************************************************************************
- *           TerminateProcess   (KERNEL32.684)
+ *           TerminateProcess   (KERNEL32.@)
  */
 BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code )
 {
@@ -1026,7 +1026,7 @@
 
 
 /*********************************************************************
- *           OpenProcess   (KERNEL32.543)
+ *           OpenProcess   (KERNEL32.@)
  */
 HANDLE WINAPI OpenProcess( DWORD access, BOOL inherit, DWORD id )
 {
@@ -1109,7 +1109,7 @@
 }
 
 /**********************************************************************
- *          GetProcessAffinityMask    (KERNEL32.373)
+ *          GetProcessAffinityMask    (KERNEL32.@)
  */
 BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess,
                                       LPDWORD lpProcessAffinityMask,
@@ -1160,7 +1160,7 @@
 
 
 /***********************************************************************
- *		SetProcessWorkingSetSize	[KERNEL32.662]
+ *		SetProcessWorkingSetSize	[KERNEL32.@]
  * Sets the min/max working set sizes for a specified process.
  *
  * PARAMS
@@ -1364,7 +1364,7 @@
 }
 
 /***********************************************************************
- * GetExitCodeProcess [KERNEL32.325]
+ * GetExitCodeProcess [KERNEL32.@]
  *
  * Gets termination status of specified process
  * 
diff --git a/scheduler/synchro.c b/scheduler/synchro.c
index 0add600..fdff105 100644
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@@ -244,7 +244,7 @@
 }
 
 /***********************************************************************
- *              Sleep  (KERNEL32.679)
+ *              Sleep  (KERNEL32.@)
  */
 VOID WINAPI Sleep( DWORD timeout )
 {
@@ -252,7 +252,7 @@
 }
 
 /******************************************************************************
- *              SleepEx   (KERNEL32.680)
+ *              SleepEx   (KERNEL32.@)
  */
 DWORD WINAPI SleepEx( DWORD timeout, BOOL alertable )
 {
@@ -263,7 +263,7 @@
 
 
 /***********************************************************************
- *           WaitForSingleObject   (KERNEL32.723)
+ *           WaitForSingleObject   (KERNEL32.@)
  */
 DWORD WINAPI WaitForSingleObject( HANDLE handle, DWORD timeout )
 {
@@ -272,7 +272,7 @@
 
 
 /***********************************************************************
- *           WaitForSingleObjectEx   (KERNEL32.724)
+ *           WaitForSingleObjectEx   (KERNEL32.@)
  */
 DWORD WINAPI WaitForSingleObjectEx( HANDLE handle, DWORD timeout,
                                     BOOL alertable )
@@ -282,7 +282,7 @@
 
 
 /***********************************************************************
- *           WaitForMultipleObjects   (KERNEL32.721)
+ *           WaitForMultipleObjects   (KERNEL32.@)
  */
 DWORD WINAPI WaitForMultipleObjects( DWORD count, const HANDLE *handles,
                                      BOOL wait_all, DWORD timeout )
@@ -292,7 +292,7 @@
 
 
 /***********************************************************************
- *           WaitForMultipleObjectsEx   (KERNEL32.722)
+ *           WaitForMultipleObjectsEx   (KERNEL32.@)
  */
 DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
                                        BOOL wait_all, DWORD timeout,
diff --git a/scheduler/syslevel.c b/scheduler/syslevel.c
index 19b7b76..7264a81 100644
--- a/scheduler/syslevel.c
+++ b/scheduler/syslevel.c
@@ -56,7 +56,8 @@
 }
 
 /************************************************************************
- *           _EnterSysLevel    (KERNEL32.97) (KERNEL.439)
+ *           _EnterSysLevel    (KERNEL32.97)
+ *           _EnterSysLevel    (KERNEL.439)
  */
 VOID WINAPI _EnterSysLevel(SYSLEVEL *lock)
 {
@@ -88,7 +89,8 @@
 }
 
 /************************************************************************
- *           _LeaveSysLevel    (KERNEL32.98) (KERNEL.440)
+ *           _LeaveSysLevel    (KERNEL32.98)
+ *           _LeaveSysLevel    (KERNEL.440)
  */
 VOID WINAPI _LeaveSysLevel(SYSLEVEL *lock)
 {
@@ -126,7 +128,8 @@
 }
 
 /************************************************************************
- *           _ConfirmSysLevel    (KERNEL32.95) (KERNEL.436)
+ *           _ConfirmSysLevel    (KERNEL32.95)
+ *           _ConfirmSysLevel    (KERNEL.436)
  */
 DWORD WINAPI _ConfirmSysLevel(SYSLEVEL *lock)
 {
@@ -137,7 +140,8 @@
 }
 
 /************************************************************************
- *           _CheckNotSysLevel    (KERNEL32.94) (KERNEL.437)
+ *           _CheckNotSysLevel    (KERNEL32.94)
+ *           _CheckNotSysLevel    (KERNEL.437)
  */
 VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock)
 {
diff --git a/scheduler/thread.c b/scheduler/thread.c
index cf84b50..2e24959 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -358,7 +358,7 @@
 
 
 /***********************************************************************
- * ExitThread [KERNEL32.215]  Ends a thread
+ * ExitThread [KERNEL32.@]  Ends a thread
  *
  * RETURNS
  *    None
@@ -391,7 +391,7 @@
 
 
 /***********************************************************************
- * SetThreadContext [KERNEL32.670]  Sets context of thread.
+ * SetThreadContext [KERNEL32.@]  Sets context of thread.
  *
  * RETURNS
  *    Success: TRUE
@@ -484,7 +484,7 @@
 
 
 /**********************************************************************
- * GetThreadPriorityBoost [KERNEL32.877]  Returns priority boost for thread.
+ * GetThreadPriorityBoost [KERNEL32.@]  Returns priority boost for thread.
  *
  * Always reports that priority boost is disabled.
  *
@@ -502,7 +502,7 @@
 
 
 /**********************************************************************
- * SetThreadPriorityBoost [KERNEL32.893]  Sets priority boost for thread.
+ * SetThreadPriorityBoost [KERNEL32.@]  Sets priority boost for thread.
  *
  * Priority boost is not implemented. Thsi function always returns 
  * FALSE and sets last error to ERROR_CALL_NOT_IMPLEMENTED
@@ -520,7 +520,7 @@
 
 
 /**********************************************************************
- *           SetThreadAffinityMask   (KERNEL32.669)
+ *           SetThreadAffinityMask   (KERNEL32.@)
  */
 DWORD WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD dwThreadAffinityMask )
 {
@@ -539,7 +539,7 @@
 
 
 /**********************************************************************
- * TerminateThread [KERNEL32.685]  Terminates a thread
+ * TerminateThread [KERNEL32.@]  Terminates a thread
  *
  * RETURNS
  *    Success: TRUE
@@ -582,7 +582,7 @@
 
 
 /**********************************************************************
- * ResumeThread [KERNEL32.587]  Resumes a thread.
+ * ResumeThread [KERNEL32.@]  Resumes a thread.
  *
  * Decrements a thread's suspend count.  When count is zero, the
  * execution of the thread is resumed.
@@ -607,7 +607,7 @@
 
 
 /**********************************************************************
- * SuspendThread [KERNEL32.681]  Suspends a thread.
+ * SuspendThread [KERNEL32.@]  Suspends a thread.
  *
  * RETURNS
  *    Success: Previous suspend count
@@ -628,7 +628,7 @@
 
 
 /***********************************************************************
- *              QueueUserAPC  (KERNEL32.566)
+ *              QueueUserAPC  (KERNEL32.@)
  */
 DWORD WINAPI QueueUserAPC( PAPCFUNC func, HANDLE hthread, ULONG_PTR data )
 {
@@ -698,7 +698,7 @@
 
 
 /**********************************************************************
- * SetThreadLocale [KERNEL32.671]  Sets the calling threads current locale.
+ * SetThreadLocale [KERNEL32.@]  Sets the calling threads current locale.
  *
  * RETURNS
  *    Success: TRUE
diff --git a/scheduler/timer.c b/scheduler/timer.c
index 711509f..bc4119f 100644
--- a/scheduler/timer.c
+++ b/scheduler/timer.c
@@ -14,7 +14,7 @@
 
 
 /***********************************************************************
- *           CreateWaitableTimerA    (KERNEL32.861)
+ *           CreateWaitableTimerA    (KERNEL32.@)
  */
 HANDLE WINAPI CreateWaitableTimerA( SECURITY_ATTRIBUTES *sa, BOOL manual, LPCSTR name )
 {
@@ -40,7 +40,7 @@
 
 
 /***********************************************************************
- *           CreateWaitableTimerW    (KERNEL32.862)
+ *           CreateWaitableTimerW    (KERNEL32.@)
  */
 HANDLE WINAPI CreateWaitableTimerW( SECURITY_ATTRIBUTES *sa, BOOL manual, LPCWSTR name )
 {
@@ -66,7 +66,7 @@
 
 
 /***********************************************************************
- *           OpenWaitableTimerA    (KERNEL32.881)
+ *           OpenWaitableTimerA    (KERNEL32.@)
  */
 HANDLE WINAPI OpenWaitableTimerA( DWORD access, BOOL inherit, LPCSTR name )
 {
@@ -91,7 +91,7 @@
 
 
 /***********************************************************************
- *           OpenWaitableTimerW    (KERNEL32.882)
+ *           OpenWaitableTimerW    (KERNEL32.@)
  */
 HANDLE WINAPI OpenWaitableTimerW( DWORD access, BOOL inherit, LPCWSTR name )
 {
@@ -116,7 +116,7 @@
 
 
 /***********************************************************************
- *           SetWaitableTimer    (KERNEL32.894)
+ *           SetWaitableTimer    (KERNEL32.@)
  */
 BOOL WINAPI SetWaitableTimer( HANDLE handle, const LARGE_INTEGER *when, LONG period,
                               PTIMERAPCROUTINE callback, LPVOID arg, BOOL resume )
@@ -158,7 +158,7 @@
 
 
 /***********************************************************************
- *           CancelWaitableTimer    (KERNEL32.857)
+ *           CancelWaitableTimer    (KERNEL32.@)
  */
 BOOL WINAPI CancelWaitableTimer( HANDLE handle )
 {
diff --git a/win32/console.c b/win32/console.c
index fcafa2a..91b1541 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -405,7 +405,7 @@
 
 
 /******************************************************************************
- * GenerateConsoleCtrlEvent [KERNEL32.275] Simulate a CTRL-C or CTRL-BREAK
+ * GenerateConsoleCtrlEvent [KERNEL32.@] Simulate a CTRL-C or CTRL-BREAK
  *
  * PARAMS
  *    dwCtrlEvent        [I] Type of event
@@ -440,7 +440,7 @@
 
 
 /******************************************************************************
- * CreateConsoleScreenBuffer [KERNEL32.151]  Creates a console screen buffer
+ * CreateConsoleScreenBuffer [KERNEL32.@]  Creates a console screen buffer
  *
  * PARAMS
  *    dwDesiredAccess    [I] Access flag
@@ -489,7 +489,7 @@
 
 
 /******************************************************************************
- * SetConsoleActiveScreenBuffer [KERNEL32.623]  Sets buffer to current console
+ * SetConsoleActiveScreenBuffer [KERNEL32.@]  Sets buffer to current console
  *
  * RETURNS
  *    Success: TRUE
@@ -545,7 +545,7 @@
 
 
 /***********************************************************************
- *            FreeConsole (KERNEL32.267)
+ *            FreeConsole (KERNEL32.@)
  */
 BOOL WINAPI FreeConsole(VOID)
 {
@@ -651,7 +651,7 @@
 
 
 /***********************************************************************
- *            AllocConsole (KERNEL32.103)
+ *            AllocConsole (KERNEL32.@)
  *
  * creates an xterm with a pty to our program
  */
@@ -695,7 +695,7 @@
 
 
 /******************************************************************************
- * GetConsoleCP [KERNEL32.295]  Returns the OEM code page for the console
+ * GetConsoleCP [KERNEL32.@]  Returns the OEM code page for the console
  *
  * RETURNS
  *    Code page code
@@ -732,7 +732,7 @@
 
 
 /******************************************************************************
- * SetConsoleMode [KERNEL32.628]  Sets input mode of console's input buffer
+ * SetConsoleMode [KERNEL32.@]  Sets input mode of console's input buffer
  *
  * PARAMS
  *    hcon [I] Handle to console input or screen buffer
@@ -757,7 +757,7 @@
 
 
 /******************************************************************************
- * SetConsoleOutputCP [KERNEL32.629]  Set the output codepage used by the console
+ * SetConsoleOutputCP [KERNEL32.@]  Set the output codepage used by the console
  *
  * PARAMS
  *    cp [I] code page to set
@@ -826,7 +826,7 @@
 
 
 /***********************************************************************
- *            WriteConsoleA   (KERNEL32.729)
+ *            WriteConsoleA   (KERNEL32.@)
  */
 BOOL WINAPI WriteConsoleA( HANDLE hConsoleOutput,
                                LPCVOID lpBuffer,
@@ -847,7 +847,7 @@
 #define SADD(s) { char *x=s;while (*x) {CADD(*x);x++;}}
 
 /***********************************************************************
- *            WriteConsoleOutputA   (KERNEL32.732)
+ *            WriteConsoleOutputA   (KERNEL32.@)
  */
 BOOL WINAPI WriteConsoleOutputA( HANDLE hConsoleOutput,
                                      LPCHAR_INFO lpBuffer,
@@ -1068,7 +1068,7 @@
 
 
 /******************************************************************************
- * ReadConsoleInputA [KERNEL32.569]  Reads data from a console
+ * ReadConsoleInputA [KERNEL32.@]  Reads data from a console
  *
  * PARAMS
  *    hConsoleInput        [I] Handle to console input buffer
@@ -1108,7 +1108,7 @@
 
 
 /***********************************************************************
- *            ReadConsoleInputW   (KERNEL32.570)
+ *            ReadConsoleInputW   (KERNEL32.@)
  */
 BOOL WINAPI ReadConsoleInputW( HANDLE handle, LPINPUT_RECORD buffer,
                                    DWORD count, LPDWORD read )
@@ -1128,7 +1128,7 @@
 
 
 /***********************************************************************
- *            PeekConsoleInputA   (KERNEL32.550)
+ *            PeekConsoleInputA   (KERNEL32.@)
  *
  * Gets 'count' first events (or less) from input queue.
  *
@@ -1147,7 +1147,7 @@
 
 
 /***********************************************************************
- *            PeekConsoleInputW   (KERNEL32.551)
+ *            PeekConsoleInputW   (KERNEL32.@)
  */
 BOOL WINAPI PeekConsoleInputW(HANDLE hConsoleInput,
                                   LPINPUT_RECORD pirBuffer,
@@ -1160,7 +1160,7 @@
 
 
 /******************************************************************************
- * WriteConsoleInputA [KERNEL32.730]  Write data to a console input buffer
+ * WriteConsoleInputA [KERNEL32.@]  Write data to a console input buffer
  *
  */
 BOOL WINAPI WriteConsoleInputA( HANDLE handle, INPUT_RECORD *buffer,
@@ -1189,7 +1189,7 @@
 }
 
 /******************************************************************************
- * WriteConsoleInputW [KERNEL32.731]  Write data to a console input buffer
+ * WriteConsoleInputW [KERNEL32.@]  Write data to a console input buffer
  *
  */
 BOOL WINAPI WriteConsoleInputW( HANDLE handle, INPUT_RECORD *buffer,
@@ -1268,7 +1268,7 @@
 }
 
 /******************************************************************************
- * SetConsoleCursorPosition [KERNEL32.627]
+ * SetConsoleCursorPosition [KERNEL32.@]
  * Sets the cursor position in console
  *
  * PARAMS
@@ -1310,7 +1310,7 @@
 }
 
 /***********************************************************************
- *            GetNumberOfConsoleMouseButtons   (KERNEL32.358)
+ *            GetNumberOfConsoleMouseButtons   (KERNEL32.@)
  */
 BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons)
 {
@@ -1320,7 +1320,7 @@
 }
 
 /******************************************************************************
- * GetConsoleCursorInfo [KERNEL32.296]  Gets size and visibility of console
+ * GetConsoleCursorInfo [KERNEL32.@]  Gets size and visibility of console
  *
  * PARAMS
  *    hcon  [I] Handle to console screen buffer
@@ -1350,7 +1350,7 @@
 
 
 /******************************************************************************
- * SetConsoleCursorInfo [KERNEL32.626]  Sets size and visibility of cursor
+ * SetConsoleCursorInfo [KERNEL32.@]  Sets size and visibility of cursor
  *
  * RETURNS
  *    Success: TRUE
@@ -1382,7 +1382,7 @@
 
 
 /******************************************************************************
- * SetConsoleWindowInfo [KERNEL32.634]  Sets size and position of console
+ * SetConsoleWindowInfo [KERNEL32.@]  Sets size and position of console
  *
  * RETURNS
  *    Success: TRUE
@@ -1399,7 +1399,7 @@
 
 
 /******************************************************************************
- * SetConsoleTextAttribute [KERNEL32.631]  Sets colors for text
+ * SetConsoleTextAttribute [KERNEL32.@]  Sets colors for text
  *
  * Sets the foreground and background color attributes of characters
  * written to the screen buffer.
@@ -1430,7 +1430,7 @@
 
 
 /******************************************************************************
- * SetConsoleScreenBufferSize [KERNEL32.630]  Changes size of console 
+ * SetConsoleScreenBufferSize [KERNEL32.@]  Changes size of console 
  *
  * PARAMS
  *    hConsoleOutput [I] Handle to console screen buffer
@@ -1449,7 +1449,7 @@
 
 
 /******************************************************************************
- * FillConsoleOutputCharacterA [KERNEL32.242]
+ * FillConsoleOutputCharacterA [KERNEL32.@]
  *
  * PARAMS
  *    hConsoleOutput    [I] Handle to screen buffer
@@ -1481,7 +1481,7 @@
 
 
 /******************************************************************************
- * FillConsoleOutputCharacterW [KERNEL32.243]  Writes characters to console
+ * FillConsoleOutputCharacterW [KERNEL32.@]  Writes characters to console
  *
  * PARAMS
  *    hConsoleOutput    [I] Handle to screen buffer
@@ -1515,7 +1515,7 @@
 
 
 /******************************************************************************
- * FillConsoleOutputAttribute [KERNEL32.241]  Sets attributes for console
+ * FillConsoleOutputAttribute [KERNEL32.@]  Sets attributes for console
  *
  * PARAMS
  *    hConsoleOutput    [I] Handle to screen buffer
@@ -1539,7 +1539,7 @@
 }
 
 /******************************************************************************
- * ReadConsoleOutputCharacterA [KERNEL32.573]
+ * ReadConsoleOutputCharacterA [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1554,7 +1554,7 @@
 }
 
 /******************************************************************************
- * ReadConsoleOutputCharacterW [KERNEL32.574]
+ * ReadConsoleOutputCharacterW [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1570,7 +1570,7 @@
 
 
 /******************************************************************************
- * ScrollConsoleScreenBufferA [KERNEL32.612]
+ * ScrollConsoleScreenBufferA [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1586,7 +1586,7 @@
 }
 
 /******************************************************************************
- * ScrollConsoleScreenBufferW [KERNEL32.613]
+ * ScrollConsoleScreenBufferW [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1602,7 +1602,7 @@
 }
 
 /******************************************************************************
- *  ReadConsoleOutputA [KERNEL32.571]
+ *  ReadConsoleOutputA [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1622,7 +1622,7 @@
 }
 
 /******************************************************************************
- *  ReadConsoleOutputW [KERNEL32.575]
+ *  ReadConsoleOutputW [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1642,7 +1642,7 @@
 }
 
 /******************************************************************************
- *  ReadConsoleOutputAttribute [KERNEL32.572]
+ *  ReadConsoleOutputAttribute [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1675,7 +1675,7 @@
 }
 
 /******************************************************************************
- *  SetConsoleInputExeNameW	 [KERNEL32.889]
+ *  SetConsoleInputExeNameW	 [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
@@ -1689,7 +1689,7 @@
 }
 
 /******************************************************************************
- *  SetConsoleInputExeNameA	 [KERNEL32.888]
+ *  SetConsoleInputExeNameA	 [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
diff --git a/win32/device.c b/win32/device.c
index e053550..1d72698 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -352,7 +352,7 @@
 }
 
 /****************************************************************************
- *		DeviceIoControl (KERNEL32.188)
+ *		DeviceIoControl (KERNEL32.@)
  * This is one of those big ugly nasty procedure which can do
  * a million and one things when it comes to devices. It can also be
  * used for VxD communication.
diff --git a/win32/kernel32.c b/win32/kernel32.c
index 0bbc94f..aa8bffe 100644
--- a/win32/kernel32.c
+++ b/win32/kernel32.c
@@ -19,7 +19,7 @@
 DEFAULT_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
- *           UpdateResourceA                 (KERNEL32.707)
+ *           UpdateResourceA                 (KERNEL32.@)
  */
 BOOL WINAPI UpdateResourceA(
   HANDLE  hUpdate,
@@ -35,7 +35,7 @@
 }
 
 /***********************************************************************
- *           UpdateResourceW                 (KERNEL32.708)
+ *           UpdateResourceW                 (KERNEL32.@)
  */
 BOOL WINAPI UpdateResourceW(
   HANDLE  hUpdate,
diff --git a/win32/newfns.c b/win32/newfns.c
index d12c431..63db6fc 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -84,7 +84,7 @@
 
 		    
 /****************************************************************************
- *		QueryPerformanceCounter (KERNEL32.564)
+ *		QueryPerformanceCounter (KERNEL32.@)
  */
 BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter)
 {
@@ -111,7 +111,7 @@
 }
 
 /****************************************************************************
- *		QueryPerformanceFrequency (KERNEL32.565)
+ *		QueryPerformanceFrequency (KERNEL32.@)
  */
 BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency)
 {
@@ -132,7 +132,7 @@
 }
 
 /****************************************************************************
- *		FlushInstructionCache (KERNEL32.261)
+ *		FlushInstructionCache (KERNEL32.@)
  */
 BOOL WINAPI FlushInstructionCache(DWORD x,DWORD y,DWORD z) {
 	FIXME_(debug)("(0x%08lx,0x%08lx,0x%08lx): stub\n",x,y,z);
@@ -171,7 +171,7 @@
 
 
 /******************************************************************************
- * CreateMailslotA [KERNEL32.164]
+ * CreateMailslotA [KERNEL32.@]
  */
 HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize,
                                    DWORD lReadTimeout, LPSECURITY_ATTRIBUTES sa)
@@ -183,7 +183,7 @@
 
 
 /******************************************************************************
- * CreateMailslotW [KERNEL32.165]  Creates a mailslot with specified name
+ * CreateMailslotW [KERNEL32.@]  Creates a mailslot with specified name
  * 
  * PARAMS
  *    lpName          [I] Pointer to string for mailslot name
@@ -205,7 +205,7 @@
 
 
 /******************************************************************************
- * GetMailslotInfo [KERNEL32.347]  Retrieves info about specified mailslot
+ * GetMailslotInfo [KERNEL32.@]  Retrieves info about specified mailslot
  *
  * PARAMS
  *    hMailslot        [I] Mailslot handle
@@ -232,7 +232,7 @@
 
 
 /******************************************************************************
- * GetCompressedFileSizeA [KERNEL32.291]
+ * GetCompressedFileSizeA [KERNEL32.@]
  *
  * NOTES
  *    This should call the W function below
@@ -247,7 +247,7 @@
 
 
 /******************************************************************************
- * GetCompressedFileSizeW [KERNEL32.292]  
+ * GetCompressedFileSizeW [KERNEL32.@]  
  * 
  * RETURNS
  *    Success: Low-order doubleword of number of bytes
@@ -263,7 +263,7 @@
 
 
 /******************************************************************************
- * SetComputerNameA [KERNEL32.621]  
+ * SetComputerNameA [KERNEL32.@]  
  */
 BOOL WINAPI SetComputerNameA( LPCSTR lpComputerName )
 {
@@ -275,7 +275,7 @@
 
 
 /******************************************************************************
- * SetComputerNameW [KERNEL32.622]
+ * SetComputerNameW [KERNEL32.@]
  *
  * PARAMS
  *    lpComputerName [I] Address of new computer name