diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index 6798d62..3dc453c 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -21,7 +21,7 @@
 static const struct error_table error_table[];
 
 /**************************************************************************
- *           RtlNtStatusToDosError
+ *           RtlNtStatusToDosError (NTDLL.@)
  */
 DWORD WINAPI RtlNtStatusToDosError( DWORD status )
 {
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 36eb1ed..11d59bf 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -321,7 +321,7 @@
 
 
 /***********************************************************************
- *            RtlRaiseStatus  (NTDLL.465)
+ *            RtlRaiseStatus  (NTDLL.@)
  *
  * Raise an exception with ExceptionCode = status
  */
@@ -338,7 +338,7 @@
 
 
 /*************************************************************
- *            __wine_exception_handler
+ *            __wine_exception_handler (NTDLL.@)
  *
  * Exception handler for exception blocks declared in Wine code.
  */
@@ -378,7 +378,7 @@
 
 
 /*************************************************************
- *            __wine_finally_handler
+ *            __wine_finally_handler (NTDLL.@)
  *
  * Exception handler for try/finally blocks declared in Wine code.
  */
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index ef19073..d4e68d6 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -8,7 +8,7 @@
 DEFAULT_DEBUG_CHANNEL(ntdll);
 
 /**************************************************************************
- *                 NtOpenFile				[NTDLL.127]
+ *                 NtOpenFile				[NTDLL.@]
  * FUNCTION: Opens a file
  * ARGUMENTS:
  *  FileHandle		Variable that receives the file handle on return
@@ -34,7 +34,7 @@
 }
 
 /**************************************************************************
- *		NtCreateFile				[NTDLL.73]
+ *		NtCreateFile				[NTDLL.@]
  * FUNCTION: Either causes a new file or directory to be created, or it opens
  *  an existing file, device, directory or volume, giving the caller a handle
  *  for the file object. This handle can be used by subsequent calls to
@@ -105,7 +105,7 @@
 }
 
 /**************************************************************************
- *		NtDeviceIoControlFile			[NTDLL.94]
+ *		NtDeviceIoControlFile			[NTDLL.@]
  */
 NTSTATUS WINAPI NtDeviceIoControlFile(
 	IN HANDLE DeviceHandle,
@@ -126,7 +126,7 @@
 }
 
 /******************************************************************************
- * NtFsControlFile [NTDLL.108]
+ * NtFsControlFile [NTDLL.@]
  */
 NTSTATUS WINAPI NtFsControlFile(
 	IN HANDLE DeviceHandle,
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index d349bb8..e59387c 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -24,7 +24,7 @@
  */
  
 /**************************************************************************
- *		NtCreateTimer				[NTDLL.87]
+ *		NtCreateTimer				[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateTimer(
 	OUT PHANDLE TimerHandle,
@@ -38,7 +38,7 @@
 	return 0;
 }
 /**************************************************************************
- *		NtSetTimer				[NTDLL.221]
+ *		NtSetTimer				[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetTimer(
 	IN HANDLE TimerHandle,
@@ -55,7 +55,7 @@
 }
 
 /******************************************************************************
- * NtQueryTimerResolution [NTDLL.129]
+ * NtQueryTimerResolution [NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryTimerResolution(DWORD x1,DWORD x2,DWORD x3) 
 {
@@ -111,7 +111,7 @@
 }
 
 /******************************************************************************
- * NtSetInformationProcess [NTDLL.207]
+ * NtSetInformationProcess [NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationProcess(
 	IN HANDLE ProcessHandle,
@@ -269,7 +269,7 @@
 }
 
 /******************************************************************************
-*  NtQueryInformationToken		[NTDLL.156] 
+*  NtQueryInformationToken		[NTDLL.@]
 *
 * NOTES
 *  Buffer for TokenUser:
@@ -567,7 +567,7 @@
 }
 
 /******************************************************************************
- * NtQuerySystemInformation [NTDLL.168]
+ * NtQuerySystemInformation [NTDLL.@]
  *
  * ARGUMENTS:
  *  SystemInformationClass	Index to a certain information structure
@@ -630,7 +630,7 @@
 }
 
 /******************************************************************************
- *  NtDisplayString				[NTDLL.95] 
+ *  NtDisplayString				[NTDLL.@]
  * 
  * writes a string to the nt-textmode screen eg. during startup
  */
@@ -658,7 +658,7 @@
 }
 
 /******************************************************************************
- *  NtAllocateLocallyUniqueId
+ *  NtAllocateLocallyUniqueId (NTDLL.@)
  *
  * FIXME: the server should do that
  */
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index e584bcd..8f9bd3f 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -21,7 +21,7 @@
  */
  
 /******************************************************************************
- * NtQueryObject [NTDLL.161]
+ * NtQueryObject [NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryObject(
 	IN HANDLE ObjectHandle,
@@ -209,7 +209,7 @@
 }
 
 /**************************************************************************
- *                 NtClose				[NTDLL.65]
+ *                 NtClose				[NTDLL.@]
  * FUNCTION: Closes a handle reference to an object
  * ARGUMENTS:
  *	Handle	handle to close
@@ -244,7 +244,7 @@
  */
 
 /**************************************************************************
- * NtOpenDirectoryObject [NTDLL.124]
+ * NtOpenDirectoryObject [NTDLL.@]
  * FUNCTION: Opens a namespace directory object
  * ARGUMENTS:
  *  DirectoryHandle	Variable which receives the directory handle
@@ -278,7 +278,7 @@
 }
 
 /******************************************************************************
- * NtQueryDirectoryObject [NTDLL.149] 
+ * NtQueryDirectoryObject [NTDLL.@]
  * FUNCTION: Reads information from a namespace directory
  * ARGUMENTS:
  *  DirObjInformation	Buffer to hold the data read
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 52b33ee..d5d683e 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -74,7 +74,7 @@
 
 
 /******************************************************************************
- * NtOpenKey [NTDLL.129]
+ * NtOpenKey [NTDLL.@]
  * ZwOpenKey
  *   OUT	PHANDLE			retkey (returns 0 when failure)
  *   IN		ACCESS_MASK		access
@@ -694,7 +694,7 @@
 }
 
 /******************************************************************************
- *  RtlFormatCurrentUserKeyPath		[NTDLL.371] 
+ *  RtlFormatCurrentUserKeyPath		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(
 	IN OUT PUNICODE_STRING KeyPath)
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index fbf1c89..d0e85c5 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -29,7 +29,7 @@
  */
 
 /***********************************************************************
- *           RtlInitializeResource	(NTDLL.409)
+ *           RtlInitializeResource	(NTDLL.@)
  *
  * xxxResource() functions implement multiple-reader-single-writer lock.
  * The code is based on information published in WDJ January 1999 issue.
@@ -51,7 +51,7 @@
 
 
 /***********************************************************************
- *           RtlDeleteResource		(NTDLL.330)
+ *           RtlDeleteResource		(NTDLL.@)
  */
 void WINAPI RtlDeleteResource(LPRTL_RWLOCK rwl)
 {
@@ -72,7 +72,7 @@
 
 
 /***********************************************************************
- *          RtlAcquireResourceExclusive	(NTDLL.256)
+ *          RtlAcquireResourceExclusive	(NTDLL.@)
  */
 BYTE WINAPI RtlAcquireResourceExclusive(LPRTL_RWLOCK rwl, BYTE fWait)
 {
@@ -117,7 +117,7 @@
 }
 
 /***********************************************************************
- *          RtlAcquireResourceShared	(NTDLL.257)
+ *          RtlAcquireResourceShared	(NTDLL.@)
  */
 BYTE WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK rwl, BYTE fWait)
 {
@@ -158,7 +158,7 @@
 
 
 /***********************************************************************
- *           RtlReleaseResource		(NTDLL.471)
+ *           RtlReleaseResource		(NTDLL.@)
  */
 void WINAPI RtlReleaseResource(LPRTL_RWLOCK rwl)
 {
@@ -200,7 +200,7 @@
 
 
 /***********************************************************************
- *           RtlDumpResource		(NTDLL.340)
+ *           RtlDumpResource		(NTDLL.@)
  */
 void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl)
 {
@@ -340,7 +340,7 @@
 }
 
 /**************************************************************************
- *                 RtlNormalizeProcessParams		[NTDLL.441]
+ *                 RtlNormalizeProcessParams		[NTDLL.@]
  */
 LPVOID WINAPI RtlNormalizeProcessParams(LPVOID x)
 {
@@ -349,7 +349,7 @@
 }
 
 /**************************************************************************
- *                 RtlGetNtProductType			[NTDLL.390]
+ *                 RtlGetNtProductType			[NTDLL.@]
  */
 BOOLEAN WINAPI RtlGetNtProductType(LPDWORD type)
 {
@@ -359,8 +359,8 @@
 }
 
 /**************************************************************************
- *                 NTDLL_chkstk				[NTDLL.862]
- *                 NTDLL_alloca_probe				[NTDLL.861]
+ *                 NTDLL_chkstk				[NTDLL.@]
+ *                 NTDLL_alloca_probe				[NTDLL.@]
  * Glorified "enter xxxx".
  */
 void WINAPI NTDLL_chkstk( CONTEXT86 *context )
@@ -373,7 +373,7 @@
 }
 
 /**************************************************************************
- *                 RtlDosPathNameToNtPathName_U		[NTDLL.338]
+ *                 RtlDosPathNameToNtPathName_U		[NTDLL.@]
  *
  * FIXME: convert to UNC or whatever is expected here
  */
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index dc7c314..18678ec 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -744,7 +744,7 @@
 */
 
 /**************************************************************************
- *	RtlIsTextUnicode
+ *	RtlIsTextUnicode (NTDLL.@)
  *
  *	Apply various feeble heuristics to guess whether
  *	the text buffer contains Unicode.
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 23be457..fbe65a2 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -40,7 +40,7 @@
  */
 
 /******************************************************************************
- *  RtlAllocateAndInitializeSid		[NTDLL.265] 
+ *  RtlAllocateAndInitializeSid		[NTDLL.@]
  *
  */
 BOOLEAN WINAPI RtlAllocateAndInitializeSid (
@@ -86,7 +86,7 @@
 	return STATUS_SUCCESS;
 }
 /******************************************************************************
- *  RtlEqualSid		[NTDLL.352] 
+ *  RtlEqualSid		[NTDLL.@]
  *
  */
 BOOL WINAPI RtlEqualSid( PSID pSid1, PSID pSid2 )
@@ -122,7 +122,7 @@
 
 
 /******************************************************************************
- *  RtlFreeSid		[NTDLL.376] 
+ *  RtlFreeSid		[NTDLL.@]
  */
 DWORD WINAPI RtlFreeSid(PSID pSid) 
 {
@@ -132,7 +132,7 @@
 }
 
 /**************************************************************************
- * RtlLengthRequiredSid	[NTDLL.427]
+ * RtlLengthRequiredSid	[NTDLL.@]
  *
  * PARAMS
  *   nSubAuthorityCount []
@@ -143,7 +143,7 @@
 }
 
 /**************************************************************************
- *                 RtlLengthSid				[NTDLL.429]
+ *                 RtlLengthSid				[NTDLL.@]
  */
 DWORD WINAPI RtlLengthSid(PSID pSid)
 {
@@ -153,7 +153,7 @@
 }
 
 /**************************************************************************
- *                 RtlInitializeSid			[NTDLL.410]
+ *                 RtlInitializeSid			[NTDLL.@]
  */
 BOOL WINAPI RtlInitializeSid(
 	PSID pSid,
@@ -176,7 +176,7 @@
 }
 
 /**************************************************************************
- *                 RtlSubAuthoritySid			[NTDLL.497]
+ *                 RtlSubAuthoritySid			[NTDLL.@]
  *
  * PARAMS
  *   pSid          []
@@ -188,7 +188,7 @@
 }
 
 /**************************************************************************
- * RtlIdentifierAuthoritySid	[NTDLL.395]
+ * RtlIdentifierAuthoritySid	[NTDLL.@]
  *
  * PARAMS
  *   pSid []
@@ -199,7 +199,7 @@
 }
 
 /**************************************************************************
- *                 RtlSubAuthorityCountSid		[NTDLL.496]
+ *                 RtlSubAuthorityCountSid		[NTDLL.@]
  *
  * PARAMS
  *   pSid          []
@@ -211,7 +211,7 @@
 }
 
 /**************************************************************************
- *                 RtlCopySid				[NTDLL.302]
+ *                 RtlCopySid				[NTDLL.@]
  */
 DWORD WINAPI RtlCopySid( DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid )
 {
@@ -226,7 +226,7 @@
 	return TRUE;
 }
 /******************************************************************************
- * RtlValidSid [NTDLL.532]
+ * RtlValidSid [NTDLL.@]
  *
  * PARAMS
  *   pSid []
@@ -259,7 +259,7 @@
  */
 
 /**************************************************************************
- * RtlCreateSecurityDescriptor			[NTDLL.313]
+ * RtlCreateSecurityDescriptor			[NTDLL.@]
  *
  * RETURNS:
  *  0 success, 
@@ -277,7 +277,7 @@
 	return STATUS_SUCCESS;
 }
 /**************************************************************************
- * RtlValidSecurityDescriptor			[NTDLL.313]
+ * RtlValidSecurityDescriptor			[NTDLL.@]
  *
  */
 NTSTATUS WINAPI RtlValidSecurityDescriptor(
@@ -348,7 +348,7 @@
 }
 
 /**************************************************************************
- *  RtlSetDaclSecurityDescriptor		[NTDLL.483]
+ *  RtlSetDaclSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetDaclSecurityDescriptor (
 	PSECURITY_DESCRIPTOR lpsd,
@@ -409,7 +409,7 @@
 }
 
 /**************************************************************************
- * RtlSetSaclSecurityDescriptor			[NTDLL.488]
+ * RtlSetSaclSecurityDescriptor			[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetSaclSecurityDescriptor (
 	PSECURITY_DESCRIPTOR lpsd,
@@ -435,7 +435,7 @@
 }
 
 /**************************************************************************
- * RtlGetOwnerSecurityDescriptor		[NTDLL.488]
+ * RtlGetOwnerSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(
 	PSECURITY_DESCRIPTOR SecurityDescriptor,
@@ -456,7 +456,7 @@
 }
 
 /**************************************************************************
- *                 RtlSetOwnerSecurityDescriptor		[NTDLL.487]
+ *                 RtlSetOwnerSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetOwnerSecurityDescriptor(
 	PSECURITY_DESCRIPTOR lpsd,
@@ -477,7 +477,7 @@
 }
 
 /**************************************************************************
- *                 RtlSetGroupSecurityDescriptor		[NTDLL.485]
+ *                 RtlSetGroupSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetGroupSecurityDescriptor (
 	PSECURITY_DESCRIPTOR lpsd,
@@ -535,7 +535,7 @@
  */
 
 /**************************************************************************
- *                 RtlCreateAcl				[NTDLL.306]
+ *                 RtlCreateAcl				[NTDLL.@]
  *
  * NOTES
  *    This should return NTSTATUS
@@ -559,7 +559,7 @@
 }
 
 /**************************************************************************
- *                 RtlFirstFreeAce			[NTDLL.370]
+ *                 RtlFirstFreeAce			[NTDLL.@]
  * looks for the AceCount+1 ACE, and if it is still within the alloced
  * ACL, return a pointer to it
  */
@@ -584,7 +584,7 @@
 }
 
 /**************************************************************************
- *                 RtlAddAce				[NTDLL.260]
+ *                 RtlAddAce				[NTDLL.@]
  */
 NTSTATUS WINAPI RtlAddAce(
 	PACL acl,
@@ -693,7 +693,7 @@
 }
 
 /******************************************************************************
- * RtlGetControlSecurityDescriptor
+ * RtlGetControlSecurityDescriptor (NTDLL.@)
  */
 
 NTSTATUS WINAPI RtlGetControlSecurityDescriptor(
@@ -706,7 +706,7 @@
 }		
 
 /******************************************************************************
- * RtlConvertSidToUnicodeString
+ * RtlConvertSidToUnicodeString (NTDLL.@)
  */
 NTSTATUS WINAPI RtlConvertSidToUnicodeString(
        PUNICODE_STRING UnicodeSID,
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 5b5585d..c1e4818 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -22,7 +22,7 @@
  */
 
 /******************************************************************************
- *  NtCreateSemaphore
+ *  NtCreateSemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtCreateSemaphore( OUT PHANDLE SemaphoreHandle,
                                    IN ACCESS_MASK access,
@@ -50,7 +50,7 @@
 }
 
 /******************************************************************************
- *  NtOpenSemaphore
+ *  NtOpenSemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtOpenSemaphore( OUT PHANDLE SemaphoreHandle,
                                  IN ACCESS_MASK access,
@@ -72,7 +72,7 @@
 }
 
 /******************************************************************************
- *  NtQuerySemaphore
+ *  NtQuerySemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtQuerySemaphore(
 	HANDLE SemaphoreHandle,
@@ -87,7 +87,7 @@
 }
 
 /******************************************************************************
- *  NtReleaseSemaphore
+ *  NtReleaseSemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, PULONG previous )
 {
@@ -110,7 +110,7 @@
  */
  
 /**************************************************************************
- * NtCreateEvent
+ * NtCreateEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtCreateEvent(
 	OUT PHANDLE EventHandle,
@@ -136,7 +136,7 @@
 }
 
 /******************************************************************************
- *  NtOpenEvent
+ *  NtOpenEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtOpenEvent(
 	OUT PHANDLE EventHandle,
@@ -160,7 +160,7 @@
 
 
 /******************************************************************************
- *  NtSetEvent
+ *  NtSetEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtSetEvent( HANDLE handle, PULONG NumberOfThreadsReleased )
 {
@@ -179,7 +179,7 @@
 }
 
 /******************************************************************************
- *  NtResetEvent
+ *  NtResetEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtResetEvent( HANDLE handle, PULONG NumberOfThreadsReleased )
 {
@@ -199,7 +199,7 @@
 }
 
 /******************************************************************************
- *  NtClearEvent
+ *  NtClearEvent (NTDLL.@)
  *
  * FIXME
  *   same as NtResetEvent ???
@@ -210,7 +210,7 @@
 }
 
 /******************************************************************************
- *  NtPulseEvent
+ *  NtPulseEvent (NTDLL.@)
  *
  * FIXME
  *   PulseCount
@@ -230,7 +230,7 @@
 }
 
 /******************************************************************************
- *  NtQueryEvent
+ *  NtQueryEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtQueryEvent (
 	IN  HANDLE EventHandle,
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 1f7ad4e..7234d75 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -56,7 +56,7 @@
 }
 
 /******************************************************************************
- *  RtlTimeToTimeFields		[NTDLL.265] 
+ *  RtlTimeToTimeFields		[NTDLL.@]
  *
  */
 
@@ -127,7 +127,7 @@
 	TimeFields->Day = (CSHORT) (Days + 1);
 }
 /******************************************************************************
- *  RtlTimeFieldsToTime		[NTDLL.265] 
+ *  RtlTimeFieldsToTime		[NTDLL.@]
  *
  */
 BOOLEAN WINAPI RtlTimeFieldsToTime(
@@ -230,7 +230,7 @@
 }
 
 /******************************************************************************
- * RtlTimeToElapsedTimeFields [NTDLL.502]
+ * RtlTimeToElapsedTimeFields [NTDLL.@]
  * FIXME: prototype guessed
  */
 VOID WINAPI RtlTimeToElapsedTimeFields(