diff --git a/windows/caret.c b/windows/caret.c
index 5dc43f6fdb7..6f5266d7e4b 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -129,7 +129,7 @@ static void CARET_KillTimer(void)
 
 
 /*****************************************************************
- *           CreateCaret16   (USER.163)
+ *		CreateCaret (USER.163)
  */
 void WINAPI CreateCaret16( HWND16 hwnd, HBITMAP16 bitmap,
                            INT16 width, INT16 height )
@@ -138,7 +138,7 @@ void WINAPI CreateCaret16( HWND16 hwnd, HBITMAP16 bitmap,
 }
 
 /*****************************************************************
- *           CreateCaret   (USER32.66)
+ *		CreateCaret (USER32.@)
  */
 BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap,
                              INT width, INT height )
@@ -180,7 +180,7 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap,
    
 
 /*****************************************************************
- *           DestroyCaret16   (USER.164)
+ *		DestroyCaret (USER.164)
  */
 void WINAPI DestroyCaret16(void)
 {
@@ -189,7 +189,7 @@ void WINAPI DestroyCaret16(void)
 
 
 /*****************************************************************
- *           DestroyCaret   (USER32.131)
+ *		DestroyCaret (USER32.@)
  */
 BOOL WINAPI DestroyCaret(void)
 {
@@ -207,7 +207,7 @@ BOOL WINAPI DestroyCaret(void)
 
 
 /*****************************************************************
- *           SetCaretPos16   (USER.165)
+ *		SetCaretPos (USER.165)
  */
 void WINAPI SetCaretPos16( INT16 x, INT16 y )
 {
@@ -216,7 +216,7 @@ void WINAPI SetCaretPos16( INT16 x, INT16 y )
 
 
 /*****************************************************************
- *           SetCaretPos   (USER32.466)
+ *		SetCaretPos (USER32.@)
  */
 BOOL WINAPI SetCaretPos( INT x, INT y)
 {
@@ -239,7 +239,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y)
 
 
 /*****************************************************************
- *           HideCaret16   (USER.166)
+ *		HideCaret (USER.166)
  */
 void WINAPI HideCaret16( HWND16 hwnd )
 {
@@ -248,7 +248,7 @@ void WINAPI HideCaret16( HWND16 hwnd )
 
 
 /*****************************************************************
- *           HideCaret   (USER32.317)
+ *		HideCaret (USER32.@)
  */
 BOOL WINAPI HideCaret( HWND hwnd )
 {
@@ -266,7 +266,7 @@ BOOL WINAPI HideCaret( HWND hwnd )
 
 
 /*****************************************************************
- *           ShowCaret16   (USER.167)
+ *		ShowCaret (USER.167)
  */
 void WINAPI ShowCaret16( HWND16 hwnd )
 {
@@ -275,7 +275,7 @@ void WINAPI ShowCaret16( HWND16 hwnd )
 
 
 /*****************************************************************
- *           ShowCaret   (USER32.529)
+ *		ShowCaret (USER32.@)
  */
 BOOL WINAPI ShowCaret( HWND hwnd )
 {
@@ -299,7 +299,7 @@ BOOL WINAPI ShowCaret( HWND hwnd )
 
 
 /*****************************************************************
- *           SetCaretBlinkTime16   (USER.168)
+ *		SetCaretBlinkTime (USER.168)
  */
 void WINAPI SetCaretBlinkTime16( UINT16 msecs )
 {
@@ -307,7 +307,7 @@ void WINAPI SetCaretBlinkTime16( UINT16 msecs )
 }
 
 /*****************************************************************
- *           SetCaretBlinkTime   (USER32.465)
+ *		SetCaretBlinkTime (USER32.@)
  */
 BOOL WINAPI SetCaretBlinkTime( UINT msecs )
 {
@@ -323,7 +323,7 @@ BOOL WINAPI SetCaretBlinkTime( UINT msecs )
 
 
 /*****************************************************************
- *           GetCaretBlinkTime16   (USER.169)
+ *		GetCaretBlinkTime (USER.169)
  */
 UINT16 WINAPI GetCaretBlinkTime16(void)
 {
@@ -332,7 +332,7 @@ UINT16 WINAPI GetCaretBlinkTime16(void)
 
 
 /*****************************************************************
- *           GetCaretBlinkTime   (USER32.209)
+ *		GetCaretBlinkTime (USER32.@)
  */
 UINT WINAPI GetCaretBlinkTime(void)
 {
@@ -341,7 +341,7 @@ UINT WINAPI GetCaretBlinkTime(void)
 
 
 /*****************************************************************
- *           GetCaretPos16   (USER.183)
+ *		GetCaretPos (USER.183)
  */
 VOID WINAPI GetCaretPos16( LPPOINT16 pt )
 {
@@ -355,7 +355,7 @@ VOID WINAPI GetCaretPos16( LPPOINT16 pt )
 
 
 /*****************************************************************
- *           GetCaretPos   (USER32.210)
+ *		GetCaretPos (USER32.@)
  */
 BOOL WINAPI GetCaretPos( LPPOINT pt )
 {
diff --git a/windows/class.c b/windows/class.c
index da44e66abbe..e5caf8eb9c8 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -414,7 +414,7 @@ void CLASS_RemoveWindow( CLASS *cls )
 
 
 /***********************************************************************
- *           RegisterClass16    (USER.57)
+ *		RegisterClass (USER.57)
  */
 ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc )
 {
@@ -458,7 +458,7 @@ ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc )
 
 
 /***********************************************************************
- *           RegisterClassA      (USER32.427)
+ *		RegisterClassA (USER32.@)
  * RETURNS
  *	>0: Unique identifier
  *	0: Failure
@@ -502,7 +502,7 @@ ATOM WINAPI RegisterClassA( const WNDCLASSA* wc ) /* [in] Address of structure w
 
 
 /***********************************************************************
- *           RegisterClassW      (USER32.430)
+ *		RegisterClassW (USER32.@)
  */
 ATOM WINAPI RegisterClassW( const WNDCLASSW* wc )
 {
@@ -542,7 +542,7 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc )
 
 
 /***********************************************************************
- *           RegisterClassEx16    (USER.397)
+ *		RegisterClassEx (USER.397)
  */
 ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc )
 {
@@ -576,7 +576,7 @@ ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc )
 
 
 /***********************************************************************
- *           RegisterClassExA      (USER32.428)
+ *		RegisterClassExA (USER32.@)
  */
 ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
 {
@@ -609,7 +609,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
 
 
 /***********************************************************************
- *           RegisterClassExW      (USER32.429)
+ *		RegisterClassExW (USER32.@)
  */
 ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
 {
@@ -642,7 +642,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
 
 
 /***********************************************************************
- *           UnregisterClass16    (USER.403)
+ *		UnregisterClass (USER.403)
  */
 BOOL16 WINAPI UnregisterClass16( LPCSTR className, HINSTANCE16 hInstance )
 {
@@ -651,7 +651,7 @@ BOOL16 WINAPI UnregisterClass16( LPCSTR className, HINSTANCE16 hInstance )
 
 
 /***********************************************************************
- *           UnregisterClassA    (USER32.563)
+ *		UnregisterClassA (USER32.@)
  *
  */
 BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance )
@@ -676,7 +676,7 @@ BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance )
 }
 
 /***********************************************************************
- *           UnregisterClassW    (USER32.564)
+ *		UnregisterClassW (USER32.@)
  */
 BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance )
 {
@@ -700,7 +700,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance )
 }
 
 /***********************************************************************
- *           GetClassWord16    (USER.129)
+ *		GetClassWord (USER.129)
  */
 WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset )
 {
@@ -709,7 +709,7 @@ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset )
 
 
 /***********************************************************************
- *           GetClassWord    (USER32.219)
+ *		GetClassWord (USER32.@)
  */
 WORD WINAPI GetClassWord( HWND hwnd, INT offset )
 {
@@ -755,7 +755,7 @@ WORD WINAPI GetClassWord( HWND hwnd, INT offset )
 
 
 /***********************************************************************
- *           GetClassLong16    (USER.131)
+ *		GetClassLong (USER.131)
  */
 LONG WINAPI GetClassLong16( HWND16 hwnd, INT16 offset )
 {
@@ -781,7 +781,7 @@ LONG WINAPI GetClassLong16( HWND16 hwnd, INT16 offset )
 
 
 /***********************************************************************
- *           GetClassLongA    (USER32.215)
+ *		GetClassLongA (USER32.@)
  */
 LONG WINAPI GetClassLongA( HWND hwnd, INT offset )
 {
@@ -833,7 +833,7 @@ END:
 
 
 /***********************************************************************
- *           GetClassLongW    (USER32.216)
+ *		GetClassLongW (USER32.@)
  */
 LONG WINAPI GetClassLongW( HWND hwnd, INT offset )
 {
@@ -861,7 +861,7 @@ LONG WINAPI GetClassLongW( HWND hwnd, INT offset )
 
 
 /***********************************************************************
- *           SetClassWord16    (USER.130)
+ *		SetClassWord (USER.130)
  */
 WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval )
 {
@@ -870,7 +870,7 @@ WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval )
 
 
 /***********************************************************************
- *           SetClassWord    (USER32.469)
+ *		SetClassWord (USER32.@)
  */
 WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval )
 {
@@ -918,7 +918,7 @@ WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval )
 
 
 /***********************************************************************
- *           SetClassLong16    (USER.132)
+ *		SetClassLong (USER.132)
  */
 LONG WINAPI SetClassLong16( HWND16 hwnd, INT16 offset, LONG newval )
 {
@@ -943,7 +943,7 @@ LONG WINAPI SetClassLong16( HWND16 hwnd, INT16 offset, LONG newval )
 
 
 /***********************************************************************
- *           SetClassLongA    (USER32.467)
+ *		SetClassLongA (USER32.@)
  */
 LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval )
 {
@@ -998,7 +998,7 @@ END:
 
 
 /***********************************************************************
- *           SetClassLongW    (USER32.468)
+ *		SetClassLongW (USER32.@)
  */
 LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval )
 {
@@ -1026,7 +1026,7 @@ LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval )
 
 
 /***********************************************************************
- *           GetClassName16      (USER.58)
+ *		GetClassName (USER.58)
  */
 INT16 WINAPI GetClassName16( HWND16 hwnd, LPSTR buffer, INT16 count )
 {
@@ -1035,7 +1035,7 @@ INT16 WINAPI GetClassName16( HWND16 hwnd, LPSTR buffer, INT16 count )
 
 
 /***********************************************************************
- *           GetClassNameA      (USER32.217)
+ *		GetClassNameA (USER32.@)
  */
 INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
 {   INT ret;
@@ -1051,7 +1051,7 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
 
 
 /***********************************************************************
- *           GetClassNameW      (USER32.218)
+ *		GetClassNameW (USER32.@)
  */
 INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
 {   INT ret;
@@ -1067,7 +1067,7 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
 
 
 /***********************************************************************
- *           GetClassInfo16      (USER.404)
+ *		GetClassInfo (USER.404)
  */
 BOOL16 WINAPI GetClassInfo16( HINSTANCE16 hInstance, SEGPTR name, WNDCLASS16 *wc )
 {
@@ -1100,7 +1100,7 @@ BOOL16 WINAPI GetClassInfo16( HINSTANCE16 hInstance, SEGPTR name, WNDCLASS16 *wc
 
 
 /***********************************************************************
- *           GetClassInfoA      (USER32.211)
+ *		GetClassInfoA (USER32.@)
  */
 BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name,
                                WNDCLASSA *wc )
@@ -1141,7 +1141,7 @@ BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name,
 
 
 /***********************************************************************
- *           GetClassInfoW      (USER32.214)
+ *		GetClassInfoW (USER32.@)
  */
 BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name,
                                WNDCLASSW *wc )
@@ -1178,7 +1178,7 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name,
 
 
 /***********************************************************************
- *           GetClassInfoEx16      (USER.398)
+ *		GetClassInfoEx (USER.398)
  *
  * FIXME: this is just a guess, I have no idea if GetClassInfoEx() is the
  * same in Win16 as in Win32. --AJ
@@ -1215,7 +1215,7 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInstance, SEGPTR name, WNDCLASSEX16
 
 
 /***********************************************************************
- *           GetClassInfoExA      (USER32.212)
+ *		GetClassInfoExA (USER32.@)
  */
 BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name,
                                  WNDCLASSEXA *wc )
@@ -1246,7 +1246,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name,
 
 
 /***********************************************************************
- *           GetClassInfoExW      (USER32.213)
+ *		GetClassInfoExW (USER32.@)
  */
 BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name,
                                  WNDCLASSEXW *wc )
@@ -1277,7 +1277,7 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name,
 
 
 /***********************************************************************
- *           ClassFirst      (TOOLHELP.69)
+ *		ClassFirst (TOOLHELP.69)
  */
 BOOL16 WINAPI ClassFirst16( CLASSENTRY *pClassEntry )
 {
@@ -1288,7 +1288,7 @@ BOOL16 WINAPI ClassFirst16( CLASSENTRY *pClassEntry )
 
 
 /***********************************************************************
- *           ClassNext      (TOOLHELP.70)
+ *		ClassNext (TOOLHELP.70)
  */
 BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry )
 {
diff --git a/windows/clipboard.c b/windows/clipboard.c
index b9ec2f009d8..59fac4b87a9 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -638,7 +638,7 @@ static LPWINE_CLIPFORMAT CLIPBOARD_RenderText( UINT wFormat )
  **************************************************************************/
 
 /**************************************************************************
- *            OpenClipboard16   (USER.137)
+ *		OpenClipboard (USER.137)
  */
 BOOL16 WINAPI OpenClipboard16( HWND16 hWnd )
 {
@@ -647,7 +647,7 @@ BOOL16 WINAPI OpenClipboard16( HWND16 hWnd )
 
 
 /**************************************************************************
- *            OpenClipboard   (USER32.407)
+ *		OpenClipboard (USER32.@)
  *
  * Note: Netscape uses NULL hWnd to open the clipboard.
  */
@@ -674,7 +674,7 @@ BOOL WINAPI OpenClipboard( HWND hWnd )
 
 
 /**************************************************************************
- *            CloseClipboard16   (USER.138)
+ *		CloseClipboard (USER.138)
  */
 BOOL16 WINAPI CloseClipboard16(void)
 {
@@ -683,7 +683,7 @@ BOOL16 WINAPI CloseClipboard16(void)
 
 
 /**************************************************************************
- *            CloseClipboard   (USER32.54)
+ *		CloseClipboard (USER32.@)
  */
 BOOL WINAPI CloseClipboard(void)
 {
@@ -702,7 +702,7 @@ BOOL WINAPI CloseClipboard(void)
 
 
 /**************************************************************************
- *            EmptyClipboard16   (USER.139)
+ *		EmptyClipboard16 (USER.139)
  */
 BOOL16 WINAPI EmptyClipboard16(void)
 {
@@ -711,7 +711,7 @@ BOOL16 WINAPI EmptyClipboard16(void)
 
 
 /**************************************************************************
- *            EmptyClipboard   (USER32.169)
+ *		EmptyClipboard (USER32.@)
  *  Empties and acquires ownership of the clipboard
  */
 BOOL WINAPI EmptyClipboard(void)
@@ -746,7 +746,7 @@ BOOL WINAPI EmptyClipboard(void)
 
 
 /**************************************************************************
- *            GetClipboardOwner16   (USER.140)
+ *		GetClipboardOwner (USER.140)
  *  FIXME: Can't return the owner if the clipbard is owned by an external app
  */
 HWND16 WINAPI GetClipboardOwner16(void)
@@ -757,7 +757,7 @@ HWND16 WINAPI GetClipboardOwner16(void)
 
 
 /**************************************************************************
- *            GetClipboardOwner   (USER32.225)
+ *		GetClipboardOwner (USER32.@)
  *  FIXME: Can't return the owner if the clipbard is owned by an external app
  */
 HWND WINAPI GetClipboardOwner(void)
@@ -768,7 +768,7 @@ HWND WINAPI GetClipboardOwner(void)
 
 
 /**************************************************************************
- *            SetClipboardData16   (USER.141)
+ *		SetClipboardData (USER.141)
  */
 HANDLE16 WINAPI SetClipboardData16( UINT16 wFormat, HANDLE16 hData )
 {
@@ -825,7 +825,7 @@ HANDLE16 WINAPI SetClipboardData16( UINT16 wFormat, HANDLE16 hData )
 
 
 /**************************************************************************
- *            SetClipboardData   (USER32.470)
+ *		SetClipboardData (USER32.@)
  */
 HANDLE WINAPI SetClipboardData( UINT wFormat, HANDLE hData )
 {
@@ -893,7 +893,7 @@ HANDLE WINAPI SetClipboardData( UINT wFormat, HANDLE hData )
 
 
 /**************************************************************************
- *             GetClipboardData16   (USER.142)
+ *		GetClipboardData (USER.142)
  */
 HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
 {
@@ -960,7 +960,7 @@ HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
 
 
 /**************************************************************************
- *             GetClipboardData   (USER32.222)
+ *		GetClipboardData (USER32.@)
  */
 HANDLE WINAPI GetClipboardData( UINT wFormat )
 {
@@ -1022,7 +1022,7 @@ HANDLE WINAPI GetClipboardData( UINT wFormat )
 
 
 /**************************************************************************
- *           CountClipboardFormats16   (USER.143)
+ *		CountClipboardFormats (USER.143)
  */
 INT16 WINAPI CountClipboardFormats16(void)
 {
@@ -1031,7 +1031,7 @@ INT16 WINAPI CountClipboardFormats16(void)
 
 
 /**************************************************************************
- *           CountClipboardFormats   (USER32.63)
+ *		CountClipboardFormats (USER32.@)
  */
 INT WINAPI CountClipboardFormats(void)
 {
@@ -1076,7 +1076,7 @@ INT WINAPI CountClipboardFormats(void)
 
 
 /**************************************************************************
- *            EnumClipboardFormats16   (USER.144)
+ *		EnumClipboardFormats (USER.144)
  */
 UINT16 WINAPI EnumClipboardFormats16( UINT16 wFormat )
 {
@@ -1085,7 +1085,7 @@ UINT16 WINAPI EnumClipboardFormats16( UINT16 wFormat )
 
 
 /**************************************************************************
- *            EnumClipboardFormats   (USER32.179)
+ *		EnumClipboardFormats (USER32.@)
  */
 UINT WINAPI EnumClipboardFormats( UINT wFormat )
 {
@@ -1149,7 +1149,7 @@ UINT WINAPI EnumClipboardFormats( UINT wFormat )
 
 
 /**************************************************************************
- *            RegisterClipboardFormat16  (USER.145)
+ *		RegisterClipboardFormat (USER.145)
  */
 UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 {
@@ -1209,7 +1209,7 @@ UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 
 
 /**************************************************************************
- *            RegisterClipboardFormatA   (USER32.431)
+ *		RegisterClipboardFormatA (USER32.@)
  */
 UINT WINAPI RegisterClipboardFormatA( LPCSTR formatName )
 {
@@ -1218,7 +1218,7 @@ UINT WINAPI RegisterClipboardFormatA( LPCSTR formatName )
 
 
 /**************************************************************************
- *            RegisterClipboardFormatW   (USER32.432)
+ *		RegisterClipboardFormatW (USER32.@)
  */
 UINT WINAPI RegisterClipboardFormatW( LPCWSTR formatName )
 {
@@ -1230,7 +1230,7 @@ UINT WINAPI RegisterClipboardFormatW( LPCWSTR formatName )
 
 
 /**************************************************************************
- *            GetClipboardFormatName16   (USER.146)
+ *		GetClipboardFormatName (USER.146)
  */
 INT16 WINAPI GetClipboardFormatName16( UINT16 wFormat, LPSTR retStr, INT16 maxlen )
 {
@@ -1239,7 +1239,7 @@ INT16 WINAPI GetClipboardFormatName16( UINT16 wFormat, LPSTR retStr, INT16 maxle
 
 
 /**************************************************************************
- *            GetClipboardFormatNameA   (USER32.223)
+ *		GetClipboardFormatNameA (USER32.@)
  */
 INT WINAPI GetClipboardFormatNameA( UINT wFormat, LPSTR retStr, INT maxlen )
 {
@@ -1258,7 +1258,7 @@ INT WINAPI GetClipboardFormatNameA( UINT wFormat, LPSTR retStr, INT maxlen )
 
 
 /**************************************************************************
- *            GetClipboardFormatNameW   (USER32.224)
+ *		GetClipboardFormatNameW (USER32.@)
  */
 INT WINAPI GetClipboardFormatNameW( UINT wFormat, LPWSTR retStr, INT maxlen )
 {
@@ -1276,7 +1276,7 @@ INT WINAPI GetClipboardFormatNameW( UINT wFormat, LPWSTR retStr, INT maxlen )
 
 
 /**************************************************************************
- *            SetClipboardViewer16   (USER.147)
+ *		SetClipboardViewer (USER.147)
  */
 HWND16 WINAPI SetClipboardViewer16( HWND16 hWnd )
 {
@@ -1286,7 +1286,7 @@ HWND16 WINAPI SetClipboardViewer16( HWND16 hWnd )
 
 
 /**************************************************************************
- *            SetClipboardViewer   (USER32.471)
+ *		SetClipboardViewer (USER32.@)
  */
 HWND WINAPI SetClipboardViewer( HWND hWnd )
 {
@@ -1300,7 +1300,7 @@ HWND WINAPI SetClipboardViewer( HWND hWnd )
 
 
 /**************************************************************************
- *           GetClipboardViewer16   (USER.148)
+ *		GetClipboardViewer (USER.148)
  */
 HWND16 WINAPI GetClipboardViewer16(void)
 {
@@ -1310,7 +1310,7 @@ HWND16 WINAPI GetClipboardViewer16(void)
 
 
 /**************************************************************************
- *           GetClipboardViewer   (USER32.226)
+ *		GetClipboardViewer (USER32.@)
  */
 HWND WINAPI GetClipboardViewer(void)
 {
@@ -1320,7 +1320,7 @@ HWND WINAPI GetClipboardViewer(void)
 
 
 /**************************************************************************
- *           ChangeClipboardChain16   (USER.149)
+ *		ChangeClipboardChain (USER.149)
  */
 BOOL16 WINAPI ChangeClipboardChain16(HWND16 hWnd, HWND16 hWndNext)
 {
@@ -1329,7 +1329,7 @@ BOOL16 WINAPI ChangeClipboardChain16(HWND16 hWnd, HWND16 hWndNext)
 
 
 /**************************************************************************
- *           ChangeClipboardChain   (USER32.22)
+ *		ChangeClipboardChain (USER32.@)
  */
 BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext)
 {
@@ -1350,7 +1350,7 @@ BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext)
 
 
 /**************************************************************************
- *           IsClipboardFormatAvailable16   (USER.193)
+ *		IsClipboardFormatAvailable16 (USER.193)
  */
 BOOL16 WINAPI IsClipboardFormatAvailable16( UINT16 wFormat )
 {
@@ -1359,7 +1359,7 @@ BOOL16 WINAPI IsClipboardFormatAvailable16( UINT16 wFormat )
 
 
 /**************************************************************************
- *           IsClipboardFormatAvailable   (USER32.340)
+ *		IsClipboardFormatAvailable (USER32.@)
  */
 BOOL WINAPI IsClipboardFormatAvailable( UINT wFormat )
 {
@@ -1376,7 +1376,7 @@ BOOL WINAPI IsClipboardFormatAvailable( UINT wFormat )
 
 
 /**************************************************************************
- *             GetOpenClipboardWindow16   (USER.248)
+ *		GetOpenClipboardWindow (USER.248)
  *  FIXME: This wont work if an external app owns the selection
  */
 HWND16 WINAPI GetOpenClipboardWindow16(void)
@@ -1387,7 +1387,7 @@ HWND16 WINAPI GetOpenClipboardWindow16(void)
 
 
 /**************************************************************************
- *             GetOpenClipboardWindow   (USER32.277)
+ *		GetOpenClipboardWindow (USER32.@)
  *  FIXME: This wont work if an external app owns the selection
  */
 HWND WINAPI GetOpenClipboardWindow(void)
@@ -1398,7 +1398,7 @@ HWND WINAPI GetOpenClipboardWindow(void)
 
 
 /**************************************************************************
- *             GetPriorityClipboardFormat16   (USER.402)
+ *		GetPriorityClipboardFormat (USER.402)
  */
 INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount)
 {
@@ -1408,7 +1408,7 @@ INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount)
 
 
 /**************************************************************************
- *             GetPriorityClipboardFormat   (USER32.279)
+ *		GetPriorityClipboardFormat (USER32.@)
  */
 INT WINAPI GetPriorityClipboardFormat( UINT *lpPriorityList, INT nCount )
 {
@@ -1431,7 +1431,7 @@ INT WINAPI GetPriorityClipboardFormat( UINT *lpPriorityList, INT nCount )
 
 
 /**************************************************************************
- *             GetClipboardSequenceNumber   (USER32)
+ *		GetClipboardSequenceNumber (USER32.@)
  * Supported on Win2k/Win98
  * MSDN: Windows clipboard code keeps a serial number for the clipboard
  * for each window station.  The number is incremented whenever the
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index c870750fac3..3ac3e87b090 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -648,7 +648,7 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
 
 
 /**********************************************************************
- *          CreateIconFromResourceEx16          (USER.450)
+ *		CreateIconFromResourceEx (USER.450)
  *
  * FIXME: not sure about exact parameter types
  */
@@ -661,7 +661,7 @@ HICON16 WINAPI CreateIconFromResourceEx16( LPBYTE bits, UINT16 cbSize, BOOL16 bI
 
 
 /**********************************************************************
- *          CreateIconFromResource          (USER32.76)
+ *		CreateIconFromResource (USER32.@)
  */
 HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize,
                                            BOOL bIcon, DWORD dwVersion)
@@ -671,7 +671,7 @@ HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize,
 
 
 /**********************************************************************
- *          CreateIconFromResourceEx          (USER32.77)
+ *		CreateIconFromResourceEx (USER32.@)
  */
 HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize,
                                            BOOL bIcon, DWORD dwVersion,
@@ -1066,7 +1066,7 @@ HCURSOR16 CURSORICON_IconToCursor(HICON16 hIcon, BOOL bSemiTransparent)
 
 
 /***********************************************************************
- *           LoadCursor16    (USER.173)
+ *		LoadCursor (USER.173)
  */
 HCURSOR16 WINAPI LoadCursor16( HINSTANCE16 hInstance, LPCSTR name )
 {
@@ -1075,7 +1075,7 @@ HCURSOR16 WINAPI LoadCursor16( HINSTANCE16 hInstance, LPCSTR name )
 
 
 /***********************************************************************
- *           LoadIcon16    (USER.174)
+ *		LoadIcon (USER.174)
  */
 HICON16 WINAPI LoadIcon16( HINSTANCE16 hInstance, LPCSTR name )
 {
@@ -1084,7 +1084,7 @@ HICON16 WINAPI LoadIcon16( HINSTANCE16 hInstance, LPCSTR name )
 
 
 /***********************************************************************
- *           CreateCursor16    (USER.406)
+ *		CreateCursor (USER.406)
  */
 HCURSOR16 WINAPI CreateCursor16( HINSTANCE16 hInstance,
                                  INT16 xHotSpot, INT16 yHotSpot,
@@ -1109,7 +1109,7 @@ HCURSOR16 WINAPI CreateCursor16( HINSTANCE16 hInstance,
 
 
 /***********************************************************************
- *           CreateCursor    (USER32.67)
+ *		CreateCursor (USER32.@)
  */
 HCURSOR WINAPI CreateCursor( HINSTANCE hInstance,
                                  INT xHotSpot, INT yHotSpot,
@@ -1134,7 +1134,7 @@ HCURSOR WINAPI CreateCursor( HINSTANCE hInstance,
 
 
 /***********************************************************************
- *           CreateIcon16    (USER.407)
+ *		CreateIcon (USER.407)
  */
 HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth,
                              INT16 nHeight, BYTE bPlanes, BYTE bBitsPixel,
@@ -1158,7 +1158,7 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth,
 
 
 /***********************************************************************
- *           CreateIcon    (USER32.75)
+ *		CreateIcon (USER32.@)
  */
 HICON WINAPI CreateIcon( HINSTANCE hInstance, INT nWidth,
                              INT nHeight, BYTE bPlanes, BYTE bBitsPixel,
@@ -1182,7 +1182,7 @@ HICON WINAPI CreateIcon( HINSTANCE hInstance, INT nWidth,
 
 
 /***********************************************************************
- *           CreateCursorIconIndirect    (USER.408)
+ *		CreateCursorIconIndirect (USER.408)
  */
 HGLOBAL16 WINAPI CreateCursorIconIndirect16( HINSTANCE16 hInstance,
                                            CURSORICONINFO *info,
@@ -1212,7 +1212,7 @@ HGLOBAL16 WINAPI CreateCursorIconIndirect16( HINSTANCE16 hInstance,
 
 
 /***********************************************************************
- *           CopyIcon16    (USER.368)
+ *		CopyIcon (USER.368)
  */
 HICON16 WINAPI CopyIcon16( HINSTANCE16 hInstance, HICON16 hIcon )
 {
@@ -1222,7 +1222,7 @@ HICON16 WINAPI CopyIcon16( HINSTANCE16 hInstance, HICON16 hIcon )
 
 
 /***********************************************************************
- *           CopyIcon    (USER32.60)
+ *		CopyIcon (USER32.@)
  */
 HICON WINAPI CopyIcon( HICON hIcon )
 {
@@ -1234,7 +1234,7 @@ HICON WINAPI CopyIcon( HICON hIcon )
 
 
 /***********************************************************************
- *           CopyCursor16    (USER.369)
+ *		CopyCursor (USER.369)
  */
 HCURSOR16 WINAPI CopyCursor16( HINSTANCE16 hInstance, HCURSOR16 hCursor )
 {
@@ -1243,7 +1243,7 @@ HCURSOR16 WINAPI CopyCursor16( HINSTANCE16 hInstance, HCURSOR16 hCursor )
 }
 
 /**********************************************************************
- *	    CURSORICON_Destroy   (USER.610)
+ *		DestroyIcon32 (USER.610)
  *
  * This routine is actually exported from Win95 USER under the name
  * DestroyIcon32 ...  The behaviour implemented here should mimic 
@@ -1283,7 +1283,7 @@ WORD WINAPI CURSORICON_Destroy( HGLOBAL16 handle, UINT16 flags )
 }
 
 /***********************************************************************
- *           DestroyIcon16    (USER.457)
+ *		DestroyIcon16 (USER.457)
  */
 BOOL16 WINAPI DestroyIcon16( HICON16 hIcon )
 {
@@ -1291,7 +1291,7 @@ BOOL16 WINAPI DestroyIcon16( HICON16 hIcon )
 }
 
 /***********************************************************************
- *           DestroyIcon      (USER32.133)
+ *		DestroyIcon (USER32.@)
  */
 BOOL WINAPI DestroyIcon( HICON hIcon )
 {
@@ -1299,7 +1299,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon )
 }
 
 /***********************************************************************
- *           DestroyCursor16  (USER.458)
+ *		DestroyCursor (USER.458)
  */
 BOOL16 WINAPI DestroyCursor16( HCURSOR16 hCursor )
 {
@@ -1307,7 +1307,7 @@ BOOL16 WINAPI DestroyCursor16( HCURSOR16 hCursor )
 }
 
 /***********************************************************************
- *           DestroyCursor    (USER32.132)
+ *		DestroyCursor (USER32.@)
  */
 BOOL WINAPI DestroyCursor( HCURSOR hCursor )
 {
@@ -1316,7 +1316,7 @@ BOOL WINAPI DestroyCursor( HCURSOR hCursor )
 
 
 /***********************************************************************
- *           DrawIcon16    (USER.84)
+ *		DrawIcon (USER.84)
  */
 BOOL16 WINAPI DrawIcon16( HDC16 hdc, INT16 x, INT16 y, HICON16 hIcon )
 {
@@ -1325,7 +1325,7 @@ BOOL16 WINAPI DrawIcon16( HDC16 hdc, INT16 x, INT16 y, HICON16 hIcon )
 
 
 /***********************************************************************
- *           DrawIcon    (USER32.159)
+ *		DrawIcon (USER32.@)
  */
 BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon )
 {
@@ -1363,7 +1363,7 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon )
 
 
 /***********************************************************************
- *           IconSize16    (USER.86)
+ *		IconSize (USER.86)
  *
  * See "Undocumented Windows". Used by W2.0 paint.exe.
  */
@@ -1374,7 +1374,7 @@ DWORD WINAPI IconSize16( void )
 
 
 /***********************************************************************
- *           DumpIcon    (USER.459)
+ *		DumpIcon (USER.459)
  */
 DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen,
                        SEGPTR *lpXorBits, SEGPTR *lpAndBits )
@@ -1393,7 +1393,7 @@ DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen,
 
 
 /***********************************************************************
- *           SetCursor16    (USER.69)
+ *		SetCursor (USER.69)
  */
 HCURSOR16 WINAPI SetCursor16( HCURSOR16 hCursor )
 {
@@ -1402,7 +1402,7 @@ HCURSOR16 WINAPI SetCursor16( HCURSOR16 hCursor )
 
 
 /***********************************************************************
- *           SetCursor    (USER32.472)
+ *		SetCursor (USER32.@)
  * RETURNS:
  *	A handle to the previous cursor shape.
  */
@@ -1426,7 +1426,7 @@ HCURSOR WINAPI SetCursor(
 
 
 /***********************************************************************
- *           SetCursorPos16    (USER.70)
+ *		SetCursorPos (USER.70)
  */
 void WINAPI SetCursorPos16( INT16 x, INT16 y )
 {
@@ -1435,7 +1435,7 @@ void WINAPI SetCursorPos16( INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           SetCursorPos    (USER32.474)
+ *		SetCursorPos (USER32.@)
  */
 BOOL WINAPI SetCursorPos( INT x, INT y )
 {
@@ -1445,7 +1445,7 @@ BOOL WINAPI SetCursorPos( INT x, INT y )
 
 
 /***********************************************************************
- *           ShowCursor16    (USER.71)
+ *		ShowCursor (USER.71)
  */
 INT16 WINAPI ShowCursor16( BOOL16 bShow )
 {
@@ -1454,7 +1454,7 @@ INT16 WINAPI ShowCursor16( BOOL16 bShow )
 
 
 /***********************************************************************
- *           ShowCursor    (USER32.530)
+ *		ShowCursor (USER32.@)
  */
 INT WINAPI ShowCursor( BOOL bShow )
 {
@@ -1479,7 +1479,7 @@ INT WINAPI ShowCursor( BOOL bShow )
 
 
 /***********************************************************************
- *           GetCursor16    (USER.247)
+ *		GetCursor (USER.247)
  */
 HCURSOR16 WINAPI GetCursor16(void)
 {
@@ -1488,7 +1488,7 @@ HCURSOR16 WINAPI GetCursor16(void)
 
 
 /***********************************************************************
- *           GetCursor    (USER32.227)
+ *		GetCursor (USER32.@)
  */
 HCURSOR WINAPI GetCursor(void)
 {
@@ -1497,7 +1497,7 @@ HCURSOR WINAPI GetCursor(void)
 
 
 /***********************************************************************
- *           ClipCursor16    (USER.16)
+ *		ClipCursor (USER.16)
  */
 BOOL16 WINAPI ClipCursor16( const RECT16 *rect )
 {
@@ -1508,7 +1508,7 @@ BOOL16 WINAPI ClipCursor16( const RECT16 *rect )
 
 
 /***********************************************************************
- *           ClipCursor    (USER32.53)
+ *		ClipCursor (USER32.@)
  */
 BOOL WINAPI ClipCursor( const RECT *rect )
 {
@@ -1519,7 +1519,7 @@ BOOL WINAPI ClipCursor( const RECT *rect )
 
 
 /***********************************************************************
- *           GetClipCursor16    (USER.309)
+ *		GetClipCursor (USER.309)
  */
 void WINAPI GetClipCursor16( RECT16 *rect )
 {
@@ -1528,7 +1528,7 @@ void WINAPI GetClipCursor16( RECT16 *rect )
 
 
 /***********************************************************************
- *           GetClipCursor    (USER32.221)
+ *		GetClipCursor (USER32.@)
  */
 BOOL WINAPI GetClipCursor( RECT *rect )
 {
@@ -1541,7 +1541,7 @@ BOOL WINAPI GetClipCursor( RECT *rect )
 }
 
 /**********************************************************************
- *          LookupIconIdFromDirectoryEx16	(USER.364)
+ *		LookupIconIdFromDirectoryEx (USER.364)
  *
  * FIXME: exact parameter sizes
  */
@@ -1576,7 +1576,7 @@ INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon,
 }
 
 /**********************************************************************
- *          LookupIconIdFromDirectoryEx       (USER32.380)
+ *		LookupIconIdFromDirectoryEx (USER32.@)
  */
 INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE dir, BOOL bIcon,
              INT width, INT height, UINT cFlag )
@@ -1585,7 +1585,7 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE dir, BOOL bIcon,
 }
 
 /**********************************************************************
- *          LookupIconIdFromDirectory		(USER.???)
+ *		LookupIconIdFromDirectory (USER.???)
  */
 INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon )
 {
@@ -1595,7 +1595,7 @@ INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon )
 }
 
 /**********************************************************************
- *          LookupIconIdFromDirectory		(USER32.379)
+ *		LookupIconIdFromDirectory (USER32.@)
  */
 INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon )
 {
@@ -1605,7 +1605,7 @@ INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon )
 }
 
 /**********************************************************************
- *	    GetIconID    (USER.455)
+ *		GetIconID (USER.455)
  */
 WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType )
 {
@@ -1629,7 +1629,7 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType )
 }
 
 /**********************************************************************
- *          LoadCursorIconHandler    (USER.336)
+ *		LoadCursorIconHandler (USER.336)
  *
  * Supposed to load resources of Windows 2.x applications.
  */
@@ -1641,7 +1641,7 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule
 }
 
 /**********************************************************************
- *          LoadDIBIconHandler    (USER.357)
+ *		LoadDIBIconHandler (USER.357)
  * 
  * RT_ICON resource loader, installed by USER_SignalProc when module
  * is initialized.
@@ -1666,7 +1666,7 @@ HGLOBAL16 WINAPI LoadDIBIconHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, HRS
 }
 
 /**********************************************************************
- *          LoadDIBCursorHandler    (USER.356)
+ *		LoadDIBCursorHandler (USER.356)
  *
  * RT_CURSOR resource loader. Same as above.
  */
@@ -1684,7 +1684,7 @@ HGLOBAL16 WINAPI LoadDIBCursorHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, H
 }
 
 /**********************************************************************
- *	    LoadIconHandler    (USER.456)
+ *		LoadIconHandler (USER.456)
  */
 HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew )
 {
@@ -1697,7 +1697,7 @@ HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew )
 }
 
 /***********************************************************************
- *           LoadCursorW            (USER32.362)
+ *		LoadCursorW (USER32.@)
  */
 HCURSOR WINAPI LoadCursorW(HINSTANCE hInstance, LPCWSTR name)
 {
@@ -1706,7 +1706,7 @@ HCURSOR WINAPI LoadCursorW(HINSTANCE hInstance, LPCWSTR name)
 }
 
 /***********************************************************************
- *           LoadCursorA            (USER32.359)
+ *		LoadCursorA (USER32.@)
  */
 HCURSOR WINAPI LoadCursorA(HINSTANCE hInstance, LPCSTR name)
 {
@@ -1715,8 +1715,8 @@ HCURSOR WINAPI LoadCursorA(HINSTANCE hInstance, LPCSTR name)
 }
 
 /***********************************************************************
-*            LoadCursorFromFileW    (USER32.361)
-*/
+ *		LoadCursorFromFileW (USER32.@)
+ */
 HCURSOR WINAPI LoadCursorFromFileW (LPCWSTR name)
 {
     return LoadImageW( 0, name, IMAGE_CURSOR, 0, 0, 
@@ -1724,8 +1724,8 @@ HCURSOR WINAPI LoadCursorFromFileW (LPCWSTR name)
 }
 
 /***********************************************************************
-*            LoadCursorFromFileA    (USER32.360)
-*/
+ *		LoadCursorFromFileA (USER32.@)
+ */
 HCURSOR WINAPI LoadCursorFromFileA (LPCSTR name)
 {
     return LoadImageA( 0, name, IMAGE_CURSOR, 0, 0, 
@@ -1733,7 +1733,7 @@ HCURSOR WINAPI LoadCursorFromFileA (LPCSTR name)
 }
   
 /***********************************************************************
- *           LoadIconW          (USER32.364)
+ *		LoadIconW (USER32.@)
  */
 HICON WINAPI LoadIconW(HINSTANCE hInstance, LPCWSTR name)
 {
@@ -1742,7 +1742,7 @@ HICON WINAPI LoadIconW(HINSTANCE hInstance, LPCWSTR name)
 }
 
 /***********************************************************************
- *           LoadIconA          (USER32.363)
+ *		LoadIconA (USER32.@)
  */
 HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name)
 {
@@ -1751,7 +1751,7 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name)
 }
 
 /**********************************************************************
- *          GetIconInfo16       (USER.395)
+ *		GetIconInfo (USER.395)
  */
 BOOL16 WINAPI GetIconInfo16(HICON16 hIcon,LPICONINFO16 iconinfo)
 {
@@ -1767,7 +1767,7 @@ BOOL16 WINAPI GetIconInfo16(HICON16 hIcon,LPICONINFO16 iconinfo)
 }
 
 /**********************************************************************
- *          GetIconInfo		(USER32.242)
+ *		GetIconInfo (USER32.@)
  */
 BOOL WINAPI GetIconInfo(HICON hIcon,PICONINFO iconinfo) {
     CURSORICONINFO	*ciconinfo;
@@ -1804,7 +1804,7 @@ BOOL WINAPI GetIconInfo(HICON hIcon,PICONINFO iconinfo) {
 }
 
 /**********************************************************************
- *          CreateIconIndirect		(USER32.78)
+ *		CreateIconIndirect (USER32.@)
  */
 HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
 {
@@ -1855,8 +1855,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
 
 
 /**********************************************************************
- *          
- DrawIconEx16		(USER.394)
+ *		DrawIconEx (USER.394)
  */
 BOOL16 WINAPI DrawIconEx16 (HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon,
 			    INT16 cxWidth, INT16 cyWidth, UINT16 istep,
@@ -1868,7 +1867,7 @@ BOOL16 WINAPI DrawIconEx16 (HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon,
 
 
 /******************************************************************************
- * DrawIconEx [USER32.160]  Draws an icon or cursor on device context
+ *		DrawIconEx (USER32.@) Draws an icon or cursor on device context
  *
  * NOTES
  *    Why is this using SM_CXICON instead of SM_CXCURSOR?
@@ -2137,7 +2136,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance,LPCWSTR name, UINT loadflags )
 
 
 /***********************************************************************
- * LoadImage16 [USER.389]
+ *		LoadImage16 (USER.389)
  *
  */
 HANDLE16 WINAPI LoadImage16( HINSTANCE16 hinst, LPCSTR name, UINT16 type,
@@ -2147,7 +2146,7 @@ HANDLE16 WINAPI LoadImage16( HINSTANCE16 hinst, LPCSTR name, UINT16 type,
 }
 
 /**********************************************************************
- *	    LoadImageA    (USER32.365)
+ *		LoadImageA (USER32.@)
  * 
  * FIXME: implementation lacks some features, see LR_ defines in windows.h
  */
@@ -2167,7 +2166,7 @@ HANDLE WINAPI LoadImageA( HINSTANCE hinst, LPCSTR name, UINT type,
 
 
 /******************************************************************************
- * LoadImageW [USER32.366]  Loads an icon, cursor, or bitmap
+ *		LoadImageW (USER32.@) Loads an icon, cursor, or bitmap
  *
  * PARAMS
  *    hinst     [I] Handle of instance that contains image
@@ -2228,7 +2227,7 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type,
 
 
 /******************************************************************************
- * CopyImage16 [USER.390]  Creates new image and copies attributes to it
+ *		CopyImage (USER.390) Creates new image and copies attributes to it
  *
  */
 HICON16 WINAPI CopyImage16( HANDLE16 hnd, UINT16 type, INT16 desiredx,
@@ -2239,7 +2238,7 @@ HICON16 WINAPI CopyImage16( HANDLE16 hnd, UINT16 type, INT16 desiredx,
 }
 
 /******************************************************************************
- * CopyImage [USER32.61]  Creates new image and copies attributes to it
+ *		CopyImage (USER32.@) Creates new image and copies attributes to it
  *
  * PARAMS
  *    hnd      [I] Handle to image to copy
@@ -2275,7 +2274,7 @@ HICON WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
 
 
 /******************************************************************************
- * LoadBitmapW [USER32.358]  Loads bitmap from the executable file
+ *		LoadBitmapW (USER32.@) Loads bitmap from the executable file
  *
  * RETURNS
  *    Success: Handle to specified bitmap
@@ -2289,7 +2288,7 @@ HBITMAP WINAPI LoadBitmapW(
 }
 
 /**********************************************************************
- *	    LoadBitmapA   (USER32.357)
+ *		LoadBitmapA (USER32.@)
  */
 HBITMAP WINAPI LoadBitmapA( HINSTANCE instance, LPCSTR name )
 {
@@ -2297,7 +2296,7 @@ HBITMAP WINAPI LoadBitmapA( HINSTANCE instance, LPCSTR name )
 }
 
 /**********************************************************************
- *	    LoadBitmap16    (USER.175)
+ *		LoadBitmap (USER.175)
  */
 HBITMAP16 WINAPI LoadBitmap16( HINSTANCE16 instance, LPCSTR name )
 {
diff --git a/windows/dce.c b/windows/dce.c
index 205f2c77b36..a46e601e452 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -641,7 +641,7 @@ INT DCE_ExcludeRgn( HDC hDC, WND* wnd, HRGN hRgn )
 
 
 /***********************************************************************
- *           GetDCEx16    (USER.359)
+ *		GetDCEx (USER.359)
  */
 HDC16 WINAPI GetDCEx16( HWND16 hwnd, HRGN16 hrgnClip, DWORD flags )
 {
@@ -650,7 +650,7 @@ HDC16 WINAPI GetDCEx16( HWND16 hwnd, HRGN16 hrgnClip, DWORD flags )
 
 
 /***********************************************************************
- *           GetDCEx    (USER32.231)
+ *		GetDCEx (USER32.@)
  *
  * Unimplemented flags: DCX_LOCKWINDOWUPDATE
  *
@@ -888,7 +888,7 @@ END:
 
 
 /***********************************************************************
- *           GetDC16    (USER.66)
+ *		GetDC (USER.66)
  */
 HDC16 WINAPI GetDC16( HWND16 hwnd )
 {
@@ -897,7 +897,7 @@ HDC16 WINAPI GetDC16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           GetDC    (USER32.230)
+ *		GetDC (USER32.@)
  * RETURNS
  *	:Handle to DC
  *	NULL: Failure
@@ -912,7 +912,7 @@ HDC WINAPI GetDC(
 
 
 /***********************************************************************
- *           GetWindowDC16    (USER.67)
+ *		GetWindowDC (USER.67)
  */
 HDC16 WINAPI GetWindowDC16( HWND16 hwnd )
 {
@@ -922,7 +922,7 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           GetWindowDC    (USER32.304)
+ *		GetWindowDC (USER32.@)
  */
 HDC WINAPI GetWindowDC( HWND hwnd )
 {
@@ -932,7 +932,7 @@ HDC WINAPI GetWindowDC( HWND hwnd )
 
 
 /***********************************************************************
- *           ReleaseDC16    (USER.68)
+ *		ReleaseDC (USER.68)
  */
 INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc )
 {
@@ -941,7 +941,7 @@ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc )
 
 
 /***********************************************************************
- *           ReleaseDC    (USER32.440)
+ *		ReleaseDC (USER32.@)
  *
  * RETURNS
  *	1: Success
@@ -971,7 +971,7 @@ INT WINAPI ReleaseDC(
 }
 
 /***********************************************************************
- *           DCHook    (USER.362)
+ *		DCHook (USER.362)
  *
  * See "Undoc. Windows" for hints (DC, SetDCHook, SetHookFlags)..  
  */
@@ -1057,7 +1057,7 @@ BOOL16 WINAPI DCHook16( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
 
 
 /**********************************************************************
- *          WindowFromDC16   (USER.117)
+ *		WindowFromDC (USER.117)
  */
 HWND16 WINAPI WindowFromDC16( HDC16 hDC )
 {
@@ -1066,7 +1066,7 @@ HWND16 WINAPI WindowFromDC16( HDC16 hDC )
 
 
 /**********************************************************************
- *          WindowFromDC   (USER32.581)
+ *		WindowFromDC (USER32.@)
  */
 HWND WINAPI WindowFromDC( HDC hDC )
 {
@@ -1086,7 +1086,7 @@ HWND WINAPI WindowFromDC( HDC hDC )
 
 
 /***********************************************************************
- *           LockWindowUpdate16   (USER.294)
+ *		LockWindowUpdate (USER.294)
  */
 BOOL16 WINAPI LockWindowUpdate16( HWND16 hwnd )
 {
@@ -1095,7 +1095,7 @@ BOOL16 WINAPI LockWindowUpdate16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           LockWindowUpdate   (USER32.378)
+ *		LockWindowUpdate (USER32.@)
  */
 BOOL WINAPI LockWindowUpdate( HWND hwnd )
 {
diff --git a/windows/defdlg.c b/windows/defdlg.c
index 990a89c4dd5..fc16d1ba08b 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -245,7 +245,7 @@ static LRESULT DEFDLG_Epilog(DIALOGINFO* dlgInfo, UINT msg, BOOL fResult)
 }
 
 /***********************************************************************
- *           DefDlgProc16   (USER.308)
+ *		DefDlgProc (USER.308)
  */
 LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
                              LPARAM lParam )
@@ -305,7 +305,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           DefDlgProcA   (USER32.120)
+ *		DefDlgProcA (USER32.@)
  */
 LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg,
                               WPARAM wParam, LPARAM lParam )
@@ -365,7 +365,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg,
 
 
 /***********************************************************************
- *           DefDlgProcW   (USER32.121)
+ *		DefDlgProcW (USER32.@)
  */
 LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam,
                               LPARAM lParam )
diff --git a/windows/defwnd.c b/windows/defwnd.c
index c62eb1f7709..0c230d41788 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -650,7 +650,7 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- *           DefWindowProc16   (USER.107)
+ *		DefWindowProc (USER.107)
  */
 LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
                                 LPARAM lParam )
@@ -721,7 +721,7 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
 
 /***********************************************************************
- *  DefWindowProcA [USER32.126] 
+ *		DefWindowProcA (USER32.@)
  *
  */
 LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam,
@@ -828,7 +828,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- * DefWindowProcW [USER32.127] Calls default window message handler
+ *		DefWindowProcW (USER32.@) Calls default window message handler
  * 
  * Calls default window procedure for messages not processed 
  *  by application.
diff --git a/windows/dialog.c b/windows/dialog.c
index 6566b9b97b8..3fb66e27c8b 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -906,7 +906,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
 
 
 /***********************************************************************
- *           CreateDialog16   (USER.89)
+ *		CreateDialog (USER.89)
  */
 HWND16 WINAPI CreateDialog16( HINSTANCE16 hInst, LPCSTR dlgTemplate,
                               HWND16 owner, DLGPROC16 dlgProc )
@@ -916,7 +916,7 @@ HWND16 WINAPI CreateDialog16( HINSTANCE16 hInst, LPCSTR dlgTemplate,
 
 
 /***********************************************************************
- *           CreateDialogParam16   (USER.241)
+ *		CreateDialogParam16 (USER.241)
  */
 HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, LPCSTR dlgTemplate,
                                    HWND16 owner, DLGPROC16 dlgProc,
@@ -940,7 +940,7 @@ HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, LPCSTR dlgTemplate,
 }
 
 /***********************************************************************
- *           CreateDialogParamA   (USER32.73)
+ *		CreateDialogParamA (USER32.@)
  */
 HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name,
                                     HWND owner, DLGPROC dlgProc,
@@ -955,7 +955,7 @@ HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name,
 
 
 /***********************************************************************
- *           CreateDialogParamW   (USER32.74)
+ *		CreateDialogParamW (USER32.@)
  */
 HWND WINAPI CreateDialogParamW( HINSTANCE hInst, LPCWSTR name,
                                     HWND owner, DLGPROC dlgProc,
@@ -970,7 +970,7 @@ HWND WINAPI CreateDialogParamW( HINSTANCE hInst, LPCWSTR name,
 
 
 /***********************************************************************
- *           CreateDialogIndirect16   (USER.219)
+ *		CreateDialogIndirect (USER.219)
  */
 HWND16 WINAPI CreateDialogIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
                                       HWND16 owner, DLGPROC16 dlgProc )
@@ -980,7 +980,7 @@ HWND16 WINAPI CreateDialogIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
 
 
 /***********************************************************************
- *           CreateDialogIndirectParam16   (USER.242)
+ *		CreateDialogIndirectParam16 (USER.242) (USER32.@)
  */
 HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst,
                                            LPCVOID dlgTemplate,
@@ -993,7 +993,7 @@ HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst,
 
 
 /***********************************************************************
- *           CreateDialogIndirectParamA   (USER32.69)
+ *		CreateDialogIndirectParamA (USER32.@)
  */
 HWND WINAPI CreateDialogIndirectParamA( HINSTANCE hInst,
                                             LPCVOID dlgTemplate,
@@ -1005,7 +1005,7 @@ HWND WINAPI CreateDialogIndirectParamA( HINSTANCE hInst,
 }
 
 /***********************************************************************
- *           CreateDialogIndirectParamAorW   (USER32.71)
+ *		CreateDialogIndirectParamAorW (USER32.@)
  */
 HWND WINAPI CreateDialogIndirectParamAorW( HINSTANCE hInst,
                                             LPCVOID dlgTemplate,
@@ -1017,7 +1017,7 @@ HWND WINAPI CreateDialogIndirectParamAorW( HINSTANCE hInst,
 }
 
 /***********************************************************************
- *           CreateDialogIndirectParamW   (USER32.72)
+ *		CreateDialogIndirectParamW (USER32.@)
  */
 HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst,
                                             LPCVOID dlgTemplate,
@@ -1066,7 +1066,7 @@ static INT DIALOG_DoDialogBox( HWND hwnd, HWND owner )
 
 
 /***********************************************************************
- *           DialogBox16   (USER.87)
+ *		DialogBox (USER.87)
  */
 INT16 WINAPI DialogBox16( HINSTANCE16 hInst, LPCSTR dlgTemplate,
                           HWND16 owner, DLGPROC16 dlgProc )
@@ -1076,7 +1076,7 @@ INT16 WINAPI DialogBox16( HINSTANCE16 hInst, LPCSTR dlgTemplate,
 
 
 /***********************************************************************
- *           DialogBoxParam16   (USER.239)
+ *		DialogBoxParam (USER.239)
  */
 INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template,
                                HWND16 owner, DLGPROC16 dlgProc, LPARAM param )
@@ -1101,7 +1101,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template,
 
 
 /***********************************************************************
- *           DialogBoxParamA   (USER32.139)
+ *		DialogBoxParamA (USER32.@)
  */
 INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
                                 HWND owner, DLGPROC dlgProc, LPARAM param )
@@ -1118,7 +1118,7 @@ INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
 
 
 /***********************************************************************
- *           DialogBoxParamW   (USER32.140)
+ *		DialogBoxParamW (USER32.@)
  */
 INT WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
                                 HWND owner, DLGPROC dlgProc, LPARAM param )
@@ -1135,7 +1135,7 @@ INT WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
 
 
 /***********************************************************************
- *           DialogBoxIndirect16   (USER.218)
+ *		DialogBoxIndirect (USER.218)
  */
 INT16 WINAPI DialogBoxIndirect16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
                                   HWND16 owner, DLGPROC16 dlgProc )
@@ -1145,7 +1145,7 @@ INT16 WINAPI DialogBoxIndirect16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
 
 
 /***********************************************************************
- *           DialogBoxIndirectParam16   (USER.240)
+ *		DialogBoxIndirectParam16 (USER.240) (USER32.@)
  */
 INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
                                        HWND16 owner, DLGPROC16 dlgProc,
@@ -1164,7 +1164,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
 
 
 /***********************************************************************
- *           DialogBoxIndirectParamA   (USER32.136)
+ *		DialogBoxIndirectParamA (USER32.@)
  */
 INT WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCVOID template,
                                        HWND owner, DLGPROC dlgProc,
@@ -1178,7 +1178,7 @@ INT WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCVOID template,
 
 
 /***********************************************************************
- *           DialogBoxIndirectParamW   (USER32.138)
+ *		DialogBoxIndirectParamW (USER32.@)
  */
 INT WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCVOID template,
                                        HWND owner, DLGPROC dlgProc,
@@ -1191,7 +1191,7 @@ INT WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCVOID template,
 }
 
 /***********************************************************************
- *           DialogBoxIndirectParamAorW   (USER32.138)
+ *		DialogBoxIndirectParamAorW (USER32.@)
  */
 INT WINAPI DialogBoxIndirectParamAorW(HINSTANCE hInstance, LPCVOID template,
                                        HWND owner, DLGPROC dlgProc,
@@ -1207,7 +1207,7 @@ INT WINAPI DialogBoxIndirectParamAorW(HINSTANCE hInstance, LPCVOID template,
 }
 
 /***********************************************************************
- *           EndDialog16   (USER.88)
+ *		EndDialog (USER.88)
  */
 BOOL16 WINAPI EndDialog16( HWND16 hwnd, INT16 retval )
 {
@@ -1216,7 +1216,7 @@ BOOL16 WINAPI EndDialog16( HWND16 hwnd, INT16 retval )
 
 
 /***********************************************************************
- *           EndDialog   (USER32.173)
+ *		EndDialog (USER32.@)
  */
 BOOL WINAPI EndDialog( HWND hwnd, INT retval )
 {
@@ -1495,7 +1495,7 @@ static BOOL DIALOG_IsDialogMessage( HWND hwnd, HWND hwndDlg,
 
 
 /***********************************************************************
- *           IsDialogMessage16   (USER.90)
+ *		IsDialogMessage (USER.90)
  */
 BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, SEGPTR msg16 )
 {
@@ -1521,7 +1521,7 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, SEGPTR msg16 )
 
 
 /***********************************************************************
- *           IsDialogMessageA   (USER32.342)
+ *		IsDialogMessageA (USER32.@)
  */
 BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG msg )
 {
@@ -1546,7 +1546,7 @@ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG msg )
 
 
 /***********************************************************************
- *           IsDialogMessageW   (USER32.343)
+ *		IsDialogMessageW (USER32.@)
  */
 BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg )
 {
@@ -1571,7 +1571,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg )
 
 
 /***********************************************************************
- *         GetDlgCtrlID16   (USER.277)
+ *		GetDlgCtrlID (USER.277)
  */
 INT16 WINAPI GetDlgCtrlID16( HWND16 hwnd )
 {
@@ -1587,7 +1587,7 @@ INT16 WINAPI GetDlgCtrlID16( HWND16 hwnd )
  
 
 /***********************************************************************
- *         GetDlgCtrlID   (USER32.234)
+ *		GetDlgCtrlID (USER32.@)
  */
 INT WINAPI GetDlgCtrlID( HWND hwnd )
 {
@@ -1601,7 +1601,7 @@ INT WINAPI GetDlgCtrlID( HWND hwnd )
  
 
 /***********************************************************************
- *           GetDlgItem16   (USER.91)
+ *		GetDlgItem (USER.91)
  */
 HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id )
 {
@@ -1620,7 +1620,7 @@ HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id )
 
 
 /***********************************************************************
- *           GetDlgItem   (USER32.235)
+ *		GetDlgItem (USER32.@)
  */
 HWND WINAPI GetDlgItem( HWND hwndDlg, INT id )
 {
@@ -1639,7 +1639,7 @@ HWND WINAPI GetDlgItem( HWND hwndDlg, INT id )
 
 
 /*******************************************************************
- *           SendDlgItemMessage16   (USER.101)
+ *		SendDlgItemMessage (USER.101)
  */
 LRESULT WINAPI SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg,
                                      WPARAM16 wParam, LPARAM lParam )
@@ -1651,7 +1651,7 @@ LRESULT WINAPI SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg,
 
 
 /*******************************************************************
- *           SendDlgItemMessageA   (USER32.452)
+ *		SendDlgItemMessageA (USER32.@)
  */
 LRESULT WINAPI SendDlgItemMessageA( HWND hwnd, INT id, UINT msg,
                                       WPARAM wParam, LPARAM lParam )
@@ -1663,7 +1663,7 @@ LRESULT WINAPI SendDlgItemMessageA( HWND hwnd, INT id, UINT msg,
 
 
 /*******************************************************************
- *           SendDlgItemMessageW   (USER32.453)
+ *		SendDlgItemMessageW (USER32.@)
  */
 LRESULT WINAPI SendDlgItemMessageW( HWND hwnd, INT id, UINT msg,
                                       WPARAM wParam, LPARAM lParam )
@@ -1675,7 +1675,7 @@ LRESULT WINAPI SendDlgItemMessageW( HWND hwnd, INT id, UINT msg,
 
 
 /*******************************************************************
- *           SetDlgItemText16   (USER.92)
+ *		SetDlgItemText (USER.92)
  */
 void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString )
 {
@@ -1684,7 +1684,7 @@ void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString )
 
 
 /*******************************************************************
- *           SetDlgItemTextA   (USER32.478)
+ *		SetDlgItemTextA (USER32.@)
  */
 BOOL WINAPI SetDlgItemTextA( HWND hwnd, INT id, LPCSTR lpString )
 {
@@ -1693,7 +1693,7 @@ BOOL WINAPI SetDlgItemTextA( HWND hwnd, INT id, LPCSTR lpString )
 
 
 /*******************************************************************
- *           SetDlgItemTextW   (USER32.479)
+ *		SetDlgItemTextW (USER32.@)
  */
 BOOL WINAPI SetDlgItemTextW( HWND hwnd, INT id, LPCWSTR lpString )
 {
@@ -1702,7 +1702,7 @@ BOOL WINAPI SetDlgItemTextW( HWND hwnd, INT id, LPCWSTR lpString )
 
 
 /***********************************************************************
- *           GetDlgItemText16   (USER.93)
+ *		GetDlgItemText (USER.93)
  */
 INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len )
 {
@@ -1712,7 +1712,7 @@ INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len )
 
 
 /***********************************************************************
- *           GetDlgItemTextA   (USER32.237)
+ *		GetDlgItemTextA (USER32.@)
  */
 INT WINAPI GetDlgItemTextA( HWND hwnd, INT id, LPSTR str, UINT len )
 {
@@ -1722,7 +1722,7 @@ INT WINAPI GetDlgItemTextA( HWND hwnd, INT id, LPSTR str, UINT len )
 
 
 /***********************************************************************
- *           GetDlgItemTextW   (USER32.238)
+ *		GetDlgItemTextW (USER32.@)
  */
 INT WINAPI GetDlgItemTextW( HWND hwnd, INT id, LPWSTR str, UINT len )
 {
@@ -1732,7 +1732,7 @@ INT WINAPI GetDlgItemTextW( HWND hwnd, INT id, LPWSTR str, UINT len )
 
 
 /*******************************************************************
- *           SetDlgItemInt16   (USER.94)
+ *		SetDlgItemInt (USER.94)
  */
 void WINAPI SetDlgItemInt16( HWND16 hwnd, INT16 id, UINT16 value, BOOL16 fSigned )
 {
@@ -1741,7 +1741,7 @@ void WINAPI SetDlgItemInt16( HWND16 hwnd, INT16 id, UINT16 value, BOOL16 fSigned
 
 
 /*******************************************************************
- *           SetDlgItemInt   (USER32.477)
+ *		SetDlgItemInt (USER32.@)
  */
 BOOL WINAPI SetDlgItemInt( HWND hwnd, INT id, UINT value,
                              BOOL fSigned )
@@ -1756,7 +1756,7 @@ BOOL WINAPI SetDlgItemInt( HWND hwnd, INT id, UINT value,
 
 
 /***********************************************************************
- *           GetDlgItemInt16   (USER.95)
+ *		GetDlgItemInt (USER.95)
  */
 UINT16 WINAPI GetDlgItemInt16( HWND16 hwnd, INT16 id, BOOL16 *translated,
                                BOOL16 fSigned )
@@ -1781,7 +1781,7 @@ UINT16 WINAPI GetDlgItemInt16( HWND16 hwnd, INT16 id, BOOL16 *translated,
 
 
 /***********************************************************************
- *           GetDlgItemInt   (USER32.236)
+ *		GetDlgItemInt (USER32.@)
  */
 UINT WINAPI GetDlgItemInt( HWND hwnd, INT id, BOOL *translated,
                                BOOL fSigned )
@@ -1814,7 +1814,7 @@ UINT WINAPI GetDlgItemInt( HWND hwnd, INT id, BOOL *translated,
 
 
 /***********************************************************************
- *           CheckDlgButton16   (USER.97)
+ *		CheckDlgButton (USER.97)
  */
 BOOL16 WINAPI CheckDlgButton16( HWND16 hwnd, INT16 id, UINT16 check )
 {
@@ -1824,7 +1824,7 @@ BOOL16 WINAPI CheckDlgButton16( HWND16 hwnd, INT16 id, UINT16 check )
 
 
 /***********************************************************************
- *           CheckDlgButton   (USER32.45)
+ *		CheckDlgButton (USER32.@)
  */
 BOOL WINAPI CheckDlgButton( HWND hwnd, INT id, UINT check )
 {
@@ -1834,7 +1834,7 @@ BOOL WINAPI CheckDlgButton( HWND hwnd, INT id, UINT check )
 
 
 /***********************************************************************
- *           IsDlgButtonChecked16   (USER.98)
+ *		IsDlgButtonChecked (USER.98)
  */
 UINT16 WINAPI IsDlgButtonChecked16( HWND16 hwnd, UINT16 id )
 {
@@ -1843,7 +1843,7 @@ UINT16 WINAPI IsDlgButtonChecked16( HWND16 hwnd, UINT16 id )
 
 
 /***********************************************************************
- *           IsDlgButtonChecked   (USER32.344)
+ *		IsDlgButtonChecked (USER32.@)
  */
 UINT WINAPI IsDlgButtonChecked( HWND hwnd, UINT id )
 {
@@ -1852,7 +1852,7 @@ UINT WINAPI IsDlgButtonChecked( HWND hwnd, UINT id )
 
 
 /***********************************************************************
- *           CheckRadioButton16   (USER.96)
+ *		CheckRadioButton (USER.96)
  */
 BOOL16 WINAPI CheckRadioButton16( HWND16 hwndDlg, UINT16 firstID,
                                   UINT16 lastID, UINT16 checkID )
@@ -1890,7 +1890,7 @@ static BOOL CALLBACK CheckRB(HWND hwndChild, LPARAM lParam)
 
 
 /***********************************************************************
- *           CheckRadioButton   (USER32.48)
+ *		CheckRadioButton (USER32.@)
  */
 BOOL WINAPI CheckRadioButton( HWND hwndDlg, UINT firstID,
                               UINT lastID, UINT checkID )
@@ -1908,7 +1908,7 @@ BOOL WINAPI CheckRadioButton( HWND hwndDlg, UINT firstID,
 
 
 /***********************************************************************
- *           GetDialogBaseUnits   (USER.243) (USER32.233)
+ *		GetDialogBaseUnits (USER.243) (USER32.@)
  */
 DWORD WINAPI GetDialogBaseUnits(void)
 {
@@ -1917,7 +1917,7 @@ DWORD WINAPI GetDialogBaseUnits(void)
 
 
 /***********************************************************************
- *           MapDialogRect16   (USER.103)
+ *		MapDialogRect (USER.103)
  */
 void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect )
 {
@@ -1934,7 +1934,7 @@ void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect )
 
 
 /***********************************************************************
- *           MapDialogRect   (USER32.382)
+ *		MapDialogRect (USER32.@)
  */
 BOOL WINAPI MapDialogRect( HWND hwnd, LPRECT rect )
 {
@@ -1952,7 +1952,7 @@ BOOL WINAPI MapDialogRect( HWND hwnd, LPRECT rect )
 
 
 /***********************************************************************
- *           GetNextDlgGroupItem16   (USER.227)
+ *		GetNextDlgGroupItem (USER.227)
  */
 HWND16 WINAPI GetNextDlgGroupItem16( HWND16 hwndDlg, HWND16 hwndCtrl,
                                      BOOL16 fPrevious )
@@ -1962,7 +1962,7 @@ HWND16 WINAPI GetNextDlgGroupItem16( HWND16 hwndDlg, HWND16 hwndCtrl,
 
 
 /***********************************************************************
- *           GetNextDlgGroupItem   (USER32.275)
+ *		GetNextDlgGroupItem (USER32.@)
  */
 HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl,
                                      BOOL fPrevious )
@@ -2051,7 +2051,7 @@ END:
 
 
 /***********************************************************************
- *           GetNextDlgTabItem16   (USER.228)
+ *		GetNextDlgTabItem (USER.228)
  */
 HWND16 WINAPI GetNextDlgTabItem16( HWND16 hwndDlg, HWND16 hwndCtrl,
                                    BOOL16 fPrevious )
@@ -2150,7 +2150,7 @@ static HWND DIALOG_GetNextTabItem( HWND hwndMain, HWND hwndDlg, HWND hwndCtrl, B
 }
 
 /***********************************************************************
- *           GetNextDlgTabItem   (USER32.276)
+ *		GetNextDlgTabItem (USER32.@)
  */
 HWND WINAPI GetNextDlgTabItem( HWND hwndDlg, HWND hwndCtrl,
                                    BOOL fPrevious )
@@ -2339,7 +2339,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
 
 
 /**********************************************************************
- *	    DlgDirSelect    (USER.99)
+ *		DlgDirSelect (USER.99)
  */
 BOOL16 WINAPI DlgDirSelect16( HWND16 hwnd, LPSTR str, INT16 id )
 {
@@ -2348,7 +2348,7 @@ BOOL16 WINAPI DlgDirSelect16( HWND16 hwnd, LPSTR str, INT16 id )
 
 
 /**********************************************************************
- *	    DlgDirSelectComboBox    (USER.194)
+ *		DlgDirSelectComboBox (USER.194)
  */
 BOOL16 WINAPI DlgDirSelectComboBox16( HWND16 hwnd, LPSTR str, INT16 id )
 {
@@ -2357,7 +2357,7 @@ BOOL16 WINAPI DlgDirSelectComboBox16( HWND16 hwnd, LPSTR str, INT16 id )
 
 
 /**********************************************************************
- *           DlgDirSelectEx16    (USER.422)
+ *		DlgDirSelectEx (USER.422)
  */
 BOOL16 WINAPI DlgDirSelectEx16( HWND16 hwnd, LPSTR str, INT16 len, INT16 id )
 {
@@ -2366,7 +2366,7 @@ BOOL16 WINAPI DlgDirSelectEx16( HWND16 hwnd, LPSTR str, INT16 len, INT16 id )
 
 
 /**********************************************************************
- *           DlgDirSelectExA    (USER32.149)
+ *		DlgDirSelectExA (USER32.@)
  */
 BOOL WINAPI DlgDirSelectExA( HWND hwnd, LPSTR str, INT len, INT id )
 {
@@ -2375,7 +2375,7 @@ BOOL WINAPI DlgDirSelectExA( HWND hwnd, LPSTR str, INT len, INT id )
 
 
 /**********************************************************************
- *           DlgDirSelectExW    (USER32.150)
+ *		DlgDirSelectExW (USER32.@)
  */
 BOOL WINAPI DlgDirSelectExW( HWND hwnd, LPWSTR str, INT len, INT id )
 {
@@ -2384,7 +2384,7 @@ BOOL WINAPI DlgDirSelectExW( HWND hwnd, LPWSTR str, INT len, INT id )
 
 
 /**********************************************************************
- *           DlgDirSelectComboBoxEx16    (USER.423)
+ *		DlgDirSelectComboBoxEx (USER.423)
  */
 BOOL16 WINAPI DlgDirSelectComboBoxEx16( HWND16 hwnd, LPSTR str, INT16 len,
                                         INT16 id )
@@ -2394,7 +2394,7 @@ BOOL16 WINAPI DlgDirSelectComboBoxEx16( HWND16 hwnd, LPSTR str, INT16 len,
 
 
 /**********************************************************************
- *           DlgDirSelectComboBoxExA    (USER32.147)
+ *		DlgDirSelectComboBoxExA (USER32.@)
  */
 BOOL WINAPI DlgDirSelectComboBoxExA( HWND hwnd, LPSTR str, INT len,
                                          INT id )
@@ -2404,7 +2404,7 @@ BOOL WINAPI DlgDirSelectComboBoxExA( HWND hwnd, LPSTR str, INT len,
 
 
 /**********************************************************************
- *           DlgDirSelectComboBoxExW    (USER32.148)
+ *		DlgDirSelectComboBoxExW (USER32.@)
  */
 BOOL WINAPI DlgDirSelectComboBoxExW( HWND hwnd, LPWSTR str, INT len,
                                          INT id)
@@ -2414,7 +2414,7 @@ BOOL WINAPI DlgDirSelectComboBoxExW( HWND hwnd, LPWSTR str, INT len,
 
 
 /**********************************************************************
- *	    DlgDirList16    (USER.100)
+ *		DlgDirList (USER.100)
  */
 INT16 WINAPI DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox,
                            INT16 idStatic, UINT16 attrib )
@@ -2429,7 +2429,7 @@ INT16 WINAPI DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox,
 
 
 /**********************************************************************
- *	    DlgDirListA    (USER32.143)
+ *		DlgDirListA (USER32.@)
  */
 INT WINAPI DlgDirListA( HWND hDlg, LPSTR spec, INT idLBox,
                             INT idStatic, UINT attrib )
@@ -2439,7 +2439,7 @@ INT WINAPI DlgDirListA( HWND hDlg, LPSTR spec, INT idLBox,
 
 
 /**********************************************************************
- *	    DlgDirListW    (USER32.146)
+ *		DlgDirListW (USER32.@)
  */
 INT WINAPI DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
                             INT idStatic, UINT attrib )
@@ -2449,7 +2449,7 @@ INT WINAPI DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
 
 
 /**********************************************************************
- *	    DlgDirListComboBox16    (USER.195)
+ *		DlgDirListComboBox (USER.195)
  */
 INT16 WINAPI DlgDirListComboBox16( HWND16 hDlg, LPSTR spec, INT16 idCBox,
                                    INT16 idStatic, UINT16 attrib )
@@ -2459,7 +2459,7 @@ INT16 WINAPI DlgDirListComboBox16( HWND16 hDlg, LPSTR spec, INT16 idCBox,
 
 
 /**********************************************************************
- *	    DlgDirListComboBoxA    (USER32.144)
+ *		DlgDirListComboBoxA (USER32.@)
  */
 INT WINAPI DlgDirListComboBoxA( HWND hDlg, LPSTR spec, INT idCBox,
                                     INT idStatic, UINT attrib )
@@ -2469,7 +2469,7 @@ INT WINAPI DlgDirListComboBoxA( HWND hDlg, LPSTR spec, INT idCBox,
 
 
 /**********************************************************************
- *	    DlgDirListComboBoxW    (USER32.145)
+ *		DlgDirListComboBoxW (USER32.@)
  */
 INT WINAPI DlgDirListComboBoxW( HWND hDlg, LPWSTR spec, INT idCBox,
                                     INT idStatic, UINT attrib )
diff --git a/windows/driver.c b/windows/driver.c
index cef7f10716b..b7c9e1a5a22 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -112,7 +112,7 @@ static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
 }
 
 /**************************************************************************
- *				SendDriverMessage		[USER.251]
+ *		SendDriverMessage (USER.251)
  */
 LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
                                    LPARAM lParam2)
@@ -251,7 +251,7 @@ static	LPWINE_DRIVER	DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam2)
 }
 
 /**************************************************************************
- *				OpenDriver16		        [USER.252]
+ *		OpenDriver16 (USER.252)
  */
 HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2)
 {
@@ -284,7 +284,7 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
 }
 
 /**************************************************************************
- *			CloseDriver16				[USER.253]
+ *		CloseDriver (USER.253)
  */
 LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
 {
@@ -305,7 +305,7 @@ LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
 }
 
 /**************************************************************************
- *				GetDriverModuleHandle	[USER.254]
+ *		GetDriverModuleHandle (USER.254)
  */
 HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 {
@@ -322,7 +322,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 }
 
 /**************************************************************************
- *				DefDriverProc16			[USER.255]
+ *		DefDriverProc (USER.255)
  */
 LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, 
                                LPARAM lParam1, LPARAM lParam2)
@@ -352,7 +352,7 @@ LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
 }
 
 /**************************************************************************
- *				GetDriverInfo			[USER.256]
+ *		GetDriverInfo (USER.256)
  */
 BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, LPDRIVERINFOSTRUCT16 lpDrvInfo)
 {
@@ -375,7 +375,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, LPDRIVERINFOSTRUCT16 lpDrvInfo)
 }
 
 /**************************************************************************
- *				GetNextDriver			[USER.257]
+ *		GetNextDriver (USER.257)
  */
 HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
 {
diff --git a/windows/focus.c b/windows/focus.c
index 6cd00ef6292..50bfc6383a3 100644
--- a/windows/focus.c
+++ b/windows/focus.c
@@ -60,7 +60,7 @@ void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND hFocusFrom, HWND hFocusTo )
 
 
 /*****************************************************************
- *               SetFocus16   (USER.22)
+ *		SetFocus (USER.22)
  */
 HWND16 WINAPI SetFocus16( HWND16 hwnd )
 {
@@ -69,7 +69,7 @@ HWND16 WINAPI SetFocus16( HWND16 hwnd )
 
 
 /*****************************************************************
- *               SetFocus   (USER32.481)
+ *		SetFocus (USER32.@)
  */
 HWND WINAPI SetFocus( HWND hwnd )
 {
@@ -174,7 +174,7 @@ CLEANUP:
 
 
 /*****************************************************************
- *               GetFocus16   (USER.23)
+ *		GetFocus (USER.23)
  */
 HWND16 WINAPI GetFocus16(void)
 {
@@ -183,7 +183,7 @@ HWND16 WINAPI GetFocus16(void)
 
 
 /*****************************************************************
- *               GetFocus   (USER32.240)
+ *		GetFocus (USER32.@)
  */
 HWND WINAPI GetFocus(void)
 {
diff --git a/windows/hook.c b/windows/hook.c
index a2b7ca764b0..dbe1d451bef 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -1212,7 +1212,7 @@ void HOOK_FreeQueueHooks( HQUEUE16 hQueue )
 
 
 /***********************************************************************
- *           SetWindowsHook16   (USER.121)
+ *		SetWindowsHook16 (USER.121)
  */
 FARPROC16 WINAPI SetWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
@@ -1225,7 +1225,7 @@ FARPROC16 WINAPI SetWindowsHook16( INT16 id, HOOKPROC16 proc )
 }
 
 /***********************************************************************
- *           SetWindowsHookA   (USER32.525)
+ *		SetWindowsHookA (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc )
 {
@@ -1233,7 +1233,7 @@ HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc )
 }
 
 /***********************************************************************
- *           SetWindowsHookW   (USER32.528)
+ *		SetWindowsHookW (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc )
 {
@@ -1242,7 +1242,7 @@ HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc )
 
 
 /***********************************************************************
- *           SetWindowsHookEx16   (USER.291)
+ *		SetWindowsHookEx16 (USER.291) (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst,
                                  HTASK16 hTask )
@@ -1256,7 +1256,7 @@ HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst,
 }
 
 /***********************************************************************
- *           SetWindowsHookExA   (USER32.526)
+ *		SetWindowsHookExA (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE hInst,
                                   DWORD dwThreadId )
@@ -1265,7 +1265,7 @@ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE hInst,
 }
 
 /***********************************************************************
- *           SetWindowsHookExW   (USER32.527)
+ *		SetWindowsHookExW (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE hInst,
                                   DWORD dwThreadId )
@@ -1275,7 +1275,7 @@ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE hInst,
 
 
 /***********************************************************************
- *           UnhookWindowsHook16   (USER.234)
+ *		UnhookWindowsHook (USER.234)
  */
 BOOL16 WINAPI UnhookWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
@@ -1283,7 +1283,7 @@ BOOL16 WINAPI UnhookWindowsHook16( INT16 id, HOOKPROC16 proc )
 }
 
 /***********************************************************************
- *           UnhookWindowsHook   (USER32.557)
+ *		UnhookWindowsHook (USER32.@)
  */
 BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc )
 {
@@ -1303,7 +1303,7 @@ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc )
 
 
 /***********************************************************************
- *           UnhookWindowsHookEx16   (USER.292)
+ *		UnhookWindowsHookEx (USER.292)
  */
 BOOL16 WINAPI UnhookWindowsHookEx16( HHOOK hhook )
 {
@@ -1311,7 +1311,7 @@ BOOL16 WINAPI UnhookWindowsHookEx16( HHOOK hhook )
 }
 
 /***********************************************************************
- *           UnhookWindowsHookEx   (USER32.558)
+ *		UnhookWindowsHookEx (USER32.@)
  */
 BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
 {
@@ -1321,7 +1321,7 @@ BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
 
 
 /***********************************************************************
- *           CallNextHookEx16     (USER.293)
+ *		CallNextHookEx16 (USER.293) (USER32.@)
  *
  * I wouldn't have separated this into 16 and 32 bit versions, but I
  * need a way to figure out if I need to do a mapping or not.
@@ -1339,7 +1339,7 @@ LRESULT WINAPI CallNextHookEx16( HHOOK hhook, INT16 code, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           CallNextHookEx    (USER32.17)
+ *		CallNextHookEx (USER32.@)
  *
  * There aren't ANSI and UNICODE versions of this.
  */
@@ -1364,7 +1364,7 @@ LRESULT WINAPI CallNextHookEx( HHOOK hhook, INT code, WPARAM wParam,
 
 
 /***********************************************************************
- *           DefHookProc16   (USER.235)
+ *		DefHookProc (USER.235)
  */
 LRESULT WINAPI DefHookProc16( INT16 code, WPARAM16 wParam, LPARAM lParam,
                               HHOOK *hhook )
@@ -1382,7 +1382,7 @@ LRESULT WINAPI DefHookProc16( INT16 code, WPARAM16 wParam, LPARAM lParam,
 
 
 /***********************************************************************
- *           CallMsgFilter16   (USER.123)
+ *		CallMsgFilter (USER.123)
  */
 BOOL16 WINAPI CallMsgFilter16( SEGPTR msg, INT16 code )
 {
@@ -1393,7 +1393,7 @@ BOOL16 WINAPI CallMsgFilter16( SEGPTR msg, INT16 code )
 
 
 /***********************************************************************
- *           CallMsgFilter32   (USER.823)
+ *		CallMsgFilter32 (USER.823)
  */
 BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParamHigh )
 {
@@ -1436,7 +1436,7 @@ BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParam
 
 
 /***********************************************************************
- *           CallMsgFilterA   (USER32.15)
+ *		CallMsgFilterA (USER32.@)
  *
  * FIXME: There are ANSI and UNICODE versions of this, plus an unspecified
  * version, plus USER (the 16bit one) has a CallMsgFilter32 function.
@@ -1451,7 +1451,7 @@ BOOL WINAPI CallMsgFilterA( LPMSG msg, INT code )
 
 
 /***********************************************************************
- *           CallMsgFilterW   (USER32.16)
+ *		CallMsgFilterW (USER32.@)
  */
 BOOL WINAPI CallMsgFilterW( LPMSG msg, INT code )
 {
diff --git a/windows/input.c b/windows/input.c
index 6d408f0025d..56c61f04b21 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -75,7 +75,7 @@ typedef union
 } KEYLP;
 
 /***********************************************************************
- *           keybd_event   (USER32.583)
+ *		keybd_event (USER32.@)
  */
 void WINAPI keybd_event( BYTE bVk, BYTE bScan,
                          DWORD dwFlags, DWORD dwExtraInfo )
@@ -151,7 +151,7 @@ void WINAPI keybd_event( BYTE bVk, BYTE bScan,
 }
 
 /***********************************************************************
- *           WIN16_keybd_event   (USER.289)
+ *		keybd_event (USER.289)
  */
 void WINAPI WIN16_keybd_event( CONTEXT86 *context )
 {
@@ -165,7 +165,7 @@ void WINAPI WIN16_keybd_event( CONTEXT86 *context )
 }
 
 /***********************************************************************
- *           mouse_event   (USER32.584)
+ *		mouse_event (USER32.@)
  */
 void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
                          DWORD cButtons, DWORD dwExtraInfo )
@@ -289,7 +289,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy,
 }
 
 /***********************************************************************
- *           WIN16_mouse_event   (USER.299)
+ *		mouse_event (USER.299)
  */
 void WINAPI WIN16_mouse_event( CONTEXT86 *context )
 {
@@ -298,7 +298,7 @@ void WINAPI WIN16_mouse_event( CONTEXT86 *context )
 }
 
 /***********************************************************************
- *           GetMouseEventProc   (USER.337)
+ *		GetMouseEventProc (USER.337)
  */
 FARPROC16 WINAPI GetMouseEventProc16(void)
 {
@@ -308,7 +308,7 @@ FARPROC16 WINAPI GetMouseEventProc16(void)
 
 
 /**********************************************************************
- *                      EnableHardwareInput   (USER.331)
+ *		EnableHardwareInput (USER.331)
  */
 BOOL16 WINAPI EnableHardwareInput16(BOOL16 bEnable)
 {
@@ -320,7 +320,7 @@ BOOL16 WINAPI EnableHardwareInput16(BOOL16 bEnable)
 
 
 /***********************************************************************
- *           SwapMouseButton16   (USER.186)
+ *		SwapMouseButton (USER.186)
  */
 BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap )
 {
@@ -331,7 +331,7 @@ BOOL16 WINAPI SwapMouseButton16( BOOL16 fSwap )
 
 
 /***********************************************************************
- *           SwapMouseButton   (USER32.537)
+ *		SwapMouseButton (USER32.@)
  */
 BOOL WINAPI SwapMouseButton( BOOL fSwap )
 {
@@ -342,7 +342,7 @@ BOOL WINAPI SwapMouseButton( BOOL fSwap )
 
 
 /***********************************************************************
- *           GetCursorPos16    (USER.17)
+ *		GetCursorPos (USER.17)
  */
 BOOL16 WINAPI GetCursorPos16( POINT16 *pt )
 {
@@ -354,7 +354,7 @@ BOOL16 WINAPI GetCursorPos16( POINT16 *pt )
 
 
 /***********************************************************************
- *           GetCursorPos    (USER32.229)
+ *		GetCursorPos (USER32.@)
  */
 BOOL WINAPI GetCursorPos( POINT *pt )
 {
@@ -449,7 +449,7 @@ CLEANUP:
 
 
 /**********************************************************************
- *              SetCapture16   (USER.18)
+ *		SetCapture (USER.18)
  */
 HWND16 WINAPI SetCapture16( HWND16 hwnd )
 {
@@ -458,7 +458,7 @@ HWND16 WINAPI SetCapture16( HWND16 hwnd )
 
 
 /**********************************************************************
- *              SetCapture   (USER32.464)
+ *		SetCapture (USER32.@)
  */
 HWND WINAPI SetCapture( HWND hwnd )
 {
@@ -467,7 +467,7 @@ HWND WINAPI SetCapture( HWND hwnd )
 
 
 /**********************************************************************
- *              ReleaseCapture   (USER.19) (USER32.439)
+ *		ReleaseCapture (USER.19) (USER32.@)
  */
 BOOL WINAPI ReleaseCapture(void)
 {
@@ -476,7 +476,7 @@ BOOL WINAPI ReleaseCapture(void)
 
 
 /**********************************************************************
- *              GetCapture16   (USER.236)
+ *		GetCapture (USER.236)
  */
 HWND16 WINAPI GetCapture16(void)
 {
@@ -484,7 +484,7 @@ HWND16 WINAPI GetCapture16(void)
 }
 
 /**********************************************************************
- *              GetCapture   (USER32.208)
+ *		GetCapture (USER32.@)
  */
 HWND WINAPI GetCapture(void)
 {
@@ -506,7 +506,7 @@ HWND WINAPI GetCapture(void)
 }
 
 /**********************************************************************
- *           GetKeyState      (USER.106)
+ *		GetKeyState (USER.106)
  */
 INT16 WINAPI GetKeyState16(INT16 vkey)
 {
@@ -514,7 +514,7 @@ INT16 WINAPI GetKeyState16(INT16 vkey)
 }
 
 /**********************************************************************
- *           GetKeyState      (USER32.249)
+ *		GetKeyState (USER32.@)
  *
  * An application calls the GetKeyState function in response to a
  * keyboard-input message.  This function retrieves the state of the key
@@ -546,7 +546,7 @@ SHORT WINAPI GetKeyState(INT vkey)
 }
 
 /**********************************************************************
- *           GetKeyboardState      (USER.222)(USER32.254)
+ *		GetKeyboardState (USER.222) (USER32.@)
  *
  * An application calls the GetKeyboardState function in response to a
  * keyboard-input message.  This function retrieves the state of the keyboard
@@ -566,7 +566,7 @@ BOOL WINAPI GetKeyboardState(LPBYTE lpKeyState)
 }
 
 /**********************************************************************
- *          SetKeyboardState      (USER.223)(USER32.484)
+ *		SetKeyboardState (USER.223) (USER32.@)
  */
 BOOL WINAPI SetKeyboardState(LPBYTE lpKeyState)
 {
@@ -582,7 +582,7 @@ BOOL WINAPI SetKeyboardState(LPBYTE lpKeyState)
 }
 
 /**********************************************************************
- *           GetAsyncKeyState      (USER32.207)
+ *		GetAsyncKeyState (USER32.@)
  *
  *	Determine if a key is or was pressed.  retval has high-order 
  * bit set to 1 if currently pressed, low-order bit set to 1 if key has
@@ -626,7 +626,7 @@ WORD WINAPI GetAsyncKeyState(INT nKey)
 }
 
 /**********************************************************************
- *            GetAsyncKeyState16        (USER.249)
+ *		GetAsyncKeyState (USER.249)
  */
 WORD WINAPI GetAsyncKeyState16(INT16 nKey)
 {
@@ -634,7 +634,7 @@ WORD WINAPI GetAsyncKeyState16(INT16 nKey)
 }
 
 /***********************************************************************
- *              IsUserIdle      (USER.333)
+ *		IsUserIdle (USER.333)
  */
 BOOL16 WINAPI IsUserIdle16(void)
 {
@@ -653,7 +653,7 @@ BOOL16 WINAPI IsUserIdle16(void)
 }
 
 /**********************************************************************
- *           VkKeyScanA      (USER32.573)
+ *		VkKeyScanA (USER32.@)
  */
 WORD WINAPI VkKeyScanA(CHAR cChar)
 {
@@ -661,7 +661,7 @@ WORD WINAPI VkKeyScanA(CHAR cChar)
 }
 
 /******************************************************************************
- *    	VkKeyScanW      (USER32.576)
+ *		VkKeyScanW (USER32.@)
  */
 WORD WINAPI VkKeyScanW(WCHAR cChar)
 {
@@ -669,7 +669,7 @@ WORD WINAPI VkKeyScanW(WCHAR cChar)
 }
 
 /**********************************************************************
- *           VkKeyScanExA      (USER32.574)
+ *		VkKeyScanExA (USER32.@)
  */
 WORD WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl)
 {
@@ -678,7 +678,7 @@ WORD WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl)
 }
 
 /******************************************************************************
- *      VkKeyScanExW      (USER32.575)
+ *		VkKeyScanExW (USER32.@)
  */
 WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl)
 {
@@ -687,7 +687,7 @@ WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl)
 }
  
 /******************************************************************************
- *    	GetKeyboardType      (USER32.255)
+ *		GetKeyboardType (USER32.@)
  */
 INT WINAPI GetKeyboardType(INT nTypeFlag)
 {
@@ -695,7 +695,7 @@ INT WINAPI GetKeyboardType(INT nTypeFlag)
 }
 
 /******************************************************************************
- *    	MapVirtualKeyA      (USER32.383)
+ *		MapVirtualKeyA (USER32.@)
  */
 UINT WINAPI MapVirtualKeyA(UINT code, UINT maptype)
 {
@@ -703,7 +703,7 @@ UINT WINAPI MapVirtualKeyA(UINT code, UINT maptype)
 }
 
 /******************************************************************************
- *    	MapVirtualKeyW      (USER32.385)
+ *		MapVirtualKeyW (USER32.@)
  */
 UINT WINAPI MapVirtualKeyW(UINT code, UINT maptype)
 {
@@ -711,7 +711,7 @@ UINT WINAPI MapVirtualKeyW(UINT code, UINT maptype)
 }
 
 /******************************************************************************
- *    	MapVirtualKeyExA      (USER32.384)
+ *		MapVirtualKeyExA (USER32.@)
  */
 UINT WINAPI MapVirtualKeyExA(UINT code, UINT maptype, HKL hkl)
 {
@@ -721,7 +721,7 @@ UINT WINAPI MapVirtualKeyExA(UINT code, UINT maptype, HKL hkl)
 }
 
 /******************************************************************************
- *    	MapVirtualKeyExW      (USER32.???)
+ *		MapVirtualKeyExW (USER32.@)
  */
 UINT WINAPI MapVirtualKeyExW(UINT code, UINT maptype, HKL hkl)
 {
@@ -731,7 +731,7 @@ UINT WINAPI MapVirtualKeyExW(UINT code, UINT maptype, HKL hkl)
 }
 
 /****************************************************************************
- *	GetKBCodePage   (USER32.246)
+ *		GetKBCodePage (USER32.@)
  */
 UINT WINAPI GetKBCodePage(void)
 {
@@ -739,7 +739,7 @@ UINT WINAPI GetKBCodePage(void)
 }
 
 /****************************************************************************
- *      GetKeyboardLayoutName16   (USER.477)
+ *		GetKeyboardLayoutName (USER.477)
  */
 INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
 {
@@ -747,7 +747,7 @@ INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
 }
 
 /***********************************************************************
- *           GetKeyboardLayout			(USER32.250)
+ *		GetKeyboardLayout (USER32.@)
  *
  * FIXME: - device handle for keyboard layout defaulted to 
  *          the language id. This is the way Windows default works.
@@ -763,7 +763,7 @@ HKL WINAPI GetKeyboardLayout(DWORD dwLayout)
 }
 
 /****************************************************************************
- *	GetKeyboardLayoutNameA   (USER32.252)
+ *		GetKeyboardLayoutNameA (USER32.@)
  */
 INT WINAPI GetKeyboardLayoutNameA(LPSTR pwszKLID)
 {
@@ -772,7 +772,7 @@ INT WINAPI GetKeyboardLayoutNameA(LPSTR pwszKLID)
 }
 
 /****************************************************************************
- *	GetKeyboardLayoutNameW   (USER32.253)
+ *		GetKeyboardLayoutNameW (USER32.@)
  */
 INT WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 {
@@ -783,7 +783,7 @@ INT WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 }
 
 /****************************************************************************
- *	GetKeyNameTextA   (USER32.247)
+ *		GetKeyNameTextA (USER32.@)
  */
 INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize)
 {
@@ -791,7 +791,7 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize)
 }
 
 /****************************************************************************
- *	GetKeyNameTextW   (USER32.248)
+ *		GetKeyNameTextW (USER32.@)
  */
 INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize)
 {
@@ -807,7 +807,7 @@ INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize)
 }
 
 /****************************************************************************
- *	ToUnicode      (USER32.@)
+ *		ToUnicode (USER32.@)
  */
 INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 		     LPWSTR lpwStr, int size, UINT flags)
@@ -816,7 +816,7 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 }
 
 /****************************************************************************
- *	ToUnicodeEx      (USER32.@)
+ *		ToUnicodeEx (USER32.@)
  */
 INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 		       LPWSTR lpwStr, int size, UINT flags, HKL hkl)
@@ -826,7 +826,7 @@ INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 }
 
 /****************************************************************************
- *	ToAscii      (USER32.546)
+ *		ToAscii (USER32.@)
  */
 INT WINAPI ToAscii( UINT virtKey,UINT scanCode,LPBYTE lpKeyState,
                         LPWORD lpChar,UINT flags )
@@ -842,7 +842,7 @@ INT WINAPI ToAscii( UINT virtKey,UINT scanCode,LPBYTE lpKeyState,
 }
 
 /****************************************************************************
- *	ToAsciiEx      (USER32.547)
+ *		ToAsciiEx (USER32.@)
  */
 INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
                       LPWORD lpChar, UINT flags, HKL dwhkl )
@@ -852,7 +852,7 @@ INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 }
 
 /**********************************************************************
- *           ActivateKeyboardLayout      (USER32.1)
+ *		ActivateKeyboardLayout (USER32.@)
  *
  * Call ignored. WINE supports only system default keyboard layout.
  */
@@ -865,7 +865,7 @@ HKL WINAPI ActivateKeyboardLayout(HKL hLayout, UINT flags)
 
 
 /***********************************************************************
- *           GetKeyboardLayoutList		(USER32.251)
+ *		GetKeyboardLayoutList (USER32.@)
  *
  * FIXME: Supports only the system default language and layout and 
  *          returns only 1 value.
@@ -886,7 +886,7 @@ INT WINAPI GetKeyboardLayoutList(INT nBuff,HKL *layouts)
 
 
 /***********************************************************************
- *           RegisterHotKey			(USER32.433)
+ *		RegisterHotKey (USER32.@)
  */
 BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) {
 	FIXME_(keyboard)("(0x%08x,%d,0x%08x,%d): stub\n",hwnd,id,modifiers,vk);
@@ -894,7 +894,7 @@ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) {
 }
 
 /***********************************************************************
- *           UnregisterHotKey			(USER32.565)
+ *		UnregisterHotKey (USER32.@)
  */
 BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) {
 	FIXME_(keyboard)("(0x%08x,%d): stub\n",hwnd,id);
@@ -902,7 +902,7 @@ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) {
 }
 
 /***********************************************************************
- *           LoadKeyboardLayoutA                (USER32.367)
+ *		LoadKeyboardLayoutA (USER32.@)
  * Call ignored. WINE supports only system default keyboard layout.
  */
 HKL WINAPI LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags)
@@ -913,7 +913,7 @@ HKL WINAPI LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags)
 }
 
 /***********************************************************************
- *           LoadKeyboardLayoutW                (USER32.368)
+ *		LoadKeyboardLayoutW (USER32.@)
  */
 HKL WINAPI LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags)
 {
diff --git a/windows/keyboard.c b/windows/keyboard.c
index c64ce30601f..e8194fbb355 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -37,7 +37,7 @@ static LPKEYBD_EVENT_PROC DefKeybEventProc = NULL;
 LPBYTE pKeyStateTable = NULL;
 
 /***********************************************************************
- *           KEYBOARD_Inquire			(KEYBOARD.1)
+ *		Inquire (KEYBOARD.1)
  */
 WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo) 
 {
@@ -51,7 +51,7 @@ WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo)
 }
 
 /***********************************************************************
- *           KEYBOARD_Enable			(KEYBOARD.2)
+ *		Enable (KEYBOARD.2)
  */
 VOID WINAPI KEYBOARD_Enable( LPKEYBD_EVENT_PROC lpKeybEventProc, 
                              LPBYTE lpKeyState )
@@ -100,7 +100,7 @@ VOID WINAPI WIN16_KEYBOARD_Enable( FARPROC16 proc, LPBYTE lpKeyState )
 }
 
 /***********************************************************************
- *           KEYBOARD_Disable			(KEYBOARD.3)
+ *		Disable (KEYBOARD.3)
  */
 VOID WINAPI KEYBOARD_Disable(VOID)
 {
@@ -136,7 +136,7 @@ void KEYBOARD_SendEvent( BYTE bVk, BYTE bScan, DWORD dwFlags,
 }
 
 /**********************************************************************
- *           SetSpeed16      (KEYBOARD.7)
+ *		SetSpeed (KEYBOARD.7)
  */
 WORD WINAPI SetSpeed16(WORD unused)
 {
@@ -145,7 +145,7 @@ WORD WINAPI SetSpeed16(WORD unused)
 }
 
 /**********************************************************************
- *           ScreenSwitchEnable      (KEYBOARD.100)
+ *		ScreenSwitchEnable (KEYBOARD.100)
  */
 VOID WINAPI ScreenSwitchEnable16(WORD unused)
 {
@@ -153,7 +153,7 @@ VOID WINAPI ScreenSwitchEnable16(WORD unused)
 }
 
 /**********************************************************************
- *           OemKeyScan      (KEYBOARD.128)(USER32.401)
+ *		OemKeyScan (KEYBOARD.128) (USER32.@)
  */
 DWORD WINAPI OemKeyScan(WORD wOemChar)
 {
@@ -163,7 +163,7 @@ DWORD WINAPI OemKeyScan(WORD wOemChar)
 }
 
 /**********************************************************************
- *    	VkKeyScan			[KEYBOARD.129]
+ *		VkKeyScan (KEYBOARD.129)
  *
  * VkKeyScan translates an ANSI character to a virtual-key and shift code
  * for the current keyboard.
@@ -186,7 +186,7 @@ WORD WINAPI VkKeyScan16(CHAR cChar)
 }
 
 /******************************************************************************
- *    	GetKeyboardType16      (KEYBOARD.130)
+ *		GetKeyboardType (KEYBOARD.130)
  */
 INT16 WINAPI GetKeyboardType16(INT16 nTypeFlag)
 {
@@ -209,7 +209,7 @@ INT16 WINAPI GetKeyboardType16(INT16 nTypeFlag)
 }
 
 /******************************************************************************
- *    	MapVirtualKey16      (KEYBOARD.131)
+ *		MapVirtualKey (KEYBOARD.131)
  *
  * MapVirtualKey translates keycodes from one format to another
  */
@@ -219,7 +219,7 @@ UINT16 WINAPI MapVirtualKey16(UINT16 wCode, UINT16 wMapType)
 }
 
 /****************************************************************************
- *	GetKBCodePage16   (KEYBOARD.132)
+ *		GetKBCodePage (KEYBOARD.132)
  */
 INT16 WINAPI GetKBCodePage16(void)
 {
@@ -228,7 +228,7 @@ INT16 WINAPI GetKBCodePage16(void)
 }
 
 /****************************************************************************
- *	GetKeyNameText16   (KEYBOARD.133)
+ *		GetKeyNameText (KEYBOARD.133)
  */
 INT16 WINAPI GetKeyNameText16(LONG lParam, LPSTR lpBuffer, INT16 nSize)
 {
@@ -236,7 +236,7 @@ INT16 WINAPI GetKeyNameText16(LONG lParam, LPSTR lpBuffer, INT16 nSize)
 }
 
 /****************************************************************************
- *	ToAscii   (KEYBOARD.4)
+ *		ToAscii (KEYBOARD.4)
  *
  * The ToAscii function translates the specified virtual-key code and keyboard
  * state to the corresponding Windows character or characters.
@@ -276,7 +276,7 @@ void KEYBOARD_SetBeepActive(BOOL bActivate)
 }
 
 /***********************************************************************
- *           MessageBeep16   (USER.104)
+ *		MessageBeep (USER.104)
  */
 void WINAPI MessageBeep16( UINT16 i )
 {
@@ -284,7 +284,7 @@ void WINAPI MessageBeep16( UINT16 i )
 }
 
 /***********************************************************************
- *           MessageBeep   (USER32.390)
+ *		MessageBeep (USER32.@)
  */
 BOOL WINAPI MessageBeep( UINT i )
 {
diff --git a/windows/mdi.c b/windows/mdi.c
index bfb95c933df..209e9cb8471 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -1468,7 +1468,7 @@ END:
 
 
 /***********************************************************************
- *           DefFrameProc16   (USER.445)
+ *		DefFrameProc (USER.445)
  */
 LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient,
                                UINT16 message, WPARAM16 wParam, LPARAM lParam )
@@ -1593,7 +1593,7 @@ LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient,
 
 
 /***********************************************************************
- *           DefFrameProcA   (USER32.122)
+ *		DefFrameProcA (USER32.@)
  */
 LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient,
                                 UINT message, WPARAM wParam, LPARAM lParam)
@@ -1634,7 +1634,7 @@ LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient,
 
 
 /***********************************************************************
- *           DefFrameProcW   (USER32.123)
+ *		DefFrameProcW (USER32.@)
  */
 LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
                                 UINT message, WPARAM wParam, LPARAM lParam)
@@ -1673,7 +1673,7 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
 
 
 /***********************************************************************
- *           DefMDIChildProc16   (USER.447)
+ *		DefMDIChildProc (USER.447)
  */
 LRESULT WINAPI DefMDIChildProc16( HWND16 hwnd, UINT16 message,
                                   WPARAM16 wParam, LPARAM lParam )
@@ -1873,7 +1873,7 @@ END:
 
 
 /***********************************************************************
- *           DefMDIChildProcA   (USER32.124)
+ *		DefMDIChildProcA (USER32.@)
  */
 LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
                                    WPARAM wParam, LPARAM lParam )
@@ -1951,7 +1951,7 @@ END:
 
 
 /***********************************************************************
- *           DefMDIChildProcW   (USER32.125)
+ *		DefMDIChildProcW (USER32.@)
  */
 LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
                                    WPARAM wParam, LPARAM lParam )
@@ -2016,7 +2016,7 @@ END:
 
 
 /**********************************************************************
- * CreateMDIWindowA [USER32.79] Creates a MDI child in new thread
+ *		CreateMDIWindowA (USER32.@) Creates a MDI child in new thread
  * FIXME: its in the same thread now
  *
  * RETURNS
@@ -2088,7 +2088,7 @@ HWND MDI_CreateMDIWindowA(
 }
 
 /***********************************************************************
- * CreateMDIWindowW [USER32.80] Creates a MDI child in new thread
+ *		CreateMDIWindowW (USER32.@) Creates a MDI child in new thread
  *
  * RETURNS
  *    Success: Handle to created window
@@ -2114,7 +2114,7 @@ HWND WINAPI CreateMDIWindowW(
 
 
 /******************************************************************************
- * CreateMDIWindowW [USER32.80]  Creates a MDI child window
+ *		CreateMDIWindowW (USER32.80) Creates a MDI child window
  * single threaded version of CreateMDIWindow
  * called by CreateWindowExW(). 
  */
@@ -2138,7 +2138,7 @@ HWND MDI_CreateMDIWindowW(
 
 
 /**********************************************************************
- *             TranslateMDISysAccel   (USER32.555)
+ *		TranslateMDISysAccel (USER32.@)
  */
 BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
 {
@@ -2151,7 +2151,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
 
 
 /**********************************************************************
- *             TranslateMDISysAccel16   (USER.451)
+ *		TranslateMDISysAccel (USER.451)
  */
 BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg )
 {
@@ -2202,7 +2202,7 @@ BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg )
 
 
 /***********************************************************************
- *           CalcChildScroll   (USER.462)
+ *		CalcChildScroll (USER.462)
  */
 void WINAPI CalcChildScroll16( HWND16 hwnd, WORD scroll )
 {
@@ -2254,7 +2254,7 @@ void WINAPI CalcChildScroll16( HWND16 hwnd, WORD scroll )
 
 
 /***********************************************************************
- *           ScrollChildren16   (USER.463)
+ *		ScrollChildren (USER.463)
  */
 void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam)
 {
@@ -2263,7 +2263,7 @@ void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM l
 
 
 /***********************************************************************
- *           ScrollChildren   (USER32.448)
+ *		ScrollChildren (USER32.@)
  */
 void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
                              LPARAM lParam)
@@ -2346,7 +2346,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
 
 
 /******************************************************************************
- * CascadeWindows [USER32.21] Cascades MDI child windows
+ *		CascadeWindows (USER32.@) Cascades MDI child windows
  *
  * RETURNS
  *    Success: Number of cascaded windows.
@@ -2364,7 +2364,7 @@ CascadeWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect,
 
 
 /******************************************************************************
- * TileWindows [USER32.545] Tiles MDI child windows
+ *		TileWindows (USER32.@) Tiles MDI child windows
  *
  * RETURNS
  *    Success: Number of tiled windows.
diff --git a/windows/message.c b/windows/message.c
index 5b117ee0c8f..150201a1881 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -744,7 +744,7 @@ END:
 
 
 /**********************************************************************
- *           SetDoubleClickTime16   (USER.20)
+ *		SetDoubleClickTime (USER.20)
  */
 void WINAPI SetDoubleClickTime16( UINT16 interval )
 {
@@ -753,7 +753,7 @@ void WINAPI SetDoubleClickTime16( UINT16 interval )
 
 
 /**********************************************************************
- *           SetDoubleClickTime   (USER32.480)
+ *		SetDoubleClickTime (USER32.@)
  */
 BOOL WINAPI SetDoubleClickTime( UINT interval )
 {
@@ -763,7 +763,7 @@ BOOL WINAPI SetDoubleClickTime( UINT interval )
 
 
 /**********************************************************************
- *           GetDoubleClickTime16   (USER.21)
+ *		GetDoubleClickTime (USER.21)
  */
 UINT16 WINAPI GetDoubleClickTime16(void)
 {
@@ -772,7 +772,7 @@ UINT16 WINAPI GetDoubleClickTime16(void)
 
 
 /**********************************************************************
- *           GetDoubleClickTime   (USER32.239)
+ *		GetDoubleClickTime (USER32.@)
  */
 UINT WINAPI GetDoubleClickTime(void)
 {
@@ -922,7 +922,7 @@ CLEANUP:
 
 
 /***********************************************************************
- *           ReplyMessage16   (USER.115)
+ *		ReplyMessage (USER.115)
  */
 void WINAPI ReplyMessage16( LRESULT result )
 {
@@ -930,7 +930,7 @@ void WINAPI ReplyMessage16( LRESULT result )
 }
 
 /***********************************************************************
- *           ReplyMessage   (USER.115)
+ *		ReplyMessage (USER32.@)
  */
 BOOL WINAPI ReplyMessage( LRESULT result )
 {
@@ -1378,7 +1378,7 @@ BOOL MSG_InternalGetMessage( int type, MSG *msg, HWND hwnd, HWND hwndOwner,
 
 
 /***********************************************************************
- *         PeekMessage32_16   (USER.819)
+ *		PeekMessage32 (USER.819)
  */
 BOOL16 WINAPI PeekMessage32_16( SEGPTR msg16_32, HWND16 hwnd,
                                 UINT16 first, UINT16 last, UINT16 flags, 
@@ -1406,7 +1406,7 @@ BOOL16 WINAPI PeekMessage32_16( SEGPTR msg16_32, HWND16 hwnd,
 }
 
 /***********************************************************************
- *           PeekMessage16   (USER.109)
+ *		PeekMessage (USER.109)
  */
 BOOL16 WINAPI PeekMessage16( SEGPTR msg, HWND16 hwnd,
                              UINT16 first, UINT16 last, UINT16 flags )
@@ -1415,7 +1415,7 @@ BOOL16 WINAPI PeekMessage16( SEGPTR msg, HWND16 hwnd,
 }
 
 /***********************************************************************
- *         PeekMessageA
+ *		PeekMessageA (USER32.@)
  */
 BOOL WINAPI PeekMessageA( LPMSG lpmsg, HWND hwnd,
                           UINT min, UINT max, UINT wRemoveMsg)
@@ -1431,7 +1431,7 @@ BOOL WINAPI PeekMessageA( LPMSG lpmsg, HWND hwnd,
 }
 
 /***********************************************************************
- *         PeekMessageW             Check queue for messages
+ *		PeekMessageW (USER32.@) Check queue for messages
  *
  * Checks for a message in the thread's queue, filtered as for
  * GetMessage(). Returns immediately whether a message is available
@@ -1473,7 +1473,7 @@ BOOL WINAPI PeekMessageW(
 
 
 /***********************************************************************
- *          GetMessage32_16   (USER.820)
+ *		GetMessage32_16 (USER.820)
  */
 BOOL16 WINAPI GetMessage32_16( SEGPTR msg16_32, HWND16 hWnd, UINT16 first,
                                UINT16 last, BOOL16 wHaveParamHigh )
@@ -1502,7 +1502,7 @@ BOOL16 WINAPI GetMessage32_16( SEGPTR msg16_32, HWND16 hWnd, UINT16 first,
 }
 
 /***********************************************************************
- *           GetMessage16   (USER.108)
+ *		GetMessage (USER.108)
  */
 BOOL16 WINAPI GetMessage16( SEGPTR msg, HWND16 hwnd, UINT16 first, UINT16 last)
 {
@@ -1510,7 +1510,7 @@ BOOL16 WINAPI GetMessage16( SEGPTR msg, HWND16 hwnd, UINT16 first, UINT16 last)
 }
 
 /***********************************************************************
- *          GetMessageA   (USER32.270)
+ *		GetMessageA (USER32.@)
  */
 BOOL WINAPI GetMessageA( MSG *lpmsg, HWND hwnd, UINT min, UINT max )
 {
@@ -1524,7 +1524,7 @@ BOOL WINAPI GetMessageA( MSG *lpmsg, HWND hwnd, UINT min, UINT max )
 }
 
 /***********************************************************************
- *          GetMessageW   (USER32.274) Retrieve next message
+ *		GetMessageW (USER32.@) Retrieve next message
  *
  * GetMessage retrieves the next event from the calling thread's
  * queue and deposits it in *lpmsg.
@@ -1623,7 +1623,7 @@ static BOOL MSG_PostMessage( int type, HWND hwnd, UINT message,
 }
 
 /***********************************************************************
- *           PostMessage16   (USER.110)
+ *		PostMessage (USER.110)
  */
 BOOL16 WINAPI PostMessage16( HWND16 hwnd, UINT16 message, WPARAM16 wParam,
                              LPARAM lParam )
@@ -1632,7 +1632,7 @@ BOOL16 WINAPI PostMessage16( HWND16 hwnd, UINT16 message, WPARAM16 wParam,
 }
 
 /***********************************************************************
- *           PostMessageA   (USER32.419)
+ *		PostMessageA (USER32.@)
  */
 BOOL WINAPI PostMessageA( HWND hwnd, UINT message, WPARAM wParam,
                           LPARAM lParam )
@@ -1641,7 +1641,7 @@ BOOL WINAPI PostMessageA( HWND hwnd, UINT message, WPARAM wParam,
 }
 
 /***********************************************************************
- *           PostMessageW   (USER32.420)
+ *		PostMessageW (USER32.@)
  */
 BOOL WINAPI PostMessageW( HWND hwnd, UINT message, WPARAM wParam,
                           LPARAM lParam )
@@ -1650,7 +1650,7 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT message, WPARAM wParam,
 }
 
 /***********************************************************************
- *           PostAppMessage16   (USER.116)
+ *		PostAppMessage16 (USER.116)
  */
 BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 message, 
                                 WPARAM16 wParam, LPARAM lParam )
@@ -1660,7 +1660,7 @@ BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 message,
 }
 
 /**********************************************************************
- *           PostThreadMessageA    (USER32.422)
+ *		PostThreadMessageA (USER32.@)
  */
 BOOL WINAPI PostThreadMessageA( DWORD idThread, UINT message,
                                 WPARAM wParam, LPARAM lParam )
@@ -1670,7 +1670,7 @@ BOOL WINAPI PostThreadMessageA( DWORD idThread, UINT message,
 }
 
 /**********************************************************************
- *           PostThreadMessageW    (USER32.423)
+ *		PostThreadMessageW (USER32.@)
  */
 BOOL WINAPI PostThreadMessageW( DWORD idThread, UINT message,
                                  WPARAM wParam, LPARAM lParam )
@@ -1822,7 +1822,7 @@ END:
 
 
 /***********************************************************************
- *           SendMessage16   (USER.111)
+ *		SendMessage (USER.111)
  */
 LRESULT WINAPI SendMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
                               LPARAM lParam)
@@ -1834,7 +1834,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           SendMessageA   (USER32.454)
+ *		SendMessageA (USER32.@)
  */
 LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wParam,
                                LPARAM lParam )
@@ -1849,7 +1849,7 @@ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- *           SendMessageW   (USER32.459)  Send Window Message
+ *		SendMessageW (USER32.@) Send Window Message
  *
  *  Sends a message to the window procedure of the specified window.
  *  SendMessage() will not return until the called window procedure
@@ -1885,7 +1885,7 @@ LRESULT WINAPI SendMessageW(
 
 
 /***********************************************************************
- *           SendMessageTimeout16    (not a WINAPI)
+ *		SendMessageTimeout (not a WINAPI)
  */
 LRESULT WINAPI SendMessageTimeout16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 				     LPARAM lParam, UINT16 flags,
@@ -1903,7 +1903,7 @@ LRESULT WINAPI SendMessageTimeout16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           SendMessageTimeoutA   (USER32.457)
+ *		SendMessageTimeoutA (USER32.@)
  */
 LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wParam,
 				      LPARAM lParam, UINT flags,
@@ -1923,7 +1923,7 @@ LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- *           SendMessageTimeoutW   (USER32.458)
+ *		SendMessageTimeoutW (USER32.@)
  */
 LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wParam,
 				      LPARAM lParam, UINT flags,
@@ -1943,7 +1943,7 @@ LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- *  WaitMessage    (USER.112) (USER32.578)  Suspend thread pending messages
+ *		WaitMessage (USER.112) (USER32.@) Suspend thread pending messages
  *
  * WaitMessage() suspends a thread until events appear in the thread's
  * queue.
@@ -1965,7 +1965,7 @@ void WINAPI WaitMessage( void )
 }
 
 /***********************************************************************
- *           MsgWaitForMultipleObjects    (USER32.400)
+ *		MsgWaitForMultipleObjects (USER32.@)
  */
 DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE *pHandles,
                                         BOOL fWaitAll, DWORD dwMilliseconds,
@@ -2241,7 +2241,7 @@ static BOOL MSG_DoTranslateMessage( UINT message, HWND hwnd,
 
 
 /***********************************************************************
- *           TranslateMessage16   (USER.113)
+ *		TranslateMessage (USER.113)
  */
 BOOL16 WINAPI TranslateMessage16( const MSG16 *msg )
 {
@@ -2251,7 +2251,7 @@ BOOL16 WINAPI TranslateMessage16( const MSG16 *msg )
 
 
 /***********************************************************************
- *           TranslateMessage32   (USER.821)
+ *		TranslateMessage32 (USER.821)
  */
 BOOL16 WINAPI TranslateMessage32_16( const MSG32_16 *msg, BOOL16 wHaveParamHigh )
 {
@@ -2267,7 +2267,7 @@ BOOL16 WINAPI TranslateMessage32_16( const MSG32_16 *msg, BOOL16 wHaveParamHigh
 }
 
 /***********************************************************************
- *           TranslateMessage   (USER32.556)
+ *		TranslateMessage (USER32.@)
  */
 BOOL WINAPI TranslateMessage( const MSG *msg )
 {
@@ -2277,7 +2277,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg )
 
 
 /***********************************************************************
- *           DispatchMessage16   (USER.114)
+ *		DispatchMessage (USER.114)
  */
 LONG WINAPI DispatchMessage16( const MSG16* msg )
 {
@@ -2337,7 +2337,7 @@ END:
 
 
 /***********************************************************************
- *           DispatchMessage32   (USER.822)
+ *		DispatchMessage32 (USER.822)
  */
 LONG WINAPI DispatchMessage32_16( const MSG32_16* lpmsg16_32, BOOL16 wHaveParamHigh )
 {
@@ -2359,7 +2359,7 @@ LONG WINAPI DispatchMessage32_16( const MSG32_16* lpmsg16_32, BOOL16 wHaveParamH
 }
 
 /***********************************************************************
- *           DispatchMessageA   (USER32.141)
+ *		DispatchMessageA (USER32.@)
  */
 LONG WINAPI DispatchMessageA( const MSG* msg )
 {
@@ -2424,7 +2424,7 @@ END:
 
 
 /***********************************************************************
- *           DispatchMessageW   (USER32.142)     Process Message
+ *		DispatchMessageW (USER32.@) Process Message
  *
  * Process the message specified in the structure *_msg_.
  *
@@ -2506,7 +2506,8 @@ END:
 
 
 /***********************************************************************
- *           RegisterWindowMessageA   (USER.118) (USER32.437)
+ *		RegisterWindowMessage (USER.118)
+ *		RegisterWindowMessageA (USER32.@)
  */
 WORD WINAPI RegisterWindowMessageA( LPCSTR str )
 {
@@ -2516,7 +2517,7 @@ WORD WINAPI RegisterWindowMessageA( LPCSTR str )
 
 
 /***********************************************************************
- *           RegisterWindowMessageW   (USER32.438)
+ *		RegisterWindowMessageW (USER32.@)
  */
 WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
 {
@@ -2526,7 +2527,7 @@ WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
 
 
 /***********************************************************************
- *           GetCurrentTime16    (USER.15)
+ *		GetCurrentTime (USER.15)
  *
  * (effectively identical to GetTickCount)
  */
@@ -2537,7 +2538,7 @@ DWORD WINAPI GetCurrentTime16(void)
 
 
 /***********************************************************************
- *           InSendMessage16    (USER.192)
+ *		InSendMessage (USER.192)
  */
 BOOL16 WINAPI InSendMessage16(void)
 {
@@ -2546,7 +2547,7 @@ BOOL16 WINAPI InSendMessage16(void)
 
 
 /***********************************************************************
- *           InSendMessage    (USER32.320)
+ *		InSendMessage (USER32.@)
  */
 BOOL WINAPI InSendMessage(void)
 {
@@ -2562,7 +2563,7 @@ BOOL WINAPI InSendMessage(void)
 }
 
 /***********************************************************************
- *           BroadcastSystemMessage    (USER32.12)
+ *		BroadcastSystemMessage (USER32.@)
  */
 LONG WINAPI BroadcastSystemMessage(
 	DWORD dwFlags,LPDWORD recipients,UINT uMessage,WPARAM wParam,
@@ -2575,7 +2576,7 @@ LONG WINAPI BroadcastSystemMessage(
 }
 
 /***********************************************************************
- *           SendNotifyMessageA    (USER32.460)
+ *		SendNotifyMessageA (USER32.@)
  */
 BOOL WINAPI SendNotifyMessageA(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
 {
@@ -2584,7 +2585,7 @@ BOOL WINAPI SendNotifyMessageA(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
 }
 
 /***********************************************************************
- *           SendNotifyMessageW    (USER32.461)
+ *		SendNotifyMessageW (USER32.@)
  */
 BOOL WINAPI SendNotifyMessageW(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
 {
@@ -2593,7 +2594,7 @@ BOOL WINAPI SendNotifyMessageW(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
 }
 
 /***********************************************************************
- *           SendMessageCallbackA
+ *		SendMessageCallbackA (USER32.@)
  * FIXME: It's like PostMessage. The callback gets called when the message
  * is processed. We have to modify the message processing for an exact
  * implementation...
@@ -2615,7 +2616,7 @@ BOOL WINAPI SendMessageCallbackA(
 		return TRUE;
 }
 /***********************************************************************
- *           SendMessageCallbackW
+ *		SendMessageCallbackW (USER32.@)
  * FIXME: see SendMessageCallbackA.
  */
 BOOL WINAPI SendMessageCallbackW(
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 63075f162a6..99edf71d99d 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -248,7 +248,7 @@ static LRESULT CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
 
 
 /**************************************************************************
- *           MessageBox16   (USER.1)
+ *		MessageBox (USER.1)
  */
 INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type)
 {
@@ -258,7 +258,7 @@ INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type)
 
 
 /**************************************************************************
- *           MessageBoxA   (USER32.391)
+ *		MessageBoxA (USER32.@)
  *
  * NOTES
  *   The WARN is here to help debug erroneous MessageBoxes
@@ -289,7 +289,7 @@ INT WINAPI MessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type)
 
 
 /**************************************************************************
- *           MessageBoxW   (USER32.396)
+ *		MessageBoxW (USER32.@)
  */
 INT WINAPI MessageBoxW( HWND hwnd, LPCWSTR text, LPCWSTR title,
                             UINT type )
@@ -308,7 +308,7 @@ INT WINAPI MessageBoxW( HWND hwnd, LPCWSTR text, LPCWSTR title,
 
 
 /**************************************************************************
- *           MessageBoxExA   (USER32.392)
+ *		MessageBoxExA (USER32.@)
  */
 INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title,
                               UINT type, WORD langid )
@@ -319,7 +319,7 @@ INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title,
 }
 
 /**************************************************************************
- *           MessageBoxExW   (USER32.393)
+ *		MessageBoxExW (USER32.@)
  */
 INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title,
                               UINT type, WORD langid )
@@ -330,7 +330,7 @@ INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title,
 }
 
 /**************************************************************************
- *           MessageBoxIndirect16   (USER.827)
+ *		MessageBoxIndirect (USER.827)
  */
 INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox )
 {
@@ -362,7 +362,7 @@ INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox )
 }
 
 /**************************************************************************
- *           MessageBoxIndirectA   (USER32.394)
+ *		MessageBoxIndirectA (USER32.@)
  */
 INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox )
 {
@@ -382,7 +382,7 @@ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox )
 }
 
 /**************************************************************************
- *           MessageBoxIndirectW   (USER32.395)
+ *		MessageBoxIndirectW (USER32.@)
  */
 INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox )
 {
diff --git a/windows/multimon.c b/windows/multimon.c
index 2b6f53bdbe7..4a369b6f768 100644
--- a/windows/multimon.c
+++ b/windows/multimon.c
@@ -15,7 +15,7 @@
 #define xPRIMARY_MONITOR ((HMONITOR)0x12340042)
 
 /***********************************************************************
- *		MonitorFromPoint
+ *		MonitorFromPoint (USER32.@)
  */
 HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags)
 {
@@ -31,7 +31,7 @@ HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags)
 }
 
 /***********************************************************************
- *		MonitorFromRect
+ *		MonitorFromRect (USER32.@)
  */
 HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
 {
@@ -47,7 +47,7 @@ HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
 }
 
 /***********************************************************************
- *		MonitorFromWindow
+ *		MonitorFromWindow (USER32.@)
  */
 HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags)
 {
@@ -67,7 +67,7 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags)
 }
 
 /***********************************************************************
- *		GetMonitorInfoA
+ *		GetMonitorInfoA (USER32.@)
  */
 BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 {
@@ -94,7 +94,7 @@ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 }
 
 /***********************************************************************
- *		GetMonitorInfoW
+ *		GetMonitorInfoW (USER32.@)
  */
 BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 {
@@ -121,7 +121,7 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 }
 
 /***********************************************************************
- *		EnumDisplayMonitors
+ *		EnumDisplayMonitors (USER32.@)
  */
 BOOL WINAPI EnumDisplayMonitors(
         HDC             hdcOptionalForPainting,
diff --git a/windows/nonclient.c b/windows/nonclient.c
index ff5d8006f33..86db5b32390 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -254,7 +254,7 @@ NC_AdjustRectInner95 (LPRECT16 rect, DWORD style, DWORD exStyle)
 
 
 /***********************************************************************
- * DrawCaption16 [USER.660] Draws a caption bar
+ *		DrawCaption (USER.660) Draws a caption bar
  *
  * PARAMS
  *     hwnd   [I]
@@ -281,7 +281,7 @@ DrawCaption16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, UINT16 uFlags)
 
 
 /***********************************************************************
- * DrawCaption [USER32.154] Draws a caption bar
+ *		DrawCaption (USER32.@) Draws a caption bar
  *
  * PARAMS
  *     hwnd   [I]
@@ -302,7 +302,7 @@ DrawCaption (HWND hwnd, HDC hdc, const RECT *lpRect, UINT uFlags)
 
 
 /***********************************************************************
- * DrawCaptionTemp16 [USER.657]
+ *		DrawCaptionTemp (USER.657)
  *
  * PARAMS
  *
@@ -326,7 +326,7 @@ DrawCaptionTemp16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, HFONT16 hFont,
 
 
 /***********************************************************************
- * DrawCaptionTempA [USER32.599]
+ *		DrawCaptionTempA (USER32.@)
  *
  * PARAMS
  *
@@ -434,7 +434,7 @@ DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
 
 
 /***********************************************************************
- * DrawCaptionTempW [USER32.602]
+ *		DrawCaptionTempW (USER32.@)
  *
  * PARAMS
  *
@@ -455,7 +455,7 @@ DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
 
 
 /***********************************************************************
- *           AdjustWindowRect16    (USER.102)
+ *		AdjustWindowRect (USER.102)
  */
 BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )
 {
@@ -464,7 +464,7 @@ BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )
 
 
 /***********************************************************************
- *           AdjustWindowRect    (USER32.2)
+ *		AdjustWindowRect (USER32.@)
  */
 BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu )
 {
@@ -473,7 +473,7 @@ BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu )
 
 
 /***********************************************************************
- *           AdjustWindowRectEx16    (USER.454)
+ *		AdjustWindowRectEx (USER.454)
  */
 BOOL16 WINAPI AdjustWindowRectEx16( LPRECT16 rect, DWORD style,
                                     BOOL16 menu, DWORD exStyle )
@@ -503,7 +503,7 @@ BOOL16 WINAPI AdjustWindowRectEx16( LPRECT16 rect, DWORD style,
 
 
 /***********************************************************************
- *           AdjustWindowRectEx    (USER32.3)
+ *		AdjustWindowRectEx (USER32.@)
  */
 BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style,
                                     BOOL menu, DWORD exStyle )
diff --git a/windows/painting.c b/windows/painting.c
index fd8f890ee0b..bc5244ffde0 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -265,7 +265,7 @@ copyrgn:
 
 
 /***********************************************************************
- *           BeginPaint16    (USER.39)
+ *		BeginPaint (USER.39)
  */
 HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps ) 
 {
@@ -285,7 +285,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps )
 
 
 /***********************************************************************
- *           BeginPaint    (USER32.10)
+ *		BeginPaint (USER32.@)
  */
 HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps )
 {
@@ -379,7 +379,7 @@ HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps )
 
 
 /***********************************************************************
- *           EndPaint16    (USER.40)
+ *		EndPaint (USER.40)
  */
 BOOL16 WINAPI EndPaint16( HWND16 hwnd, const PAINTSTRUCT16* lps )
 {
@@ -390,7 +390,7 @@ BOOL16 WINAPI EndPaint16( HWND16 hwnd, const PAINTSTRUCT16* lps )
 
 
 /***********************************************************************
- *           EndPaint    (USER32.176)
+ *		EndPaint (USER32.@)
  */
 BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps )
 {
@@ -401,7 +401,7 @@ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps )
 
 
 /***********************************************************************
- *           FillWindow    (USER.324)
+ *		FillWindow (USER.324)
  */
 void WINAPI FillWindow16( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc, HBRUSH16 hbrush )
 {
@@ -428,7 +428,7 @@ static HBRUSH16 PAINT_GetControlBrush( HWND hParent, HWND hWnd, HDC16 hDC, UINT1
 
 
 /***********************************************************************
- *           PaintRect    (USER.325)
+ *		PaintRect (USER.325)
  */
 void WINAPI PaintRect16( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc,
                        HBRUSH16 hbrush, const RECT16 *rect)
@@ -446,7 +446,7 @@ void WINAPI PaintRect16( HWND16 hwndParent, HWND16 hwnd, HDC16 hdc,
 
 
 /***********************************************************************
- *           GetControlBrush    (USER.326)
+ *		GetControlBrush (USER.326)
  */
 HBRUSH16 WINAPI GetControlBrush16( HWND16 hwnd, HDC16 hdc, UINT16 ctlType )
 {
@@ -966,7 +966,7 @@ END:
 
 
 /***********************************************************************
- *           RedrawWindow    (USER32.426)
+ *		RedrawWindow (USER32.@)
  */
 BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate,
                               HRGN hrgnUpdate, UINT flags )
@@ -976,7 +976,7 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate,
 
 
 /***********************************************************************
- *           RedrawWindow16    (USER.290)
+ *		RedrawWindow (USER.290)
  */
 BOOL16 WINAPI RedrawWindow16( HWND16 hwnd, const RECT16 *rectUpdate,
                               HRGN16 hrgnUpdate, UINT16 flags )
@@ -993,7 +993,7 @@ BOOL16 WINAPI RedrawWindow16( HWND16 hwnd, const RECT16 *rectUpdate,
 
 
 /***********************************************************************
- *           UpdateWindow16   (USER.124)
+ *		UpdateWindow (USER.124)
  */
 void WINAPI UpdateWindow16( HWND16 hwnd )
 {
@@ -1001,7 +1001,7 @@ void WINAPI UpdateWindow16( HWND16 hwnd )
 }
 
 /***********************************************************************
- *           UpdateWindow   (USER32.567)
+ *		UpdateWindow (USER32.@)
  */
 void WINAPI UpdateWindow( HWND hwnd )
 {
@@ -1009,7 +1009,7 @@ void WINAPI UpdateWindow( HWND hwnd )
 }
 
 /***********************************************************************
- *           InvalidateRgn16   (USER.126)
+ *		InvalidateRgn (USER.126)
  */
 void WINAPI InvalidateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase )
 {
@@ -1019,7 +1019,7 @@ void WINAPI InvalidateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase )
 
 
 /***********************************************************************
- *           InvalidateRgn   (USER32.329)
+ *		InvalidateRgn (USER32.@)
  */
 BOOL WINAPI InvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase )
 {
@@ -1028,7 +1028,7 @@ BOOL WINAPI InvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase )
 
 
 /***********************************************************************
- *           InvalidateRect16   (USER.125)
+ *		InvalidateRect (USER.125)
  */
 void WINAPI InvalidateRect16( HWND16 hwnd, const RECT16 *rect, BOOL16 erase )
 {
@@ -1037,7 +1037,7 @@ void WINAPI InvalidateRect16( HWND16 hwnd, const RECT16 *rect, BOOL16 erase )
 
 
 /***********************************************************************
- *           InvalidateRect   (USER32.328)
+ *		InvalidateRect (USER32.@)
  */
 BOOL WINAPI InvalidateRect( HWND hwnd, const RECT *rect, BOOL erase )
 {
@@ -1047,7 +1047,7 @@ BOOL WINAPI InvalidateRect( HWND hwnd, const RECT *rect, BOOL erase )
 
 
 /***********************************************************************
- *           ValidateRgn16   (USER.128)
+ *		ValidateRgn (USER.128)
  */
 void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn )
 {
@@ -1057,7 +1057,7 @@ void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn )
 
 
 /***********************************************************************
- *           ValidateRgn   (USER32.572)
+ *		ValidateRgn (USER32.@)
  */
 void WINAPI ValidateRgn( HWND hwnd, HRGN hrgn )
 {
@@ -1066,7 +1066,7 @@ void WINAPI ValidateRgn( HWND hwnd, HRGN hrgn )
 
 
 /***********************************************************************
- *           ValidateRect16   (USER.127)
+ *		ValidateRect (USER.127)
  */
 void WINAPI ValidateRect16( HWND16 hwnd, const RECT16 *rect )
 {
@@ -1075,7 +1075,7 @@ void WINAPI ValidateRect16( HWND16 hwnd, const RECT16 *rect )
 
 
 /***********************************************************************
- *           ValidateRect   (USER32.571)
+ *		ValidateRect (USER32.@)
  */
 void WINAPI ValidateRect( HWND hwnd, const RECT *rect )
 {
@@ -1084,7 +1084,7 @@ void WINAPI ValidateRect( HWND hwnd, const RECT *rect )
 
 
 /***********************************************************************
- *           GetUpdateRect16   (USER.190)
+ *		GetUpdateRect (USER.190)
  */
 BOOL16 WINAPI GetUpdateRect16( HWND16 hwnd, LPRECT16 rect, BOOL16 erase )
 {
@@ -1099,7 +1099,7 @@ BOOL16 WINAPI GetUpdateRect16( HWND16 hwnd, LPRECT16 rect, BOOL16 erase )
 
 
 /***********************************************************************
- *           GetUpdateRect   (USER32.297)
+ *		GetUpdateRect (USER32.@)
  */
 BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase )
 {
@@ -1144,7 +1144,7 @@ END:
 
 
 /***********************************************************************
- *           GetUpdateRgn16   (USER.237)
+ *		GetUpdateRgn (USER.237)
  */
 INT16 WINAPI GetUpdateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase )
 {
@@ -1153,7 +1153,7 @@ INT16 WINAPI GetUpdateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase )
 
 
 /***********************************************************************
- *           GetUpdateRgn    (USER32.298)
+ *		GetUpdateRgn (USER32.@)
  */
 INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase )
 {
@@ -1188,7 +1188,7 @@ END:
 
 
 /***********************************************************************
- *           ExcludeUpdateRgn16   (USER.238)
+ *		ExcludeUpdateRgn (USER.238)
  */
 INT16 WINAPI ExcludeUpdateRgn16( HDC16 hdc, HWND16 hwnd )
 {
@@ -1197,7 +1197,7 @@ INT16 WINAPI ExcludeUpdateRgn16( HDC16 hdc, HWND16 hwnd )
 
 
 /***********************************************************************
- *           ExcludeUpdateRgn   (USER32.195)
+ *		ExcludeUpdateRgn (USER32.@)
  */
 INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd )
 {
@@ -1234,7 +1234,7 @@ INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd )
 
 
 /***********************************************************************
- *           FillRect16    (USER.81)
+ *		FillRect (USER.81)
  * NOTE
  *   The Win16 variant doesn't support special color brushes like
  *   the Win32 one, despite the fact that Win16, as well as Win32,
@@ -1257,7 +1257,7 @@ INT16 WINAPI FillRect16( HDC16 hdc, const RECT16 *rect, HBRUSH16 hbrush )
 
 
 /***********************************************************************
- *           FillRect    (USER32.197)
+ *		FillRect (USER32.@)
  */
 INT WINAPI FillRect( HDC hdc, const RECT *rect, HBRUSH hbrush )
 {
@@ -1276,7 +1276,7 @@ INT WINAPI FillRect( HDC hdc, const RECT *rect, HBRUSH hbrush )
 
 
 /***********************************************************************
- *           InvertRect16    (USER.82)
+ *		InvertRect (USER.82)
  */
 void WINAPI InvertRect16( HDC16 hdc, const RECT16 *rect )
 {
@@ -1286,7 +1286,7 @@ void WINAPI InvertRect16( HDC16 hdc, const RECT16 *rect )
 
 
 /***********************************************************************
- *           InvertRect    (USER32.330)
+ *		InvertRect (USER32.@)
  */
 BOOL WINAPI InvertRect( HDC hdc, const RECT *rect )
 {
@@ -1297,7 +1297,7 @@ BOOL WINAPI InvertRect( HDC hdc, const RECT *rect )
 
 
 /***********************************************************************
- *           FrameRect    (USER32.203)
+ *		FrameRect (USER32.@)
  */
 INT WINAPI FrameRect( HDC hdc, const RECT *rect, HBRUSH hbrush )
 {
@@ -1322,7 +1322,7 @@ INT WINAPI FrameRect( HDC hdc, const RECT *rect, HBRUSH hbrush )
 
 
 /***********************************************************************
- *           FrameRect16    (USER.83)
+ *		FrameRect (USER.83)
  */
 INT16 WINAPI FrameRect16( HDC16 hdc, const RECT16 *rect16, HBRUSH16 hbrush )
 {
@@ -1333,7 +1333,7 @@ INT16 WINAPI FrameRect16( HDC16 hdc, const RECT16 *rect16, HBRUSH16 hbrush )
 
 
 /***********************************************************************
- *           DrawFocusRect16    (USER.466)
+ *		DrawFocusRect (USER.466)
  */
 void WINAPI DrawFocusRect16( HDC16 hdc, const RECT16* rc )
 {
@@ -1344,7 +1344,7 @@ void WINAPI DrawFocusRect16( HDC16 hdc, const RECT16* rc )
 
 
 /***********************************************************************
- *           DrawFocusRect    (USER32.156)
+ *		DrawFocusRect (USER32.@)
  *
  * FIXME: PatBlt(PATINVERT) with background brush.
  */
@@ -1372,7 +1372,7 @@ BOOL WINAPI DrawFocusRect( HDC hdc, const RECT* rc )
 }
 
 /**********************************************************************
- *          DrawAnimatedRects16  (USER.448)
+ *		DrawAnimatedRects (USER.448)
  */
 BOOL16 WINAPI DrawAnimatedRects16( HWND16 hwnd, INT16 idAni,
                                    const RECT16* lprcFrom,
@@ -1395,7 +1395,7 @@ BOOL16 WINAPI DrawAnimatedRects16( HWND16 hwnd, INT16 idAni,
 
 
 /**********************************************************************
- *          DrawAnimatedRects  (USER32.153)
+ *		DrawAnimatedRects (USER32.@)
  */
 BOOL WINAPI DrawAnimatedRects( HWND hwnd, INT idAni,
                                    const RECT* lprcFrom,
@@ -1645,7 +1645,7 @@ cleanup:
 }
 
 /**********************************************************************
- *      DrawStateA()   (USER32.162)
+ *		DrawStateA (USER32.@)
  */
 BOOL WINAPI DrawStateA(HDC hdc, HBRUSH hbr,
                    DRAWSTATEPROC func, LPARAM ldata, WPARAM wdata,
@@ -1655,7 +1655,7 @@ BOOL WINAPI DrawStateA(HDC hdc, HBRUSH hbr,
 }
 
 /**********************************************************************
- *      DrawStateW()   (USER32.163)
+ *		DrawStateW (USER32.@)
  */
 BOOL WINAPI DrawStateW(HDC hdc, HBRUSH hbr,
                    DRAWSTATEPROC func, LPARAM ldata, WPARAM wdata,
@@ -1665,7 +1665,7 @@ BOOL WINAPI DrawStateW(HDC hdc, HBRUSH hbr,
 }
 
 /**********************************************************************
- *      DrawState16()   (USER.449)
+ *		DrawState (USER.449)
  */
 BOOL16 WINAPI DrawState16(HDC16 hdc, HBRUSH16 hbr,
                    DRAWSTATEPROC16 func, LPARAM ldata, WPARAM16 wdata,
@@ -1676,7 +1676,7 @@ BOOL16 WINAPI DrawState16(HDC16 hdc, HBRUSH16 hbr,
 
 
 /***********************************************************************
- *           SelectPalette16    (USER.282)
+ *		SelectPalette (USER.282)
  */
 HPALETTE16 WINAPI SelectPalette16( HDC16 hDC, HPALETTE16 hPal,
                                    BOOL16 bForceBackground )
@@ -1698,7 +1698,7 @@ HPALETTE16 WINAPI SelectPalette16( HDC16 hDC, HPALETTE16 hPal,
 
 
 /***********************************************************************
- *           RealizePalette16    (USER.283)
+ *		RealizePalette (USER.283)
  */
 UINT16 WINAPI RealizePalette16( HDC16 hDC )
 {
@@ -1716,7 +1716,7 @@ UINT16 WINAPI RealizePalette16( HDC16 hDC )
 
 
 /***********************************************************************
- *           UserRealizePalette    (USER32.@)
+ *		UserRealizePalette (USER32.@)
  */
 UINT WINAPI UserRealizePalette( HDC hDC )
 {
diff --git a/windows/property.c b/windows/property.c
index ebb932183b1..b3d2f7ccc77 100644
--- a/windows/property.c
+++ b/windows/property.c
@@ -66,7 +66,7 @@ END:
 
 
 /***********************************************************************
- *           GetProp16   (USER.25)
+ *		GetProp (USER.25)
  */
 HANDLE16 WINAPI GetProp16( HWND16 hwnd, LPCSTR str )
 {
@@ -75,7 +75,7 @@ HANDLE16 WINAPI GetProp16( HWND16 hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           GetPropA   (USER32.281)
+ *		GetPropA (USER32.@)
  */
 HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str )
 {
@@ -93,7 +93,7 @@ HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           GetPropW   (USER32.282)
+ *		GetPropW (USER32.@)
  */
 HANDLE WINAPI GetPropW( HWND hwnd, LPCWSTR str )
 {
@@ -109,7 +109,7 @@ HANDLE WINAPI GetPropW( HWND hwnd, LPCWSTR str )
 
 
 /***********************************************************************
- *           SetProp16   (USER.26)
+ *		SetProp (USER.26)
  */
 BOOL16 WINAPI SetProp16( HWND16 hwnd, LPCSTR str, HANDLE16 handle )
 {
@@ -118,7 +118,7 @@ BOOL16 WINAPI SetProp16( HWND16 hwnd, LPCSTR str, HANDLE16 handle )
 
 
 /***********************************************************************
- *           SetPropA   (USER32.497)
+ *		SetPropA (USER32.@)
  */
 BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle )
 {
@@ -157,7 +157,7 @@ BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle )
 
 
 /***********************************************************************
- *           SetPropW   (USER32.498)
+ *		SetPropW (USER32.@)
  */
 BOOL WINAPI SetPropW( HWND hwnd, LPCWSTR str, HANDLE handle )
 {
@@ -174,7 +174,7 @@ BOOL WINAPI SetPropW( HWND hwnd, LPCWSTR str, HANDLE handle )
 
 
 /***********************************************************************
- *           RemoveProp16   (USER.24)
+ *		RemoveProp (USER.24)
  */
 HANDLE16 WINAPI RemoveProp16( HWND16 hwnd, LPCSTR str )
 {
@@ -183,7 +183,7 @@ HANDLE16 WINAPI RemoveProp16( HWND16 hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           RemovePropA   (USER32.442)
+ *		RemovePropA (USER32.@)
  */
 HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str )
 {
@@ -235,7 +235,7 @@ HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           RemovePropW   (USER32.443)
+ *		RemovePropW (USER32.@)
  */
 HANDLE WINAPI RemovePropW( HWND hwnd, LPCWSTR str )
 {
@@ -271,7 +271,7 @@ void PROPERTY_RemoveWindowProps( WND *pWnd )
 
 
 /***********************************************************************
- *           EnumProps16   (USER.27)
+ *		EnumProps (USER.27)
  */
 INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 {
@@ -298,7 +298,7 @@ INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 
 
 /***********************************************************************
- *           EnumPropsA   (USER32.186)
+ *		EnumPropsA (USER32.@)
  */
 INT WINAPI EnumPropsA( HWND hwnd, PROPENUMPROCA func )
 {
@@ -307,7 +307,7 @@ INT WINAPI EnumPropsA( HWND hwnd, PROPENUMPROCA func )
 
 
 /***********************************************************************
- *           EnumPropsW   (USER32.189)
+ *		EnumPropsW (USER32.@)
  */
 INT WINAPI EnumPropsW( HWND hwnd, PROPENUMPROCW func )
 {
@@ -316,7 +316,7 @@ INT WINAPI EnumPropsW( HWND hwnd, PROPENUMPROCW func )
 
 
 /***********************************************************************
- *           EnumPropsExA   (USER32.187)
+ *		EnumPropsExA (USER32.@)
  */
 INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam)
 {
@@ -344,7 +344,7 @@ INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam)
 
 
 /***********************************************************************
- *           EnumPropsExW   (USER32.188)
+ *		EnumPropsExW (USER32.@)
  */
 INT WINAPI EnumPropsExW(HWND hwnd, PROPENUMPROCEXW func, LPARAM lParam)
 {
diff --git a/windows/queue.c b/windows/queue.c
index 4e9ca17526d..cdd3d85aefc 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -1324,7 +1324,7 @@ void QUEUE_DecTimerCount( HQUEUE16 hQueue )
 
 
 /***********************************************************************
- *           PostQuitMessage16   (USER.6)
+ *		PostQuitMessage (USER.6)
  */
 void WINAPI PostQuitMessage16( INT16 exitCode )
 {
@@ -1333,7 +1333,7 @@ void WINAPI PostQuitMessage16( INT16 exitCode )
 
 
 /***********************************************************************
- *           PostQuitMessage   (USER32.421)
+ *		PostQuitMessage (USER32.@)
  *
  * PostQuitMessage() posts a message to the system requesting an
  * application to terminate execution. As a result of this function,
@@ -1358,7 +1358,7 @@ void WINAPI PostQuitMessage( INT exitCode )
 
 
 /***********************************************************************
- *           GetWindowTask16   (USER.224)
+ *		GetWindowTask (USER.224)
  */
 HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
 {
@@ -1372,7 +1372,7 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
 }
 
 /***********************************************************************
- *           GetWindowThreadProcessId   (USER32.313)
+ *		GetWindowThreadProcessId (USER32.@)
  */
 DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process )
 {
@@ -1396,7 +1396,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process )
 
 
 /***********************************************************************
- *           SetMessageQueue16   (USER.266)
+ *		SetMessageQueue (USER.266)
  */
 BOOL16 WINAPI SetMessageQueue16( INT16 size )
 {
@@ -1405,7 +1405,7 @@ BOOL16 WINAPI SetMessageQueue16( INT16 size )
 
 
 /***********************************************************************
- *           SetMessageQueue   (USER32.494)
+ *		SetMessageQueue (USER32.@)
  */
 BOOL WINAPI SetMessageQueue( INT size )
 {
@@ -1419,7 +1419,7 @@ BOOL WINAPI SetMessageQueue( INT size )
 }
 
 /***********************************************************************
- *           InitThreadInput16   (USER.409)
+ *		InitThreadInput (USER.409)
  */
 HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags )
 {
@@ -1461,7 +1461,7 @@ HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags )
 }
 
 /***********************************************************************
- *           GetQueueStatus16   (USER.334)
+ *		GetQueueStatus (USER.334)
  */
 DWORD WINAPI GetQueueStatus16( UINT16 flags )
 {
@@ -1477,7 +1477,7 @@ DWORD WINAPI GetQueueStatus16( UINT16 flags )
 }
 
 /***********************************************************************
- *           GetQueueStatus   (USER32.283)
+ *		GetQueueStatus (USER32.@)
  */
 DWORD WINAPI GetQueueStatus( UINT flags )
 {
@@ -1494,7 +1494,7 @@ DWORD WINAPI GetQueueStatus( UINT flags )
 
 
 /***********************************************************************
- *           GetInputState16   (USER.335)
+ *		GetInputState (USER.335)
  */
 BOOL16 WINAPI GetInputState16(void)
 {
@@ -1502,7 +1502,7 @@ BOOL16 WINAPI GetInputState16(void)
 }
 
 /***********************************************************************
- *           WaitForInputIdle   (USER32.577)
+ *		WaitForInputIdle (USER32.@)
  */
 DWORD WINAPI WaitForInputIdle (HANDLE hProcess, DWORD dwTimeOut)
 {
@@ -1547,7 +1547,7 @@ DWORD WINAPI WaitForInputIdle (HANDLE hProcess, DWORD dwTimeOut)
 }
 
 /***********************************************************************
- *           GetInputState   (USER32.244)
+ *		GetInputState (USER32.@)
  */
 BOOL WINAPI GetInputState(void)
 {
@@ -1563,7 +1563,7 @@ BOOL WINAPI GetInputState(void)
 }
 
 /***********************************************************************
- *           UserYield  (USER.332)
+ *		UserYield (USER.332)
  */
 void WINAPI UserYield16(void)
 {
@@ -1593,7 +1593,7 @@ void WINAPI UserYield16(void)
 }
 
 /***********************************************************************
- *           GetMessagePos   (USER.119) (USER32.272)
+ *		GetMessagePos (USER.119) (USER32.@)
  * 
  * The GetMessagePos() function returns a long value representing a
  * cursor position, in screen coordinates, when the last message
@@ -1627,7 +1627,7 @@ DWORD WINAPI GetMessagePos(void)
 
 
 /***********************************************************************
- *           GetMessageTime   (USER.120) (USER32.273)
+ *		GetMessageTime (USER.120) (USER32.@)
  *
  * GetMessageTime() returns the message time for the last message
  * retrieved by the function. The time is measured in milliseconds with
@@ -1659,7 +1659,7 @@ LONG WINAPI GetMessageTime(void)
 
 
 /***********************************************************************
- *           GetMessageExtraInfo   (USER.288) (USER32.271)
+ *		GetMessageExtraInfo (USER.288) (USER32.@)
  */
 LONG WINAPI GetMessageExtraInfo(void)
 {
@@ -1675,7 +1675,7 @@ LONG WINAPI GetMessageExtraInfo(void)
 
 
 /**********************************************************************
- * AttachThreadInput [USER32.8]  Attaches input of 1 thread to other
+ *		AttachThreadInput (USER32.@) Attaches input of 1 thread to other
  *
  * Attaches the input processing mechanism of one thread to that of
  * another thread.
diff --git a/windows/rect.c b/windows/rect.c
index c98c87fa489..73c516bb424 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -11,7 +11,7 @@
 #include "winuser.h"
 
 /***********************************************************************
- *           SetRect16    (USER.72)
+ *		SetRect (USER.72)
  */
 void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top,
                        INT16 right, INT16 bottom )
@@ -24,7 +24,7 @@ void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top,
 
 
 /***********************************************************************
- *           SetRect    (USER32.499)
+ *		SetRect (USER32.@)
  */
 BOOL WINAPI SetRect( LPRECT rect, INT left, INT top,
                        INT right, INT bottom )
@@ -38,7 +38,7 @@ BOOL WINAPI SetRect( LPRECT rect, INT left, INT top,
 
 
 /***********************************************************************
- *           SetRectEmpty16    (USER.73)
+ *		SetRectEmpty (USER.73)
  */
 void WINAPI SetRectEmpty16( LPRECT16 rect )
 {
@@ -47,7 +47,7 @@ void WINAPI SetRectEmpty16( LPRECT16 rect )
 
 
 /***********************************************************************
- *           SetRectEmpty    (USER32.500)
+ *		SetRectEmpty (USER32.@)
  */
 BOOL WINAPI SetRectEmpty( LPRECT rect )
 {
@@ -57,7 +57,7 @@ BOOL WINAPI SetRectEmpty( LPRECT rect )
 
 
 /***********************************************************************
- *           CopyRect16    (USER.74)
+ *		CopyRect (USER.74)
  */
 BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
 {
@@ -67,7 +67,7 @@ BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
 
 
 /***********************************************************************
- *           CopyRect    (USER32.62)
+ *		CopyRect (USER32.@)
  */
 BOOL WINAPI CopyRect( RECT *dest, const RECT *src )
 {
@@ -79,7 +79,7 @@ BOOL WINAPI CopyRect( RECT *dest, const RECT *src )
 
 
 /***********************************************************************
- *           IsRectEmpty16    (USER.75)
+ *		IsRectEmpty (USER.75)
  *
  * Bug compat: Windows checks for 0 or negative width/height.
  */
@@ -90,7 +90,7 @@ BOOL16 WINAPI IsRectEmpty16( const RECT16 *rect )
 
 
 /***********************************************************************
- *           IsRectEmpty    (USER32.347)
+ *		IsRectEmpty (USER32.@)
  *
  * Bug compat: Windows checks for 0 or negative width/height.
  */
@@ -101,7 +101,7 @@ BOOL WINAPI IsRectEmpty( const RECT *rect )
 
 
 /***********************************************************************
- *           PtInRect16    (USER.76)
+ *		PtInRect (USER.76)
  */
 BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt )
 {
@@ -111,7 +111,7 @@ BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt )
 
 
 /***********************************************************************
- *           PtInRect    (USER32.424)
+ *		PtInRect (USER32.@)
  */
 BOOL WINAPI PtInRect( const RECT *rect, POINT pt )
 {
@@ -121,7 +121,7 @@ BOOL WINAPI PtInRect( const RECT *rect, POINT pt )
 
 
 /***********************************************************************
- *           OffsetRect16    (USER.77)
+ *		OffsetRect (USER.77)
  */
 void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
 {
@@ -133,7 +133,7 @@ void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           OffsetRect    (USER32.406)
+ *		OffsetRect (USER32.@)
  */
 BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y )
 {
@@ -146,7 +146,7 @@ BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y )
 
 
 /***********************************************************************
- *           InflateRect16    (USER.78)
+ *		InflateRect (USER.78)
  */
 void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
 {
@@ -158,7 +158,7 @@ void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           InflateRect    (USER32.321)
+ *		InflateRect (USER32.@)
  */
 BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y )
 {
@@ -171,7 +171,7 @@ BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y )
 
 
 /***********************************************************************
- *           IntersectRect16    (USER.79)
+ *		IntersectRect (USER.79)
  */
 BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1,
                                const RECT16 *src2 )
@@ -192,7 +192,7 @@ BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1,
 
 
 /***********************************************************************
- *           IntersectRect    (USER32.327)
+ *		IntersectRect (USER32.@)
  */
 BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1,
                                const RECT *src2 )
@@ -213,7 +213,7 @@ BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1,
 
 
 /***********************************************************************
- *           UnionRect16    (USER.80)
+ *		UnionRect (USER.80)
  */
 BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1,
                            const RECT16 *src2 )
@@ -243,7 +243,7 @@ BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1,
 
 
 /***********************************************************************
- *           UnionRect    (USER32.559)
+ *		UnionRect (USER32.@)
  */
 BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1,
                            const RECT *src2 )
@@ -273,7 +273,7 @@ BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1,
 
 
 /***********************************************************************
- *           EqualRect16    (USER.244)
+ *		EqualRect (USER.244)
  */
 BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 )
 {
@@ -283,7 +283,7 @@ BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 )
 
 
 /***********************************************************************
- *           EqualRect    (USER32.194)
+ *		EqualRect (USER32.@)
  */
 BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 )
 {
@@ -293,7 +293,7 @@ BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 )
 
 
 /***********************************************************************
- *           SubtractRect16    (USER.373)
+ *		SubtractRect (USER.373)
  */
 BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1,
                               const RECT16 *src2 )
@@ -329,7 +329,7 @@ BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1,
 
 
 /***********************************************************************
- *           SubtractRect    (USER32.536)
+ *		SubtractRect (USER32.@)
  */
 BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1,
                               const RECT *src2 )
diff --git a/windows/scroll.c b/windows/scroll.c
index b6cba187aa4..8b955230681 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -22,7 +22,7 @@
 DEFAULT_DEBUG_CHANNEL(scroll);
 
 /*************************************************************************
- *             ScrollWindow16   (USER.61)
+ *		ScrollWindow16 (USER.61)
  */
 void WINAPI ScrollWindow16(HWND16 hwnd, INT16 dx, INT16 dy, const RECT16 *rect,
                            const RECT16 *clipRect )
@@ -36,7 +36,7 @@ void WINAPI ScrollWindow16(HWND16 hwnd, INT16 dx, INT16 dy, const RECT16 *rect,
 }
 
 /*************************************************************************
- *             ScrollWindow   (USER32.450)
+ *		ScrollWindow (USER32.@)
  *
  */
 BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
@@ -49,7 +49,7 @@ BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
 }
 
 /*************************************************************************
- *             ScrollDC16   (USER.221)
+ *		ScrollDC (USER.221)
  */
 BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
                           const RECT16 *cliprc, HRGN16 hrgnUpdate,
@@ -68,7 +68,7 @@ BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
 
 
 /*************************************************************************
- *             ScrollDC   (USER32.449)
+ *		ScrollDC (USER32.@)
  * 
  *   Only the hrgnUpdate is return in device coordinate.
  *   rcUpdate must be returned in logical coordinate to comply with win API.
@@ -185,7 +185,7 @@ BOOL WINAPI ScrollDC( HDC hdc, INT dx, INT dy, const RECT *rc,
 
 
 /*************************************************************************
- *             ScrollWindowEx16   (USER.319)
+ *		ScrollWindowEx (USER.319)
  */
 INT16 WINAPI ScrollWindowEx16( HWND16 hwnd, INT16 dx, INT16 dy,
                                const RECT16 *rect, const RECT16 *clipRect,
@@ -234,7 +234,7 @@ static BOOL SCROLL_FixCaret(HWND hWnd, LPRECT lprc, UINT flags)
 }
 
 /*************************************************************************
- *             ScrollWindowEx   (USER32.451)
+ *		ScrollWindowEx (USER32.@)
  *
  * NOTE: Use this function instead of ScrollWindow32
  */
diff --git a/windows/syscolor.c b/windows/syscolor.c
index c74ad280385..9dd3915ad29 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -208,7 +208,7 @@ void SYSCOLOR_Init(void)
 
 
 /*************************************************************************
- *             GetSysColor16   (USER.180)
+ *		GetSysColor (USER.180)
  */
 COLORREF WINAPI GetSysColor16( INT16 nIndex )
 {
@@ -217,7 +217,7 @@ COLORREF WINAPI GetSysColor16( INT16 nIndex )
 
 
 /*************************************************************************
- *             GetSysColor   (USER32.289)
+ *		GetSysColor (USER32.@)
  */
 COLORREF WINAPI GetSysColor( INT nIndex )
 {
@@ -229,7 +229,7 @@ COLORREF WINAPI GetSysColor( INT nIndex )
 
 
 /*************************************************************************
- *             SetSysColors16   (USER.181)
+ *		SetSysColors (USER.181)
  */
 VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
 			    const COLORREF *lpColorValues )
@@ -253,7 +253,7 @@ VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
 
 
 /*************************************************************************
- *             SetSysColors   (USER32.505)
+ *		SetSysColors (USER32.@)
  */
 BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor,
                               const COLORREF *lpColorValues )
@@ -278,7 +278,7 @@ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor,
 
 
 /***********************************************************************
- *           GetSysColorBrush16    (USER.281)
+ *		GetSysColorBrush16 (USER.281)
  */
 HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
 {
@@ -287,7 +287,7 @@ HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
 
 
 /***********************************************************************
- *           GetSysColorBrush    (USER32.290)
+ *		GetSysColorBrush (USER32.@)
  */
 HBRUSH WINAPI GetSysColorBrush( INT index )
 {
@@ -299,7 +299,7 @@ HBRUSH WINAPI GetSysColorBrush( INT index )
 
 
 /***********************************************************************
- *           GetSysColorPen    (Not a Windows API)
+ *		GetSysColorPen (USER32.@) (Not a Windows API)
  *
  * This function is new to the Wine lib -- it does not exist in 
  * Windows. However, it is a natural complement for GetSysColorBrush
diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c
index 81c67dada85..c2b31406b34 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -178,7 +178,7 @@ void SYSMETRICS_Init(void)
 
 
 /***********************************************************************
- *           GetSystemMetrics16    (USER.179)
+ *		GetSystemMetrics (USER.179)
  */
 INT16 WINAPI GetSystemMetrics16( INT16 index )
 {
@@ -187,7 +187,7 @@ INT16 WINAPI GetSystemMetrics16( INT16 index )
 
 
 /***********************************************************************
- *           GetSystemMetrics    (USER32.292)
+ *		GetSystemMetrics (USER32.@)
  */
 INT WINAPI GetSystemMetrics( INT index )
 {
diff --git a/windows/sysparams.c b/windows/sysparams.c
index c36fa43e297..c7c17c87d43 100644
--- a/windows/sysparams.c
+++ b/windows/sysparams.c
@@ -24,7 +24,7 @@
 DEFAULT_DEBUG_CHANNEL(system);
 
 /***********************************************************************
- *	GetTimerResolution (USER.14)
+ *		GetTimerResolution (USER.14)
  */
 LONG WINAPI GetTimerResolution16(void)
 {
@@ -32,7 +32,7 @@ LONG WINAPI GetTimerResolution16(void)
 }
 
 /***********************************************************************
- *	ControlPanelInfo16   (USER.273)
+ *		ControlPanelInfo (USER.273)
  */
 void WINAPI ControlPanelInfo16( INT16 nInfoType, WORD wData, LPSTR lpBuffer )
 {
@@ -114,7 +114,7 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A
 }
 
 /***********************************************************************
- *	SystemParametersInfoA   (USER32.540)
+ *		SystemParametersInfoA (USER32.@)
  */
 BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam,
 				   PVOID pvParam, UINT fWinIni )
@@ -523,7 +523,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam,
 
 
 /***********************************************************************
- *	SystemParametersInfo16   (USER.483)
+ *		SystemParametersInfo (USER.483)
  */
 BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
                                       LPVOID lpvParam, UINT16 fuWinIni )
@@ -624,7 +624,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 }
 
 /***********************************************************************
- *	SystemParametersInfoW   (USER32.541)
+ *		SystemParametersInfoW (USER32.@)
  */
 BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
 				   PVOID pvParam, UINT fuWinIni )
diff --git a/windows/timer.c b/windows/timer.c
index e9f2b797342..778485ecb6a 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -291,7 +291,7 @@ static BOOL TIMER_KillTimer( HWND hwnd, UINT id, BOOL sys )
 
 
 /***********************************************************************
- *           SetTimer16   (USER.10)
+ *		SetTimer (USER.10)
  */
 UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
                           TIMERPROC16 proc )
@@ -304,7 +304,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 
 
 /***********************************************************************
- *           SetTimer   (USER32.511)
+ *		SetTimer (USER32.@)
  */
 UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout,
                           TIMERPROC proc )
@@ -341,7 +341,7 @@ BOOL TIMER_IsTimerValid( HWND hwnd, UINT id, HWINDOWPROC hProc )
 
 
 /***********************************************************************
- *           SetSystemTimer16   (USER.11)
+ *		SetSystemTimer (USER.11)
  */
 UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
                                 TIMERPROC16 proc )
@@ -354,7 +354,7 @@ UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 
 
 /***********************************************************************
- *           SetSystemTimer   (USER32.509)
+ *		SetSystemTimer (USER32.@)
  */
 UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
                                 TIMERPROC proc )
@@ -367,7 +367,7 @@ UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
 
 
 /***********************************************************************
- *           KillTimer16   (USER.12)
+ *		KillTimer (USER.12)
  */
 BOOL16 WINAPI KillTimer16( HWND16 hwnd, UINT16 id )
 {
@@ -377,7 +377,7 @@ BOOL16 WINAPI KillTimer16( HWND16 hwnd, UINT16 id )
 
 
 /***********************************************************************
- *           KillTimer   (USER32.354)
+ *		KillTimer (USER32.@)
  */
 BOOL WINAPI KillTimer( HWND hwnd, UINT id )
 {
@@ -387,7 +387,7 @@ BOOL WINAPI KillTimer( HWND hwnd, UINT id )
 
 
 /***********************************************************************
- *           KillSystemTimer16   (USER.182)
+ *		KillSystemTimer (USER.182)
  */
 BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id )
 {
@@ -397,7 +397,7 @@ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id )
 
 
 /***********************************************************************
- *           KillSystemTimer   (USER32.353)
+ *		KillSystemTimer (USER32.@)
  */
 BOOL WINAPI KillSystemTimer( HWND hwnd, UINT id )
 {
diff --git a/windows/user.c b/windows/user.c
index 6febd942099..80f104f3a7e 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -34,7 +34,7 @@ DECLARE_DEBUG_CHANNEL(win);
 DECLARE_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
- *           GetFreeSystemResources   (USER.284)
+ *		GetFreeSystemResources (USER.284)
  */
 WORD WINAPI GetFreeSystemResources16( WORD resType )
 {
@@ -76,7 +76,7 @@ WORD WINAPI GetFreeSystemResources16( WORD resType )
 
 
 /**********************************************************************
- *           InitApp   (USER.5)
+ *		InitApp (USER.5)
  */
 INT16 WINAPI InitApp16( HINSTANCE16 hInstance )
 {
@@ -152,7 +152,7 @@ static void USER_AppExit( HINSTANCE16 hInstance )
 
 
 /***********************************************************************
- *           USER_SignalProc (USER.314)
+ *		SignalProc (USER.314)
  */
 void WINAPI USER_SignalProc( HANDLE16 hTaskOrModule, UINT16 uCode,
                              UINT16 uExitFn, HINSTANCE16 hInstance,
@@ -162,7 +162,7 @@ void WINAPI USER_SignalProc( HANDLE16 hTaskOrModule, UINT16 uCode,
 }
 
 /***********************************************************************
- *           FinalUserInit (USER.400)
+ *		FinalUserInit (USER.400)
  */
 void WINAPI FinalUserInit16( void )
 {
@@ -170,7 +170,7 @@ void WINAPI FinalUserInit16( void )
 }
 
 /***********************************************************************
- *           UserSignalProc     (USER.610) (USER32.559)
+ *		UserSignalProc (USER.391) (USER32.@)
  *
  * For comments about the meaning of uCode and dwFlags 
  * see PROCESS_CallUserSignalProc.
@@ -234,7 +234,7 @@ WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
 }
 
 /***********************************************************************
- *           USER_DllEntryPoint  (USER.374)
+ *		DllEntryPoint (USER.374)
  */
 BOOL WINAPI USER_DllEntryPoint( DWORD dwReason, HINSTANCE hInstDLL, WORD ds,
                                 WORD wHeapSize, DWORD dwReserved1, WORD wReserved2 )
@@ -258,7 +258,7 @@ BOOL WINAPI USER_DllEntryPoint( DWORD dwReason, HINSTANCE hInstDLL, WORD ds,
 
 
 /***********************************************************************
- *           ExitWindows16   (USER.7)
+ *		ExitWindows (USER.7)
  */
 BOOL16 WINAPI ExitWindows16( DWORD dwReturnCode, UINT16 wReserved )
 {
@@ -267,7 +267,7 @@ BOOL16 WINAPI ExitWindows16( DWORD dwReturnCode, UINT16 wReserved )
 
 
 /***********************************************************************
- *           ExitWindowsExec16   (USER.246)
+ *		ExitWindowsExec (USER.246)
  */
 BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams )
 {
@@ -278,7 +278,7 @@ BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams )
 
 
 /***********************************************************************
- *           ExitWindowsEx   (USER32.196)
+ *		ExitWindowsEx (USER32.@)
  */
 BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reserved )
 {
@@ -327,7 +327,7 @@ static void _dump_CDS_flags(DWORD flags) {
 }
 
 /***********************************************************************
- *           ChangeDisplaySettingsA    (USER32.589)
+ *		ChangeDisplaySettingsA (USER32.@)
  */
 LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags )
 {
@@ -355,7 +355,7 @@ LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags )
 }
 
 /***********************************************************************
- *           ChangeDisplaySettingsExA    (USER32.604)
+ *		ChangeDisplaySettingsExA (USER32.@)
  */
 LONG WINAPI ChangeDisplaySettingsExA( 
 	LPCSTR devname, LPDEVMODEA devmode, HWND hwnd, DWORD flags,
@@ -385,7 +385,7 @@ LONG WINAPI ChangeDisplaySettingsExA(
 }
 
 /***********************************************************************
- *           EnumDisplaySettingsA   (USER32.592)
+ *		EnumDisplaySettingsA (USER32.@)
  * FIXME: Currently uses static list of modes.
  *
  * RETURNS
@@ -421,7 +421,7 @@ BOOL WINAPI EnumDisplaySettingsA(
 }
 
 /***********************************************************************
- *           EnumDisplaySettingsW   (USER32.593)
+ *		EnumDisplaySettingsW (USER32.@)
  */
 BOOL WINAPI EnumDisplaySettingsW(LPCWSTR name,DWORD n,LPDEVMODEW devmode) {
 	LPSTR nameA = HEAP_strdupWtoA(GetProcessHeap(),0,name);
@@ -439,7 +439,7 @@ BOOL WINAPI EnumDisplaySettingsW(LPCWSTR name,DWORD n,LPDEVMODEW devmode) {
 }
 
 /***********************************************************************
- *           EnumDisplayDevicesA   (USER32.184)
+ *		EnumDisplayDevicesA (USER32.@)
  */
 BOOL WINAPI EnumDisplayDevicesA(
 	LPVOID unused,DWORD i,LPDISPLAY_DEVICEA lpDisplayDevice,DWORD dwFlags
@@ -457,7 +457,7 @@ BOOL WINAPI EnumDisplayDevicesA(
 }
 
 /***********************************************************************
- *           EnumDisplayDevicesW   (USER32.185)
+ *		EnumDisplayDevicesW (USER32.@)
  */
 BOOL WINAPI EnumDisplayDevicesW(
 	LPVOID unused,DWORD i,LPDISPLAY_DEVICEW lpDisplayDevice,DWORD dwFlags
@@ -477,7 +477,7 @@ BOOL WINAPI EnumDisplayDevicesW(
 }
 
 /***********************************************************************
- *           SetEventHook   (USER.321)
+ *		SetEventHook (USER.321)
  *
  *	Used by Turbo Debugger for Windows
  */
@@ -488,7 +488,7 @@ FARPROC16 WINAPI SetEventHook16(FARPROC16 lpfnEventHook)
 }
 
 /***********************************************************************
- *           UserSeeUserDo   (USER.216)
+ *		UserSeeUserDo (USER.216)
  */
 DWORD WINAPI UserSeeUserDo16(WORD wReqType, WORD wParam1, WORD wParam2, WORD wParam3)
 {
@@ -512,7 +512,7 @@ DWORD WINAPI UserSeeUserDo16(WORD wReqType, WORD wParam1, WORD wParam2, WORD wPa
 }
 
 /***********************************************************************
- *         GetSystemDebugState16   (USER.231)
+ *		GetSystemDebugState (USER.231)
  */
 WORD WINAPI GetSystemDebugState16(void)
 {
@@ -520,7 +520,7 @@ WORD WINAPI GetSystemDebugState16(void)
 }
 
 /***********************************************************************
- *           RegisterLogonProcess   (USER32.434)
+ *		RegisterLogonProcess (USER32.@)
  */
 DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) {
 	FIXME_(win32)("(%d,%d),stub!\n",hprocess,x);
@@ -528,7 +528,7 @@ DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) {
 }
 
 /***********************************************************************
- *           CreateWindowStationW   (USER32.86)
+ *		CreateWindowStationW (USER32.@)
  */
 HWINSTA WINAPI CreateWindowStationW(
 	LPWSTR winstation,DWORD res1,DWORD desiredaccess,
@@ -541,7 +541,7 @@ HWINSTA WINAPI CreateWindowStationW(
 }
 
 /***********************************************************************
- *           SetProcessWindowStation   (USER32.496)
+ *		SetProcessWindowStation (USER32.@)
  */
 BOOL WINAPI SetProcessWindowStation(HWINSTA hWinSta) {
 	FIXME_(win32)("(%d),stub!\n",hWinSta);
@@ -549,7 +549,7 @@ BOOL WINAPI SetProcessWindowStation(HWINSTA hWinSta) {
 }
 
 /***********************************************************************
- *           SetUserObjectSecurity   (USER32.514)
+ *		SetUserObjectSecurity (USER32.@)
  */
 BOOL WINAPI SetUserObjectSecurity(
 	HANDLE hObj,
@@ -561,7 +561,7 @@ BOOL WINAPI SetUserObjectSecurity(
 }
 
 /***********************************************************************
- *           CreateDesktopA   (USER32.68)
+ *		CreateDesktopA (USER32.@)
  */
 HDESK WINAPI CreateDesktopA(
 	LPSTR lpszDesktop,LPSTR lpszDevice,LPDEVMODEA pDevmode,
@@ -575,7 +575,7 @@ HDESK WINAPI CreateDesktopA(
 }
 
 /***********************************************************************
- *           CreateDesktopW   (USER32.69)
+ *		CreateDesktopW (USER32.@)
  */
 HDESK WINAPI CreateDesktopW(
 	LPWSTR lpszDesktop,LPWSTR lpszDevice,LPDEVMODEW pDevmode,
@@ -589,7 +589,7 @@ HDESK WINAPI CreateDesktopW(
 }
 
 /***********************************************************************
- *           EnumDesktopWindows   (USER32.591)
+ *		EnumDesktopWindows (USER32.@)
  */
 BOOL WINAPI EnumDesktopWindows( HDESK hDesktop, WNDENUMPROC lpfn, LPARAM lParam ) {
   FIXME_(win32)("(0x%08x, %p, 0x%08lx), stub!\n", hDesktop, lpfn, lParam );
@@ -598,7 +598,7 @@ BOOL WINAPI EnumDesktopWindows( HDESK hDesktop, WNDENUMPROC lpfn, LPARAM lParam
 
 
 /***********************************************************************
- *           CloseWindowStation
+ *		CloseWindowStation (USER32.@)
  */
 BOOL WINAPI CloseWindowStation(HWINSTA hWinSta)
 {
@@ -607,7 +607,7 @@ BOOL WINAPI CloseWindowStation(HWINSTA hWinSta)
 }
 
 /***********************************************************************
- *           CloseDesktop
+ *		CloseDesktop (USER32.@)
  */
 BOOL WINAPI CloseDesktop(HDESK hDesk)
 {
@@ -616,7 +616,7 @@ BOOL WINAPI CloseDesktop(HDESK hDesk)
 }
 
 /***********************************************************************
- *           SetWindowStationUser   (USER32.521)
+ *		SetWindowStationUser (USER32.@)
  */
 DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) {
 	FIXME_(win32)("(0x%08lx,0x%08lx),stub!\n",x1,x2);
@@ -624,7 +624,7 @@ DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) {
 }
 
 /***********************************************************************
- *           SetLogonNotifyWindow   (USER32.486)
+ *		SetLogonNotifyWindow (USER32.@)
  */
 DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) {
 	FIXME_(win32)("(0x%x,%04x),stub!\n",hwinsta,hwnd);
@@ -632,28 +632,28 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) {
 }
 
 /***********************************************************************
- *           LoadLocalFonts   (USER32.486)
+ *		LoadLocalFonts (USER32.@)
  */
 VOID WINAPI LoadLocalFonts(VOID) {
 	/* are loaded. */
 	return;
 }
 /***********************************************************************
- *           GetUserObjectInformationA   (USER32.299)
+ *		GetUserObjectInformationA (USER32.@)
  */
 BOOL WINAPI GetUserObjectInformationA( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
 {	FIXME_(win32)("(0x%x %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
 	return TRUE;
 }
 /***********************************************************************
- *           GetUserObjectInformationW   (USER32.300)
+ *		GetUserObjectInformationW (USER32.@)
  */
 BOOL WINAPI GetUserObjectInformationW( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen )
 {	FIXME_(win32)("(0x%x %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen );
 	return TRUE;
 }
 /***********************************************************************
- *           GetUserObjectSecurity   (USER32.300)
+ *		GetUserObjectSecurity (USER32.@)
  */
 BOOL WINAPI GetUserObjectSecurity(HANDLE hObj, PSECURITY_INFORMATION pSIRequested,
 	PSECURITY_DESCRIPTOR pSID, DWORD nLength, LPDWORD lpnLengthNeeded)
@@ -662,7 +662,7 @@ BOOL WINAPI GetUserObjectSecurity(HANDLE hObj, PSECURITY_INFORMATION pSIRequeste
 }
 
 /***********************************************************************
- *           SetSystemCursor   (USER32.507)
+ *		SetSystemCursor (USER32.@)
  */
 BOOL WINAPI SetSystemCursor(HCURSOR hcur, DWORD id)
 {	FIXME_(win32)("(%08x,%08lx),stub!\n",  hcur, id);
@@ -670,7 +670,7 @@ BOOL WINAPI SetSystemCursor(HCURSOR hcur, DWORD id)
 }
 
 /***********************************************************************
- *	RegisterSystemThread	(USER32.435)
+ *		RegisterSystemThread (USER32.@)
  */
 void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved)
 {
@@ -678,7 +678,7 @@ void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved)
 }
 
 /***********************************************************************
- *	RegisterDeviceNotificationA	(USER32.477)
+ *		RegisterDeviceNotificationA (USER32.@)
  */
 HDEVNOTIFY WINAPI RegisterDeviceNotificationA(
 	HANDLE hnd, LPVOID notifyfilter, DWORD flags
diff --git a/windows/win.c b/windows/win.c
index 3ff57bba410..e916236488a 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -1014,7 +1014,7 @@ end:
 
 
 /***********************************************************************
- *           CreateWindow16   (USER.41)
+ *		CreateWindow (USER.41)
  */
 HWND16 WINAPI CreateWindow16( LPCSTR className, LPCSTR windowName,
                               DWORD style, INT16 x, INT16 y, INT16 width,
@@ -1027,7 +1027,7 @@ HWND16 WINAPI CreateWindow16( LPCSTR className, LPCSTR windowName,
 
 
 /***********************************************************************
- *           CreateWindowEx16   (USER.452)
+ *		CreateWindowEx (USER.452)
  */
 HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className,
                                 LPCSTR windowName, DWORD style, INT16 x,
@@ -1083,7 +1083,7 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className,
 
 
 /***********************************************************************
- *           CreateWindowExA   (USER32.83)
+ *		CreateWindowExA (USER32.@)
  */
 HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className,
                                  LPCSTR windowName, DWORD style, INT x,
@@ -1142,7 +1142,7 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className,
 
 
 /***********************************************************************
- *           CreateWindowExW   (USER32.84)
+ *		CreateWindowExW (USER32.@)
  */
 HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className,
                                  LPCWSTR windowName, DWORD style, INT x,
@@ -1293,7 +1293,7 @@ static void WIN_SendDestroyMsg( WND* pWnd )
 
 
 /***********************************************************************
- *           DestroyWindow16   (USER.53)
+ *		DestroyWindow (USER.53)
  */
 BOOL16 WINAPI DestroyWindow16( HWND16 hwnd )
 {
@@ -1302,7 +1302,7 @@ BOOL16 WINAPI DestroyWindow16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           DestroyWindow   (USER32.135)
+ *		DestroyWindow (USER32.@)
  */
 BOOL WINAPI DestroyWindow( HWND hwnd )
 {
@@ -1449,7 +1449,7 @@ end:
 
 
 /***********************************************************************
- *           CloseWindow16   (USER.43)
+ *		CloseWindow (USER.43)
  */
 BOOL16 WINAPI CloseWindow16( HWND16 hwnd )
 {
@@ -1458,7 +1458,7 @@ BOOL16 WINAPI CloseWindow16( HWND16 hwnd )
 
  
 /***********************************************************************
- *           CloseWindow   (USER32.56)
+ *		CloseWindow (USER32.@)
  */
 BOOL WINAPI CloseWindow( HWND hwnd )
 {
@@ -1480,7 +1480,7 @@ end:
 
  
 /***********************************************************************
- *           OpenIcon16   (USER.44)
+ *		OpenIcon (USER.44)
  */
 BOOL16 WINAPI OpenIcon16( HWND16 hwnd )
 {
@@ -1489,7 +1489,7 @@ BOOL16 WINAPI OpenIcon16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           OpenIcon   (USER32.410)
+ *		OpenIcon (USER32.@)
  */
 BOOL WINAPI OpenIcon( HWND hwnd )
 {
@@ -1570,7 +1570,7 @@ end:
 
 
 /***********************************************************************
- *           FindWindow16   (USER.50)
+ *		FindWindow (USER.50)
  */
 HWND16 WINAPI FindWindow16( LPCSTR className, LPCSTR title )
 {
@@ -1579,7 +1579,7 @@ HWND16 WINAPI FindWindow16( LPCSTR className, LPCSTR title )
 
 
 /***********************************************************************
- *           FindWindowEx16   (USER.427)
+ *		FindWindowEx (USER.427)
  */
 HWND16 WINAPI FindWindowEx16( HWND16 parent, HWND16 child, LPCSTR className, LPCSTR title )
 {
@@ -1588,7 +1588,7 @@ HWND16 WINAPI FindWindowEx16( HWND16 parent, HWND16 child, LPCSTR className, LPC
 
 
 /***********************************************************************
- *           FindWindowA   (USER32.198)
+ *		FindWindowA (USER32.@)
  */
 HWND WINAPI FindWindowA( LPCSTR className, LPCSTR title )
 {
@@ -1599,7 +1599,7 @@ HWND WINAPI FindWindowA( LPCSTR className, LPCSTR title )
 
 
 /***********************************************************************
- *           FindWindowExA   (USER32.199)
+ *		FindWindowExA (USER32.@)
  */
 HWND WINAPI FindWindowExA( HWND parent, HWND child,
                                LPCSTR className, LPCSTR title )
@@ -1627,7 +1627,7 @@ HWND WINAPI FindWindowExA( HWND parent, HWND child,
 
 
 /***********************************************************************
- *           FindWindowExW   (USER32.200)
+ *		FindWindowExW (USER32.@)
  */
 HWND WINAPI FindWindowExW( HWND parent, HWND child,
                                LPCWSTR className, LPCWSTR title )
@@ -1649,7 +1649,7 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child,
 
 
 /***********************************************************************
- *           FindWindowW   (USER32.201)
+ *		FindWindowW (USER32.@)
  */
 HWND WINAPI FindWindowW( LPCWSTR className, LPCWSTR title )
 {
@@ -1676,7 +1676,7 @@ void WIN_ReleaseDesktop(void)
 
 
 /**********************************************************************
- *           GetDesktopWindow16   (USER.286)
+ *		GetDesktopWindow (USER.286)
  */
 HWND16 WINAPI GetDesktopWindow16(void)
 {
@@ -1685,7 +1685,7 @@ HWND16 WINAPI GetDesktopWindow16(void)
 
 
 /**********************************************************************
- *           GetDesktopWindow   (USER32.232)
+ *		GetDesktopWindow (USER32.@)
  */
 HWND WINAPI GetDesktopWindow(void)
 {
@@ -1697,7 +1697,7 @@ HWND WINAPI GetDesktopWindow(void)
 
 
 /**********************************************************************
- *           GetDesktopHwnd   (USER.278)
+ *		GetDesktopHwnd (USER.278)
  *
  * Exactly the same thing as GetDesktopWindow(), but not documented.
  * Don't ask me why...
@@ -1709,7 +1709,7 @@ HWND16 WINAPI GetDesktopHwnd16(void)
 
 
 /*******************************************************************
- *           EnableWindow16   (USER.34)
+ *		EnableWindow (USER.34)
  */
 BOOL16 WINAPI EnableWindow16( HWND16 hwnd, BOOL16 enable )
 {
@@ -1718,7 +1718,7 @@ BOOL16 WINAPI EnableWindow16( HWND16 hwnd, BOOL16 enable )
 
 
 /*******************************************************************
- *           EnableWindow   (USER32.172)
+ *		EnableWindow (USER32.@)
  */
 BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable )
 {
@@ -1770,7 +1770,7 @@ end:
 
 
 /***********************************************************************
- *           IsWindowEnabled16   (USER.35)
+ *		IsWindowEnabled (USER.35)
  */ 
 BOOL16 WINAPI IsWindowEnabled16(HWND16 hWnd)
 {
@@ -1779,7 +1779,7 @@ BOOL16 WINAPI IsWindowEnabled16(HWND16 hWnd)
 
 
 /***********************************************************************
- *           IsWindowEnabled   (USER32.349)
+ *		IsWindowEnabled (USER32.@)
  */ 
 BOOL WINAPI IsWindowEnabled(HWND hWnd)
 {
@@ -1795,7 +1795,7 @@ BOOL WINAPI IsWindowEnabled(HWND hWnd)
 
 
 /***********************************************************************
- *           IsWindowUnicode   (USER32.350)
+ *		IsWindowUnicode (USER32.@)
  */
 BOOL WINAPI IsWindowUnicode( HWND hwnd )
 {
@@ -1810,7 +1810,7 @@ BOOL WINAPI IsWindowUnicode( HWND hwnd )
 
 
 /**********************************************************************
- *	     GetWindowWord16    (USER.133)
+ *		GetWindowWord (USER.133)
  */
 WORD WINAPI GetWindowWord16( HWND16 hwnd, INT16 offset )
 {
@@ -1819,7 +1819,7 @@ WORD WINAPI GetWindowWord16( HWND16 hwnd, INT16 offset )
 
 
 /**********************************************************************
- *	     GetWindowWord    (USER32.314)
+ *		GetWindowWord (USER32.@)
  */
 WORD WINAPI GetWindowWord( HWND hwnd, INT offset )
 {
@@ -1865,7 +1865,7 @@ end:
 }
 
 /**********************************************************************
- *	     SetWindowWord16    (USER.134)
+ *		SetWindowWord (USER.134)
  */
 WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval )
 {
@@ -1874,7 +1874,7 @@ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval )
 
 
 /**********************************************************************
- *	     SetWindowWord    (USER32.524)
+ *		SetWindowWord (USER32.@)
  */
 WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval )
 {
@@ -2071,7 +2071,7 @@ end:
 
 
 /**********************************************************************
- *	     GetWindowLong16    (USER.135)
+ *		GetWindowLong (USER.135)
  */
 LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset )
 {
@@ -2080,7 +2080,7 @@ LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset )
 
 
 /**********************************************************************
- *	     GetWindowLongA    (USER32.305)
+ *		GetWindowLongA (USER32.@)
  */
 LONG WINAPI GetWindowLongA( HWND hwnd, INT offset )
 {
@@ -2089,7 +2089,7 @@ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset )
 
 
 /**********************************************************************
- *	     GetWindowLongW    (USER32.306)
+ *		GetWindowLongW (USER32.@)
  */
 LONG WINAPI GetWindowLongW( HWND hwnd, INT offset )
 {
@@ -2098,7 +2098,7 @@ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset )
 
 
 /**********************************************************************
- *	     SetWindowLong16    (USER.136)
+ *		SetWindowLong (USER.136)
  */
 LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval )
 {
@@ -2107,7 +2107,7 @@ LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval )
 
 
 /**********************************************************************
- *	     SetWindowLongA    (USER32.517)
+ *		SetWindowLongA (USER32.@)
  */
 LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval )
 {
@@ -2116,7 +2116,7 @@ LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval )
 
 
 /**********************************************************************
- *	     SetWindowLongW    (USER32.518) Set window attribute
+ *		SetWindowLongW (USER32.@) Set window attribute
  *
  * SetWindowLong() alters one of a window's attributes or sets a 32-bit (long)
  * value in a window's extra memory. 
@@ -2200,7 +2200,7 @@ LONG WINAPI SetWindowLongW(
 
 
 /*******************************************************************
- *	     GetWindowText16    (USER.36)
+ *		GetWindowText (USER.36)
  */
 INT16 WINAPI GetWindowText16( HWND16 hwnd, SEGPTR lpString, INT16 nMaxCount )
 {
@@ -2209,7 +2209,7 @@ INT16 WINAPI GetWindowText16( HWND16 hwnd, SEGPTR lpString, INT16 nMaxCount )
 
 
 /*******************************************************************
- *	     GetWindowTextA    (USER32.309)
+ *		GetWindowTextA (USER32.@)
  */
 INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount )
 {
@@ -2218,7 +2218,7 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount )
 }
 
 /*******************************************************************
- *	     InternalGetWindowText    (USER32.326)
+ *		InternalGetWindowText (USER32.@)
  */
 INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount )
 {
@@ -2228,7 +2228,7 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount )
 
 
 /*******************************************************************
- *	     GetWindowTextW    (USER32.312)
+ *		GetWindowTextW (USER32.@)
  */
 INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount )
 {
@@ -2238,7 +2238,7 @@ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount )
 
 
 /*******************************************************************
- *	     SetWindowText16    (USER.37)
+ *		SetWindowText (USER.37)
  */
 BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString )
 {
@@ -2247,7 +2247,7 @@ BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString )
 
 
 /*******************************************************************
- *	     SetWindowTextA    (USER32.521)
+ *		SetWindowTextA (USER32.@)
  */
 BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString )
 {
@@ -2256,7 +2256,7 @@ BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString )
 
 
 /*******************************************************************
- *	     SetWindowTextW    (USER32.523)
+ *		SetWindowTextW (USER32.@)
  */
 BOOL WINAPI SetWindowTextW( HWND hwnd, LPCWSTR lpString )
 {
@@ -2265,7 +2265,7 @@ BOOL WINAPI SetWindowTextW( HWND hwnd, LPCWSTR lpString )
 
 
 /*******************************************************************
- *         GetWindowTextLength16    (USER.38)
+ *		GetWindowTextLength (USER.38)
  */
 INT16 WINAPI GetWindowTextLength16( HWND16 hwnd )
 {
@@ -2274,7 +2274,7 @@ INT16 WINAPI GetWindowTextLength16( HWND16 hwnd )
 
 
 /*******************************************************************
- *         GetWindowTextLengthA   (USER32.310)
+ *		GetWindowTextLengthA (USER32.@)
  */
 INT WINAPI GetWindowTextLengthA( HWND hwnd )
 {
@@ -2282,7 +2282,7 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd )
 }
 
 /*******************************************************************
- *         GetWindowTextLengthW   (USER32.311)
+ *		GetWindowTextLengthW (USER32.@)
  */
 INT WINAPI GetWindowTextLengthW( HWND hwnd )
 {
@@ -2291,7 +2291,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd )
 
 
 /*******************************************************************
- *         IsWindow16   (USER.47)
+ *		IsWindow (USER.47)
  */
 BOOL16 WINAPI IsWindow16( HWND16 hwnd )
 {
@@ -2301,7 +2301,7 @@ BOOL16 WINAPI IsWindow16( HWND16 hwnd )
 
 
 /*******************************************************************
- *         IsWindow   (USER32.348)
+ *		IsWindow (USER32.@)
  */
 BOOL WINAPI IsWindow( HWND hwnd )
 {
@@ -2317,7 +2317,7 @@ BOOL WINAPI IsWindow( HWND hwnd )
 
 
 /*****************************************************************
- *         GetParent16   (USER.46)
+ *		GetParent (USER.46)
  */
 HWND16 WINAPI GetParent16( HWND16 hwnd )
 {
@@ -2326,7 +2326,7 @@ HWND16 WINAPI GetParent16( HWND16 hwnd )
 
 
 /*****************************************************************
- *         GetParent   (USER32.278)
+ *		GetParent (USER32.@)
  */
 HWND WINAPI GetParent( HWND hwnd )
 {
@@ -2383,7 +2383,7 @@ HWND WIN_GetTopParent( HWND hwnd )
 
 
 /*****************************************************************
- *         SetParent16   (USER.233)
+ *		SetParent (USER.233)
  */
 HWND16 WINAPI SetParent16( HWND16 hwndChild, HWND16 hwndNewParent )
 {
@@ -2392,7 +2392,7 @@ HWND16 WINAPI SetParent16( HWND16 hwndChild, HWND16 hwndNewParent )
 
 
 /*****************************************************************
- *         SetParent   (USER32.495)
+ *		SetParent (USER32.@)
  */
 HWND WINAPI SetParent( HWND hwndChild, HWND hwndNewParent )
 {
@@ -2437,7 +2437,7 @@ HWND WINAPI SetParent( HWND hwndChild, HWND hwndNewParent )
 }
 
 /*******************************************************************
- *         IsChild16    (USER.48)
+ *		IsChild (USER.48)
  */
 BOOL16 WINAPI IsChild16( HWND16 parent, HWND16 child )
 {
@@ -2446,7 +2446,7 @@ BOOL16 WINAPI IsChild16( HWND16 parent, HWND16 child )
 
 
 /*******************************************************************
- *         IsChild    (USER32.339)
+ *		IsChild (USER32.@)
  */
 BOOL WINAPI IsChild( HWND parent, HWND child )
 {
@@ -2466,7 +2466,7 @@ BOOL WINAPI IsChild( HWND parent, HWND child )
 
 
 /***********************************************************************
- *           IsWindowVisible16   (USER.49)
+ *		IsWindowVisible (USER.49)
  */
 BOOL16 WINAPI IsWindowVisible16( HWND16 hwnd )
 {
@@ -2475,7 +2475,7 @@ BOOL16 WINAPI IsWindowVisible16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           IsWindowVisible   (USER32.351)
+ *		IsWindowVisible (USER32.@)
  */
 BOOL WINAPI IsWindowVisible( HWND hwnd )
 {
@@ -2517,7 +2517,7 @@ BOOL WIN_IsWindowDrawable( WND* wnd, BOOL icon )
 
 
 /*******************************************************************
- *         GetTopWindow16    (USER.229)
+ *		GetTopWindow (USER.229)
  */
 HWND16 WINAPI GetTopWindow16( HWND16 hwnd )
 {
@@ -2526,7 +2526,7 @@ HWND16 WINAPI GetTopWindow16( HWND16 hwnd )
 
 
 /*******************************************************************
- *         GetTopWindow    (USER.229)
+ *		GetTopWindow (USER32.@)
  */
 HWND WINAPI GetTopWindow( HWND hwnd )
 {
@@ -2543,7 +2543,7 @@ HWND WINAPI GetTopWindow( HWND hwnd )
 
 
 /*******************************************************************
- *         GetWindow16    (USER.262)
+ *		GetWindow (USER.262)
  */
 HWND16 WINAPI GetWindow16( HWND16 hwnd, WORD rel )
 {
@@ -2552,7 +2552,7 @@ HWND16 WINAPI GetWindow16( HWND16 hwnd, WORD rel )
 
 
 /*******************************************************************
- *         GetWindow    (USER32.302)
+ *		GetWindow (USER32.@)
  */
 HWND WINAPI GetWindow( HWND hwnd, WORD rel )
 {
@@ -2623,7 +2623,7 @@ end:
 
 
 /*******************************************************************
- *         GetNextWindow16    (USER.230)
+ *		GetNextWindow (USER.230)
  */
 HWND16 WINAPI GetNextWindow16( HWND16 hwnd, WORD flag )
 {
@@ -2692,7 +2692,7 @@ BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly )
 }
 
 /*******************************************************************
- *         ShowOwnedPopups16  (USER.265)
+ *		ShowOwnedPopups (USER.265)
  */
 void WINAPI ShowOwnedPopups16( HWND16 owner, BOOL16 fShow )
 {
@@ -2701,7 +2701,7 @@ void WINAPI ShowOwnedPopups16( HWND16 owner, BOOL16 fShow )
 
 
 /*******************************************************************
- *         ShowOwnedPopups  (USER32.531)
+ *		ShowOwnedPopups (USER32.@)
  */
 BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow )
 {
@@ -2749,7 +2749,7 @@ BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow )
 
 
 /*******************************************************************
- *         GetLastActivePopup16   (USER.287)
+ *		GetLastActivePopup (USER.287)
  */
 HWND16 WINAPI GetLastActivePopup16( HWND16 hwnd )
 {
@@ -2757,7 +2757,7 @@ HWND16 WINAPI GetLastActivePopup16( HWND16 hwnd )
 }
 
 /*******************************************************************
- *         GetLastActivePopup   (USER32.256)
+ *		GetLastActivePopup (USER32.@)
  */
 HWND WINAPI GetLastActivePopup( HWND hwnd )
 {
@@ -2842,7 +2842,7 @@ void WIN_ReleaseWinArray(WND **wndArray)
 }
 
 /*******************************************************************
- *           EnumWindows   (USER32.193)
+ *		EnumWindows (USER32.@)
  */
 BOOL WINAPI EnumWindows( WNDENUMPROC lpEnumFunc, LPARAM lParam )
 {
@@ -2883,7 +2883,7 @@ BOOL WINAPI EnumWindows( WNDENUMPROC lpEnumFunc, LPARAM lParam )
 
 
 /**********************************************************************
- *           EnumTaskWindows16   (USER.225)
+ *		EnumTaskWindows (USER.225)
  */
 BOOL16 WINAPI EnumTaskWindows16( HTASK16 hTask, WNDENUMPROC16 func,
                                  LPARAM lParam )
@@ -2925,7 +2925,7 @@ BOOL16 WINAPI EnumTaskWindows16( HTASK16 hTask, WNDENUMPROC16 func,
 
 
 /**********************************************************************
- *           EnumThreadWindows   (USER32.190)
+ *		EnumThreadWindows (USER32.@)
  */
 BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam )
 {
@@ -2973,7 +2973,7 @@ static BOOL16 WIN_EnumChildWindows( WND **ppWnd, WNDENUMPROC func, LPARAM lParam
 
 
 /**********************************************************************
- *           EnumChildWindows   (USER32.178)
+ *		EnumChildWindows (USER32.@)
  */
 BOOL WINAPI EnumChildWindows( HWND parent, WNDENUMPROC func,
                                   LPARAM lParam )
@@ -2994,7 +2994,7 @@ BOOL WINAPI EnumChildWindows( HWND parent, WNDENUMPROC func,
 
 
 /*******************************************************************
- *           AnyPopup16   (USER.52)
+ *		AnyPopup (USER.52)
  */
 BOOL16 WINAPI AnyPopup16(void)
 {
@@ -3003,7 +3003,7 @@ BOOL16 WINAPI AnyPopup16(void)
 
 
 /*******************************************************************
- *           AnyPopup   (USER32.4)
+ *		AnyPopup (USER32.@)
  */
 BOOL WINAPI AnyPopup(void)
 {
@@ -3027,7 +3027,7 @@ end:
 
 
 /*******************************************************************
- *            FlashWindow16   (USER.105)
+ *		FlashWindow (USER.105)
  */
 BOOL16 WINAPI FlashWindow16( HWND16 hWnd, BOOL16 bInvert )
 {
@@ -3036,7 +3036,7 @@ BOOL16 WINAPI FlashWindow16( HWND16 hWnd, BOOL16 bInvert )
 
 
 /*******************************************************************
- *            FlashWindow   (USER32.202)
+ *		FlashWindow (USER32.@)
  */
 BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
 {
@@ -3081,7 +3081,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
 
 
 /*******************************************************************
- *           SetSysModalWindow16   (USER.188)
+ *		SetSysModalWindow (USER.188)
  */
 HWND16 WINAPI SetSysModalWindow16( HWND16 hWnd )
 {
@@ -3093,7 +3093,7 @@ HWND16 WINAPI SetSysModalWindow16( HWND16 hWnd )
 
 
 /*******************************************************************
- *           GetSysModalWindow16   (USER.52)
+ *		GetSysModalWindow (USER.189)
  */
 HWND16 WINAPI GetSysModalWindow16(void)
 {
@@ -3102,7 +3102,7 @@ HWND16 WINAPI GetSysModalWindow16(void)
 
 
 /*******************************************************************
- *           GetWindowContextHelpId   (USER32.303)
+ *		GetWindowContextHelpId (USER32.@)
  */
 DWORD WINAPI GetWindowContextHelpId( HWND hwnd )
 {
@@ -3116,7 +3116,7 @@ DWORD WINAPI GetWindowContextHelpId( HWND hwnd )
 
 
 /*******************************************************************
- *           SetWindowContextHelpId   (USER32.515)
+ *		SetWindowContextHelpId (USER32.@)
  */
 BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id )
 {
@@ -3209,7 +3209,7 @@ end:
 
 
 /*******************************************************************
- *             DragDetect   (USER.465)
+ *		DragDetect (USER.465)
  */
 BOOL16 WINAPI DragDetect16( HWND16 hWnd, POINT16 pt )
 {
@@ -3219,7 +3219,7 @@ BOOL16 WINAPI DragDetect16( HWND16 hWnd, POINT16 pt )
 }
 
 /*******************************************************************
- *             DragDetect   (USER32.151)
+ *		DragDetect (USER32.@)
  */
 BOOL WINAPI DragDetect( HWND hWnd, POINT pt )
 {
@@ -3261,7 +3261,7 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt )
 }
 
 /******************************************************************************
- *             DragObject16   (USER.464)
+ *		DragObject (USER.464)
  */
 DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
                            HANDLE16 hOfStruct, WORD szList, HCURSOR16 hCursor )
diff --git a/windows/winhelp.c b/windows/winhelp.c
index e445c227614..012d4fd1c44 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -28,7 +28,7 @@ typedef struct
 } WINHELP,*LPWINHELP;
 
 /**********************************************************************
- *             WinHelp16   (USER.171)
+ *		WinHelp (USER.171)
  */
 BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
                          DWORD dwData )
@@ -55,7 +55,7 @@ BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
 
 
 /**********************************************************************
- *             WinHelpA   (USER32.579)
+ *		WinHelpA (USER32.@)
  */
 BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
                           DWORD dwData )
@@ -141,7 +141,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
 
 
 /**********************************************************************
- *             WinHelpW   (USER32.580)
+ *		WinHelpW (USER32.@)
  */
 BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command,
                           DWORD dwData )
diff --git a/windows/winpos.c b/windows/winpos.c
index 6a3f231b422..5cc02b78c0d 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -170,14 +170,14 @@ static POINT16 WINPOS_FindIconPos( WND* wndPtr, POINT16 pt )
 
 
 /***********************************************************************
- *           ArrangeIconicWindows16   (USER.170)
+ *		ArrangeIconicWindows (USER.170)
  */
 UINT16 WINAPI ArrangeIconicWindows16( HWND16 parent) 
 {
     return ArrangeIconicWindows(parent);
 }
 /***********************************************************************
- *           ArrangeIconicWindows   (USER32.7)
+ *		ArrangeIconicWindows (USER32.@)
  */
 UINT WINAPI ArrangeIconicWindows( HWND parent )
 {
@@ -221,7 +221,7 @@ UINT WINAPI ArrangeIconicWindows( HWND parent )
 
 
 /***********************************************************************
- *             SwitchToThisWindow16   (USER.172)
+ *		SwitchToThisWindow (USER.172)
  */
 void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore )
 {
@@ -230,7 +230,7 @@ void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore )
 
 
 /***********************************************************************
- *             SwitchToThisWindow   (USER32.539)
+ *		SwitchToThisWindow (USER32.@)
  */
 void WINAPI SwitchToThisWindow( HWND hwnd, BOOL restore )
 {
@@ -239,7 +239,7 @@ void WINAPI SwitchToThisWindow( HWND hwnd, BOOL restore )
 
 
 /***********************************************************************
- *           GetWindowRect16   (USER.32)
+ *		GetWindowRect (USER.32)
  */
 void WINAPI GetWindowRect16( HWND16 hwnd, LPRECT16 rect ) 
 {
@@ -254,7 +254,7 @@ void WINAPI GetWindowRect16( HWND16 hwnd, LPRECT16 rect )
 
 
 /***********************************************************************
- *           GetWindowRect   (USER32.308)
+ *		GetWindowRect (USER32.@)
  */
 BOOL WINAPI GetWindowRect( HWND hwnd, LPRECT rect ) 
 {
@@ -270,7 +270,7 @@ BOOL WINAPI GetWindowRect( HWND hwnd, LPRECT rect )
 
 
 /***********************************************************************
- *           GetWindowRgn   (USER32)
+ *		GetWindowRgn (USER32.@)
  */
 int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn )
 {
@@ -285,7 +285,7 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn )
 }
 
 /***********************************************************************
- *           SetWindowRgn   (USER32)
+ *		SetWindowRgn (USER32.@)
  */
 int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw )
 {
@@ -354,7 +354,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw )
 }
 
 /***********************************************************************
- *           SetWindowRgn16 
+ *		SetWindowRgn (USER.668)
  */
 INT16 WINAPI SetWindowRgn16( HWND16 hwnd, HRGN16 hrgn,BOOL16 bRedraw)
 
@@ -366,7 +366,7 @@ INT16 WINAPI SetWindowRgn16( HWND16 hwnd, HRGN16 hrgn,BOOL16 bRedraw)
 
 
 /***********************************************************************
- *           GetClientRect16   (USER.33)
+ *		GetClientRect (USER.33)
  */
 void WINAPI GetClientRect16( HWND16 hwnd, LPRECT16 rect ) 
 {
@@ -383,7 +383,7 @@ void WINAPI GetClientRect16( HWND16 hwnd, LPRECT16 rect )
 
 
 /***********************************************************************
- *           GetClientRect   (USER.220)
+ *		GetClientRect (USER32.@)
  */
 BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) 
 {
@@ -400,7 +400,7 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect )
 
 
 /*******************************************************************
- *         ClientToScreen16   (USER.28)
+ *		ClientToScreen (USER.28)
  */
 void WINAPI ClientToScreen16( HWND16 hwnd, LPPOINT16 lppnt )
 {
@@ -409,7 +409,7 @@ void WINAPI ClientToScreen16( HWND16 hwnd, LPPOINT16 lppnt )
 
 
 /*******************************************************************
- *         ClientToScreen   (USER32.52)
+ *		ClientToScreen (USER32.@)
  */
 BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
 {
@@ -419,7 +419,7 @@ BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt )
 
 
 /*******************************************************************
- *         ScreenToClient16   (USER.29)
+ *		ScreenToClient (USER.29)
  */
 void WINAPI ScreenToClient16( HWND16 hwnd, LPPOINT16 lppnt )
 {
@@ -428,7 +428,7 @@ void WINAPI ScreenToClient16( HWND16 hwnd, LPPOINT16 lppnt )
 
 
 /*******************************************************************
- *         ScreenToClient   (USER32.447)
+ *		ScreenToClient (USER32.@)
  */
 BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt )
 {
@@ -560,7 +560,7 @@ end:
 
 
 /*******************************************************************
- *         WindowFromPoint16   (USER.30)
+ *		WindowFromPoint (USER.30)
  */
 HWND16 WINAPI WindowFromPoint16( POINT16 pt )
 {
@@ -572,7 +572,7 @@ HWND16 WINAPI WindowFromPoint16( POINT16 pt )
 
 
 /*******************************************************************
- *         WindowFromPoint   (USER32.582)
+ *		WindowFromPoint (USER32.@)
  */
 HWND WINAPI WindowFromPoint( POINT pt )
 {
@@ -586,7 +586,7 @@ HWND WINAPI WindowFromPoint( POINT pt )
 
 
 /*******************************************************************
- *         ChildWindowFromPoint16   (USER.191)
+ *		ChildWindowFromPoint (USER.191)
  */
 HWND16 WINAPI ChildWindowFromPoint16( HWND16 hwndParent, POINT16 pt )
 {
@@ -597,7 +597,7 @@ HWND16 WINAPI ChildWindowFromPoint16( HWND16 hwndParent, POINT16 pt )
 
 
 /*******************************************************************
- *         ChildWindowFromPoint   (USER32.49)
+ *		ChildWindowFromPoint (USER32.@)
  */
 HWND WINAPI ChildWindowFromPoint( HWND hwndParent, POINT pt )
 {
@@ -636,7 +636,7 @@ end:
 }
 
 /*******************************************************************
- *         ChildWindowFromPointEx16   (USER.50)
+ *		ChildWindowFromPointEx (USER.399)
  */
 HWND16 WINAPI ChildWindowFromPointEx16( HWND16 hwndParent, POINT16 pt, UINT16 uFlags)
 {
@@ -647,7 +647,7 @@ HWND16 WINAPI ChildWindowFromPointEx16( HWND16 hwndParent, POINT16 pt, UINT16 uF
 
 
 /*******************************************************************
- *         ChildWindowFromPointEx   (USER32.50)
+ *		ChildWindowFromPointEx (USER32.@)
  */
 HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt,
 		UINT uFlags)
@@ -748,7 +748,7 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo,
 
 
 /*******************************************************************
- *         MapWindowPoints16   (USER.258)
+ *		MapWindowPoints (USER.258)
  */
 void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo,
                                LPPOINT16 lppt, UINT16 count )
@@ -766,7 +766,7 @@ void WINAPI MapWindowPoints16( HWND16 hwndFrom, HWND16 hwndTo,
 
 
 /*******************************************************************
- *         MapWindowPoints   (USER32.386)
+ *		MapWindowPoints (USER32.@)
  */
 INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo,
                                LPPOINT lppt, UINT count )
@@ -785,7 +785,7 @@ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo,
 
 
 /***********************************************************************
- *           IsIconic16   (USER.31)
+ *		IsIconic (USER.31)
  */
 BOOL16 WINAPI IsIconic16(HWND16 hWnd)
 {
@@ -794,7 +794,7 @@ BOOL16 WINAPI IsIconic16(HWND16 hWnd)
 
 
 /***********************************************************************
- *           IsIconic   (USER32.345)
+ *		IsIconic (USER32.@)
  */
 BOOL WINAPI IsIconic(HWND hWnd)
 {
@@ -808,7 +808,7 @@ BOOL WINAPI IsIconic(HWND hWnd)
  
  
 /***********************************************************************
- *           IsZoomed   (USER.272)
+ *		IsZoomed (USER.272)
  */
 BOOL16 WINAPI IsZoomed16(HWND16 hWnd)
 {
@@ -817,7 +817,7 @@ BOOL16 WINAPI IsZoomed16(HWND16 hWnd)
 
 
 /***********************************************************************
- *           IsZoomed   (USER.352)
+ *		IsZoomed (USER32.@)
  */
 BOOL WINAPI IsZoomed(HWND hWnd)
 {
@@ -831,7 +831,7 @@ BOOL WINAPI IsZoomed(HWND hWnd)
 
 
 /*******************************************************************
- *         GetActiveWindow    (USER.60)
+ *		GetActiveWindow (USER.60)
  */
 HWND16 WINAPI GetActiveWindow16(void)
 {
@@ -839,7 +839,7 @@ HWND16 WINAPI GetActiveWindow16(void)
 }
 
 /*******************************************************************
- *         GetActiveWindow    (USER32.205)
+ *		GetActiveWindow (USER32.@)
  */
 HWND WINAPI GetActiveWindow(void)
 {
@@ -873,7 +873,7 @@ static BOOL WINPOS_CanActivate(WND* pWnd)
 
 
 /*******************************************************************
- *         SetActiveWindow16    (USER.59)
+ *		SetActiveWindow16 (USER.59)
  */
 HWND16 WINAPI SetActiveWindow16( HWND16 hwnd )
 {
@@ -882,7 +882,7 @@ HWND16 WINAPI SetActiveWindow16( HWND16 hwnd )
 
 
 /*******************************************************************
- *         SetActiveWindow    (USER32.463)
+ *		SetActiveWindow (USER32.@)
  */
 HWND WINAPI SetActiveWindow( HWND hwnd )
 {
@@ -937,7 +937,7 @@ end:
 
 
 /*******************************************************************
- *         GetForegroundWindow16    (USER.608)
+ *		GetForegroundWindow (USER.608)
  */
 HWND16 WINAPI GetForegroundWindow16(void)
 {
@@ -946,7 +946,7 @@ HWND16 WINAPI GetForegroundWindow16(void)
 
 
 /*******************************************************************
- *         SetForegroundWindow16    (USER.609)
+ *		SetForegroundWindow (USER.609)
  */
 BOOL16 WINAPI SetForegroundWindow16( HWND16 hwnd )
 {
@@ -955,7 +955,7 @@ BOOL16 WINAPI SetForegroundWindow16( HWND16 hwnd )
 
 
 /*******************************************************************
- *         GetForegroundWindow    (USER32.241)
+ *		GetForegroundWindow (USER32.@)
  */
 HWND WINAPI GetForegroundWindow(void)
 {
@@ -975,7 +975,7 @@ HWND WINAPI GetForegroundWindow(void)
 }
 
 /*******************************************************************
- *         SetForegroundWindow    (USER32.482)
+ *		SetForegroundWindow (USER32.@)
  */
 BOOL WINAPI SetForegroundWindow( HWND hwnd )
 {
@@ -984,7 +984,7 @@ BOOL WINAPI SetForegroundWindow( HWND hwnd )
 
 
 /*******************************************************************
- *         AllowSetForegroundWindow    (USER32)
+ *		AllowSetForegroundWindow (USER32.@)
  */
 BOOL WINAPI AllowSetForegroundWindow( DWORD procid )
 {
@@ -995,7 +995,7 @@ BOOL WINAPI AllowSetForegroundWindow( DWORD procid )
 
 
 /*******************************************************************
- *         LockSetForegroundWindow    (USER32)
+ *		LockSetForegroundWindow (USER32.@)
  */
 BOOL WINAPI LockSetForegroundWindow( UINT lockcode )
 {
@@ -1006,7 +1006,7 @@ BOOL WINAPI LockSetForegroundWindow( UINT lockcode )
 
 
 /*******************************************************************
- *         GetShellWindow16    (USER.600)
+ *		GetShellWindow (USER.600)
  */
 HWND16 WINAPI GetShellWindow16(void)
 {
@@ -1014,7 +1014,7 @@ HWND16 WINAPI GetShellWindow16(void)
 }
 
 /*******************************************************************
- *         SetShellWindow    (USER32.504)
+ *		SetShellWindow (USER32.@)
  */
 HWND WINAPI SetShellWindow(HWND hwndshell)
 {   WARN("(hWnd=%08x) semi stub\n",hwndshell );
@@ -1025,7 +1025,7 @@ HWND WINAPI SetShellWindow(HWND hwndshell)
 
 
 /*******************************************************************
- *         GetShellWindow    (USER32.287)
+ *		GetShellWindow (USER32.@)
  */
 HWND WINAPI GetShellWindow(void)
 {   WARN("(hWnd=%x) semi stub\n",hGlobalShellWindow );
@@ -1035,7 +1035,7 @@ HWND WINAPI GetShellWindow(void)
 
 
 /***********************************************************************
- *           BringWindowToTop16   (USER.45)
+ *		BringWindowToTop (USER.45)
  */
 BOOL16 WINAPI BringWindowToTop16( HWND16 hwnd )
 {
@@ -1044,7 +1044,7 @@ BOOL16 WINAPI BringWindowToTop16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           BringWindowToTop   (USER32.11)
+ *		BringWindowToTop (USER32.@)
  */
 BOOL WINAPI BringWindowToTop( HWND hwnd )
 {
@@ -1053,7 +1053,7 @@ BOOL WINAPI BringWindowToTop( HWND hwnd )
 
 
 /***********************************************************************
- *           MoveWindow16   (USER.56)
+ *		MoveWindow (USER.56)
  */
 BOOL16 WINAPI MoveWindow16( HWND16 hwnd, INT16 x, INT16 y, INT16 cx, INT16 cy,
                             BOOL16 repaint )
@@ -1063,7 +1063,7 @@ BOOL16 WINAPI MoveWindow16( HWND16 hwnd, INT16 x, INT16 y, INT16 cx, INT16 cy,
 
 
 /***********************************************************************
- *           MoveWindow   (USER32.399)
+ *		MoveWindow (USER32.@)
  */
 BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy,
                             BOOL repaint )
@@ -1337,7 +1337,7 @@ UINT WINPOS_MinMaximize( WND* wndPtr, UINT16 cmd, LPRECT16 lpRect )
 }
 
 /***********************************************************************
- *           ShowWindowAsync   (USER32.535)
+ *		ShowWindowAsync (USER32.@)
  *
  * doesn't wait; returns immediately.
  * used by threads to toggle windows in other (possibly hanging) threads
@@ -1350,7 +1350,7 @@ BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd )
 
 
 /***********************************************************************
- *           ShowWindow16   (USER.42)
+ *		ShowWindow (USER.42)
  */
 BOOL16 WINAPI ShowWindow16( HWND16 hwnd, INT16 cmd ) 
 {    
@@ -1359,7 +1359,7 @@ BOOL16 WINAPI ShowWindow16( HWND16 hwnd, INT16 cmd )
 
 
 /***********************************************************************
- *           ShowWindow   (USER32.534)
+ *		ShowWindow (USER32.@)
  */
 BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) 
 {    
@@ -1499,7 +1499,7 @@ END:
 
 
 /***********************************************************************
- *           GetInternalWindowPos16   (USER.460)
+ *		GetInternalWindowPos (USER.460)
  */
 UINT16 WINAPI GetInternalWindowPos16( HWND16 hwnd, LPRECT16 rectWnd,
                                       LPPOINT16 ptIcon )
@@ -1516,7 +1516,7 @@ UINT16 WINAPI GetInternalWindowPos16( HWND16 hwnd, LPRECT16 rectWnd,
 
 
 /***********************************************************************
- *           GetInternalWindowPos   (USER32.245)
+ *		GetInternalWindowPos (USER32.@)
  */
 UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd,
                                       LPPOINT ptIcon )
@@ -1532,7 +1532,7 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd,
 }
 
 /***********************************************************************
- *           GetWindowPlacement16   (USER.370)
+ *		GetWindowPlacement (USER.370)
  */
 BOOL16 WINAPI GetWindowPlacement16( HWND16 hwnd, WINDOWPLACEMENT16 *wndpl )
 {
@@ -1563,7 +1563,7 @@ BOOL16 WINAPI GetWindowPlacement16( HWND16 hwnd, WINDOWPLACEMENT16 *wndpl )
 
 
 /***********************************************************************
- *           GetWindowPlacement   (USER32.307)
+ *		GetWindowPlacement (USER32.@)
  *
  * Win95:
  * Fails if wndpl->length of Win95 (!) apps is invalid.
@@ -1640,7 +1640,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT16 *wndpl,
 
 
 /***********************************************************************
- *           SetWindowPlacement16   (USER.371)
+ *		SetWindowPlacement (USER.371)
  */
 BOOL16 WINAPI SetWindowPlacement16(HWND16 hwnd, const WINDOWPLACEMENT16 *wndpl)
 {
@@ -1649,7 +1649,7 @@ BOOL16 WINAPI SetWindowPlacement16(HWND16 hwnd, const WINDOWPLACEMENT16 *wndpl)
 }
 
 /***********************************************************************
- *           SetWindowPlacement   (USER32.519)
+ *		SetWindowPlacement (USER32.@)
  *
  * Win95:
  * Fails if wndpl->length of Win95 (!) apps is invalid.
@@ -1679,7 +1679,7 @@ BOOL WINAPI SetWindowPlacement( HWND hwnd, const WINDOWPLACEMENT *pwpl32 )
 
 
 /***********************************************************************
- *           SetInternalWindowPos16   (USER.461)
+ *		SetInternalWindowPos (USER.461)
  */
 void WINAPI SetInternalWindowPos16( HWND16 hwnd, UINT16 showCmd,
                                     LPRECT16 rect, LPPOINT16 pt )
@@ -1710,7 +1710,7 @@ void WINAPI SetInternalWindowPos16( HWND16 hwnd, UINT16 showCmd,
 
 
 /***********************************************************************
- *           SetInternalWindowPos   (USER32.483)
+ *		SetInternalWindowPos (USER32.@)
  */
 void WINAPI SetInternalWindowPos( HWND hwnd, UINT showCmd,
                                     LPRECT rect, LPPOINT pt )
@@ -2576,7 +2576,7 @@ static UINT SWP_DoNCCalcSize( WND* wndPtr, WINDOWPOS* pWinpos,
 }
 
 /***********************************************************************
- *           SetWindowPos   (USER.2)
+ *		SetWindowPos (USER.232)
  */
 BOOL16 WINAPI SetWindowPos16( HWND16 hwnd, HWND16 hwndInsertAfter,
                               INT16 x, INT16 y, INT16 cx, INT16 cy, WORD flags)
@@ -2585,7 +2585,7 @@ BOOL16 WINAPI SetWindowPos16( HWND16 hwnd, HWND16 hwndInsertAfter,
 }
 
 /***********************************************************************
- *           SetWindowPos   (USER32.520)
+ *		SetWindowPos (USER32.@)
  */
 BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter,
                           INT x, INT y, INT cx, INT cy, UINT flags )
@@ -3008,7 +3008,7 @@ END:
 
 					
 /***********************************************************************
- *           BeginDeferWindowPos16   (USER.259)
+ *		BeginDeferWindowPos (USER.259)
  */
 HDWP16 WINAPI BeginDeferWindowPos16( INT16 count )
 {
@@ -3017,7 +3017,7 @@ HDWP16 WINAPI BeginDeferWindowPos16( INT16 count )
 
 
 /***********************************************************************
- *           BeginDeferWindowPos   (USER32.9)
+ *		BeginDeferWindowPos (USER32.@)
  */
 HDWP WINAPI BeginDeferWindowPos( INT count )
 {
@@ -3045,7 +3045,7 @@ HDWP WINAPI BeginDeferWindowPos( INT count )
 
 
 /***********************************************************************
- *           DeferWindowPos16   (USER.260)
+ *		DeferWindowPos (USER.260)
  */
 HDWP16 WINAPI DeferWindowPos16( HDWP16 hdwp, HWND16 hwnd, HWND16 hwndAfter,
                                 INT16 x, INT16 y, INT16 cx, INT16 cy,
@@ -3057,7 +3057,7 @@ HDWP16 WINAPI DeferWindowPos16( HDWP16 hdwp, HWND16 hwnd, HWND16 hwndAfter,
 
 
 /***********************************************************************
- *           DeferWindowPos   (USER32.128)
+ *		DeferWindowPos (USER32.@)
  */
 HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter,
                                 INT x, INT y, INT cx, INT cy,
@@ -3151,7 +3151,7 @@ END:
 
 
 /***********************************************************************
- *           EndDeferWindowPos16   (USER.261)
+ *		EndDeferWindowPos (USER.261)
  */
 BOOL16 WINAPI EndDeferWindowPos16( HDWP16 hdwp )
 {
@@ -3160,7 +3160,7 @@ BOOL16 WINAPI EndDeferWindowPos16( HDWP16 hdwp )
 
 
 /***********************************************************************
- *           EndDeferWindowPos   (USER32.173)
+ *		EndDeferWindowPos (USER32.@)
  */
 BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
 {
@@ -3183,7 +3183,7 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
 
 
 /***********************************************************************
- *           TileChildWindows   (USER.199)
+ *		TileChildWindows (USER.199)
  */
 void WINAPI TileChildWindows16( HWND16 parent, WORD action )
 {
@@ -3191,7 +3191,7 @@ void WINAPI TileChildWindows16( HWND16 parent, WORD action )
 }
 
 /***********************************************************************
- *           CascadeChildWindows   (USER.198)
+ *		CascadeChildWindows (USER.198)
  */
 void WINAPI CascadeChildWindows16( HWND16 parent, WORD action )
 {
@@ -3199,7 +3199,7 @@ void WINAPI CascadeChildWindows16( HWND16 parent, WORD action )
 }
 
 /***********************************************************************
- *           SetProgmanWindow			[USER32.522]
+ *		SetProgmanWindow (USER32.@)
  */
 HRESULT WINAPI SetProgmanWindow ( HWND hwnd )
 {
@@ -3208,7 +3208,7 @@ HRESULT WINAPI SetProgmanWindow ( HWND hwnd )
 }
 
 /***********************************************************************
- *           GetProgmanWindow			[USER32.289]
+ *		GetProgmanWindow (USER32.@)
  */
 HRESULT WINAPI GetProgmanWindow ( )
 {
@@ -3216,7 +3216,7 @@ HRESULT WINAPI GetProgmanWindow ( )
 }
 
 /***********************************************************************
- *           SetShellWindowEx			[USER32.531]
+ *		SetShellWindowEx (USER32.@)
  * hwndProgman =  Progman[Program Manager]
  *                |-> SHELLDLL_DefView
  * hwndListView = |   |-> SysListView32
@@ -3235,7 +3235,7 @@ HRESULT WINAPI SetShellWindowEx ( HWND hwndProgman, HWND hwndListView )
 }
 
 /***********************************************************************
- *           SetTaskmanWindow			[USER32.537]
+ *		SetTaskmanWindow (USER32.@)
  * NOTES
  *   hwnd = MSTaskSwWClass 
  *          |-> SysTabControl32
@@ -3247,7 +3247,7 @@ HRESULT WINAPI SetTaskmanWindow ( HWND hwnd )
 }
 
 /***********************************************************************
- *           GetTaskmanWindow			[USER32.304]
+ *		GetTaskmanWindow (USER32.@)
  */
 HRESULT WINAPI GetTaskmanWindow ( )
 {	
diff --git a/windows/winproc.c b/windows/winproc.c
index 2826eed6aab..43c524d73c7 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -2491,7 +2491,8 @@ static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
 
 
 /**********************************************************************
- *	     CallWindowProc16    (USER.122)
+ *		CallWindowProc (USER.122)
+ *		CallWindowProc16 (USER32.@)
  */
 LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
                                  WPARAM16 wParam, LPARAM lParam )
@@ -2528,7 +2529,7 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
 
 
 /**********************************************************************
- *	     CallWindowProcA    (USER32.18) 
+ *		CallWindowProcA (USER32.@)
  *
  * The CallWindowProc() function invokes the windows procedure _func_,
  * with _hwnd_ as the target window, the message specified by _msg_, and
@@ -2589,7 +2590,7 @@ LRESULT WINAPI CallWindowProcA(
 
 
 /**********************************************************************
- *	     CallWindowProcW    (USER32.19)
+ *		CallWindowProcW (USER32.@)
  */
 LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg,
                                   WPARAM wParam, LPARAM lParam )
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index 2ce203f6648..17b8b2c92de 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -777,7 +777,7 @@ void X11DRV_CLIPBOARD_ReleaseSelection(Atom selType, Window w, HWND hwnd)
 }
 
 /**************************************************************************
- *		X11DRV_ReleaseClipboard
+ *		X11DRV_ReleaseClipboard (X11DRV.@)
  *  Voluntarily release all currently owned X selections
  */
 void X11DRV_ReleaseClipboard(void)
@@ -829,7 +829,7 @@ void X11DRV_ReleaseClipboard(void)
 }
 
 /**************************************************************************
- *		X11DRV_AcquireClipboard
+ *		X11DRV_AcquireClipboard (X11DRV.@)
  */
 void X11DRV_AcquireClipboard(void)
 {
@@ -879,7 +879,7 @@ void X11DRV_AcquireClipboard(void)
 }
 
 /**************************************************************************
- *		X11DRV_IsClipboardFormatAvailable
+ *		X11DRV_IsClipboardFormatAvailable (X11DRV.@)
  *
  * Checks if the specified format is available in the current selection
  * Only invoked when WINE is not the selection owner
@@ -932,7 +932,7 @@ BOOL X11DRV_IsClipboardFormatAvailable(UINT wFormat)
 }
 
 /**************************************************************************
- *		X11DRV_RegisterClipboardFormat
+ *		X11DRV_RegisterClipboardFormat (X11DRV.@)
  *
  * Registers a custom X clipboard format
  * Returns: TRUE - success,  FALSE - failure
@@ -958,7 +958,7 @@ BOOL X11DRV_RegisterClipboardFormat( LPCSTR FormatName )
 }
 
 /**************************************************************************
- *		X11DRV_IsSelectionOwner
+ *		X11DRV_IsSelectionOwner (X11DRV.@)
  *
  * Returns: TRUE - We(WINE) own the selection, FALSE - Selection not owned by us
  */
@@ -968,7 +968,7 @@ BOOL X11DRV_IsSelectionOwner(void)
 }
 
 /**************************************************************************
- *		X11DRV_SetClipboardData
+ *		X11DRV_SetClipboardData (X11DRV.@)
  *
  * We don't need to do anything special here since the clipboard code
  * maintains the cache. 
@@ -981,7 +981,7 @@ void X11DRV_SetClipboardData(UINT wFormat)
 }
 
 /**************************************************************************
- *		X11DRV_GetClipboardData
+ *		X11DRV_GetClipboardData (X11DRV.@)
  *
  * This method is invoked only when we DO NOT own the X selection
  *
@@ -1060,7 +1060,7 @@ BOOL X11DRV_GetClipboardData(UINT wFormat)
 }
 
 /**************************************************************************
- *		X11DRV_ResetSelectionOwner
+ *		X11DRV_ResetSelectionOwner (X11DRV.@)
  *
  * Called from DestroyWindow() to prevent X selection from being lost when
  * a top level window is destroyed, by switching ownership to another top
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index 9912bbdc27a..b1c3760c87d 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -203,7 +203,7 @@ static void CALLBACK EVENT_ProcessAllEvents( ULONG_PTR arg )
 }
 
 /***********************************************************************
- *           X11DRV_Synchronize
+ *		X11DRV_Synchronize (X11DRV.@)
  *
  * Synchronize with the X server. Should not be used too often.
  */
@@ -214,7 +214,7 @@ void X11DRV_Synchronize( void )
 }
 
 /***********************************************************************
- *           X11DRV_UserRepaintDisable
+ *		X11DRV_UserRepaintDisable (X11DRV.@)
  */
 void X11DRV_UserRepaintDisable( BOOL bDisabled )
 {
@@ -866,7 +866,7 @@ static void EVENT_FocusOut( HWND hWnd, XFocusChangeEvent *event )
 }
 
 /**********************************************************************
- *              X11DRV_CheckFocus
+ *		X11DRV_CheckFocus (X11DRV.@)
  */
 BOOL X11DRV_CheckFocus(void)
 {
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index 8e66ac8f869..aa805093727 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -904,7 +904,7 @@ X11DRV_KEYBOARD_DetectLayout (void)
 }
 
 /**********************************************************************
- *		X11DRV_InitKeyboard
+ *		X11DRV_InitKeyboard (X11DRV.@)
  */
 void X11DRV_InitKeyboard(void)
 {
@@ -1120,7 +1120,7 @@ void X11DRV_InitKeyboard(void)
 }
 
 /***********************************************************************
- *		X11DRV_VkKeyScan
+ *		X11DRV_VkKeyScan (X11DRV.@)
  */
 WORD X11DRV_VkKeyScan(CHAR cChar)
 {
@@ -1168,7 +1168,7 @@ WORD X11DRV_VkKeyScan(CHAR cChar)
 }
 
 /***********************************************************************
- *		X11DRV_MapVirtualKey
+ *		X11DRV_MapVirtualKey (X11DRV.@)
  */
 UINT16 X11DRV_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
 {
@@ -1252,7 +1252,7 @@ UINT16 X11DRV_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
 }
 
 /***********************************************************************
- *		X11DRV_GetKeyNameText
+ *		X11DRV_GetKeyNameText (X11DRV.@)
  */
 INT16 X11DRV_GetKeyNameText(LONG lParam, LPSTR lpBuffer, INT16 nSize)
 {
@@ -1424,7 +1424,7 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym)
 }
 
 /***********************************************************************
- *		X11DRV_ToUnicode
+ *		X11DRV_ToUnicode (X11DRV.@)
  *
  * The ToUnicode function translates the specified virtual-key code and keyboard
  * state to the corresponding Windows character or characters.
@@ -1584,7 +1584,7 @@ INT X11DRV_ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 }
 
 /***********************************************************************
- *		X11DRV_GetBeepActive
+ *		X11DRV_GetBeepActive (X11DRV.@)
  */
 BOOL X11DRV_GetBeepActive(void)
 {
@@ -1596,7 +1596,7 @@ BOOL X11DRV_GetBeepActive(void)
 }
 
 /***********************************************************************
- *		X11DRV_SetBeepActive
+ *		X11DRV_SetBeepActive (X11DRV.@)
  */
 void X11DRV_SetBeepActive(BOOL bActivate)
 {
@@ -1611,7 +1611,7 @@ void X11DRV_SetBeepActive(BOOL bActivate)
 }
 
 /***********************************************************************
- *		X11DRV_Beep
+ *		X11DRV_Beep (X11DRV.@)
  */
 void X11DRV_Beep(void)
 {
@@ -1619,7 +1619,7 @@ void X11DRV_Beep(void)
 }
 
 /***********************************************************************
- *		X11DRV_GetDIState
+ *		X11DRV_GetDIState (X11DRV.@)
  */
 BOOL X11DRV_GetDIState(DWORD len, LPVOID ptr)
 {
@@ -1644,7 +1644,7 @@ BOOL X11DRV_GetDIState(DWORD len, LPVOID ptr)
 }
 
 /***********************************************************************
- *		X11DRV_GetDIData
+ *		X11DRV_GetDIData (X11DRV.@)
  */
 BOOL X11DRV_GetDIData(
   BYTE *keystate,
@@ -1688,7 +1688,7 @@ BOOL X11DRV_GetDIData(
 }
 
 /***********************************************************************
- *		X11DRV_GetKeyboardConfig
+ *		X11DRV_GetKeyboardConfig (X11DRV.@)
  */
 void X11DRV_GetKeyboardConfig(KEYBOARD_CONFIG *cfg) {
   XKeyboardState   xks;
@@ -1699,9 +1699,9 @@ void X11DRV_GetKeyboardConfig(KEYBOARD_CONFIG *cfg) {
 }
 
 /***********************************************************************
- *		X11DRV_SetKeyboardConfig
+ *		X11DRV_SetKeyboardConfig (X11DRV.@)
  */
-extern void X11DRV_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask) {
+void X11DRV_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask) {
   XKeyboardControl xkc;
   unsigned long X_mask = 0;
   
diff --git a/windows/x11drv/mouse.c b/windows/x11drv/mouse.c
index a973c2a5f2f..b2760cc59f6 100644
--- a/windows/x11drv/mouse.c
+++ b/windows/x11drv/mouse.c
@@ -161,7 +161,7 @@ static BOOL X11DRV_MOUSE_DoSetCursor( CURSORICONINFO *ptr )
 }
 
 /***********************************************************************
- *		X11DRV_SetCursor
+ *		X11DRV_SetCursor (X11DRV.@)
  */
 void X11DRV_SetCursor( CURSORICONINFO *lpCursor )
 {
@@ -199,7 +199,7 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor )
 }
 
 /***********************************************************************
- *		X11DRV_MoveCursor
+ *		X11DRV_MoveCursor (X11DRV.@)
  */
 void X11DRV_MoveCursor(WORD wAbsX, WORD wAbsY)
 {
@@ -241,7 +241,7 @@ void X11DRV_MoveCursor(WORD wAbsX, WORD wAbsY)
 }
 
 /***********************************************************************
- *           X11DRV_InitMouse
+ *		X11DRV_InitMouse (X11DRV.@)
  */
 void X11DRV_InitMouse( LPMOUSE_EVENT_PROC proc )
 {
@@ -268,7 +268,7 @@ void X11DRV_InitMouse( LPMOUSE_EVENT_PROC proc )
 
 
 /***********************************************************************
- *           X11DRV_SendEvent
+ *		X11DRV_SendEvent (internal)
  */
 void X11DRV_SendEvent( DWORD mouseStatus, DWORD posX, DWORD posY, 
                              DWORD keyState, DWORD time, HWND hWnd )