From 01d5e5b071b66dbe05743492253e866060945ad1 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Mon, 2 Jul 2001 19:59:40 +0000
Subject: [PATCH] Documentation fixes.

---
 controls/menu.c                |   6 +-
 dlls/avifil32/api.c            |   4 +-
 dlls/comctl32/comctl32undoc.c  |  12 +-
 dlls/comctl32/imagelist.c      |   2 +-
 dlls/commdlg/colordlg.c        |   4 +-
 dlls/commdlg/filedlg.c         |   8 +-
 dlls/commdlg/filetitle.c       |   2 +-
 dlls/commdlg/finddlg.c         |   8 +-
 dlls/commdlg/fontdlg.c         |   8 +-
 dlls/commdlg/generic.c         |   2 +-
 dlls/commdlg/printdlg.c        |   6 +-
 dlls/dplayx/dpclassfactory.c   |   2 +-
 dlls/gdi/bidi16.c              |  40 +++----
 dlls/gdi/printdrv.c            |  14 +--
 dlls/gdi/thunk.c               |  12 +-
 dlls/gdi/wing.c                |  16 +--
 dlls/kernel/comm.c             |  32 +++---
 dlls/kernel/debugger.c         |   2 +-
 dlls/kernel/kernel_main.c      |  12 +-
 dlls/kernel/string.c           |  10 +-
 dlls/kernel/sync.c             |   3 +-
 dlls/kernel/thunk.c            |   6 +-
 dlls/kernel/toolhelp.c         |   6 +-
 dlls/kernel/utthunk.c          |   2 +-
 dlls/kernel/win87em.c          |   8 +-
 dlls/kernel/wowthunk.c         |  16 +--
 dlls/lzexpand/lzexpand_main.c  |  18 +--
 dlls/mpr/mpr_main.c            |   8 +-
 dlls/msacm/pcmconverter.c      |   2 +-
 dlls/msvcrt/cpp.c              |  62 +++++------
 dlls/msvcrt/heap.c             |   4 +-
 dlls/ntdll/rtl.c               |   4 +-
 dlls/ntdll/sec.c               |   2 +-
 dlls/ntdll/wcstring.c          |  50 ++++-----
 dlls/ole32/compobj.c           |  33 +++---
 dlls/ole32/filemoniker.c       |   2 +-
 dlls/ole32/moniker.c           |   2 +-
 dlls/ole32/ole2.c              |  13 ++-
 dlls/ole32/ole2nls.c           |   6 +-
 dlls/ole32/storage.c           |   6 +-
 dlls/oleaut32/ole2disp.c       |  16 +--
 dlls/oleaut32/typelib.c        |   2 +-
 dlls/oleaut32/variant.c        |   2 +-
 dlls/olecli/olecli_main.c      |  24 ++--
 dlls/olepro32/olepro32stubs.c  |   8 +-
 dlls/olesvr/olesvr_main.c      |  10 +-
 dlls/serialui/confdlg.c        |   8 +-
 dlls/setupapi/infparse.c       |   6 +-
 dlls/shell32/changenotify.c    |   2 +-
 dlls/shell32/iconcache.c       |   6 +-
 dlls/shell32/pidl.c            |   2 +-
 dlls/shell32/shell.c           |  24 ++--
 dlls/shell32/shell32_main.c    |   2 +-
 dlls/shell32/shellole.c        |   5 +-
 dlls/shell32/shellord.c        |   8 +-
 dlls/shell32/shellpath.c       |  70 ++++++------
 dlls/shell32/shellreg.c        |  14 +--
 dlls/shell32/shlmenu.c         |   4 +-
 dlls/shlwapi/ordinal.c         | 120 ++++++++++----------
 dlls/shlwapi/reg.c             |  12 +-
 dlls/ttydrv/user.c             |  46 ++++----
 dlls/urlmon/urlmon_main.c      |   2 +-
 dlls/user/bidi16.c             |  42 +++----
 dlls/user/dde/ddeml16.c        |  50 ++++-----
 dlls/user/display.c            |  10 +-
 dlls/user/lstr.c               |  26 +++--
 dlls/user/misc.c               |   8 +-
 dlls/user/mouse.c              |   6 +-
 dlls/user/network.c            |  60 +++++-----
 dlls/user/resource.c           |   4 +-
 dlls/user/text.c               |   6 +-
 dlls/user/thunk.c              |  10 +-
 dlls/user/wsprintf.c           |   4 +-
 dlls/version/install.c         |   2 +-
 dlls/version/resource.c        |   4 +-
 dlls/version/ver16.c           |  12 +-
 dlls/win32s/w32skernel.c       |   2 +-
 dlls/win32s/w32sys.c           |   4 +-
 dlls/win32s/win32s16.c         |   6 +-
 dlls/winaspi/winaspi16.c       |   8 +-
 dlls/winedos/dosvm.c           |  22 ++++
 dlls/winedos/module.c          |  12 ++
 dlls/wineps/driver.c           |   8 +-
 dlls/wininet/wininet_main.c    |   2 +-
 dlls/winmm/driver.c            |   3 +-
 dlls/winmm/joystick.c          |   4 +-
 dlls/winmm/joystick/joystick.c |   4 +-
 dlls/winmm/mci.c               |   2 +-
 dlls/winmm/mcicda/mcicda.c     |   2 +-
 dlls/winmm/midimap/midimap.c   |   2 +-
 dlls/winmm/mmio.c              |  12 +-
 dlls/winmm/mmsystem.c          |  19 ++--
 dlls/winmm/sound16.c           |  34 +++---
 dlls/winmm/time.c              |   4 +-
 dlls/winmm/wavemap/wavemap.c   |   2 +-
 dlls/winmm/wineoss/oss.c       |   2 +-
 dlls/winsock/async.c           |  29 ++---
 dlls/winsock/socket.c          | 198 +++++++++++++++++++++------------
 dlls/winspool/info.c           |   3 +-
 dlls/wsock32/socket.c          |   4 +-
 dlls/x11drv/window.c           |   2 +-
 dlls/x11drv/winpos.c           |   8 +-
 dlls/x11drv/x11drv_main.c      |   8 +-
 files/directory.c              |   8 +-
 files/dos_fs.c                 |   6 +-
 files/drive.c                  |   6 +-
 files/file.c                   |  27 ++---
 files/profile.c                |  28 ++---
 graphics/bitblt.c              |   6 +-
 graphics/escape.c              |   2 +-
 graphics/fontengine.c          |  10 +-
 graphics/mapping.c             |  22 ++--
 graphics/painting.c            |  42 +++----
 graphics/path.c                |  24 ++--
 graphics/win16drv/prtdrv.c     |   4 +-
 graphics/x11drv/oembitmap.c    |   2 +-
 loader/main.c                  |   2 +-
 loader/module.c                |   7 +-
 loader/ne/module.c             |   6 +-
 loader/ne/resource.c           |   4 +-
 loader/resource.c              |   2 +-
 loader/task.c                  |  37 +++---
 memory/atom.c                  |  10 +-
 memory/global.c                |  18 +--
 memory/heap.c                  |  16 +--
 memory/local.c                 |  20 ++--
 memory/selector.c              |  14 +--
 memory/string.c                |  12 +-
 misc/error.c                   |   2 +-
 misc/registry.c                |  38 +++----
 misc/system.c                  |   6 +-
 misc/version.c                 |   6 +-
 objects/bitmap.c               |   2 +-
 objects/dib.c                  |   2 +-
 objects/font.c                 |   3 +-
 objects/gdiobj.c               |   5 +-
 objects/palette.c              |   2 +-
 objects/text.c                 |   2 +-
 scheduler/synchro.c            |   6 +-
 scheduler/syslevel.c           |   2 +-
 windows/dialog.c               |   3 +-
 windows/input.c                |   9 +-
 windows/keyboard.c             |   3 +-
 windows/message.c              |   3 +-
 windows/queue.c                |   9 +-
 145 files changed, 1032 insertions(+), 904 deletions(-)

diff --git a/controls/menu.c b/controls/menu.c
index ff1b45d39e7..9f679d7e8ab 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -3726,7 +3726,8 @@ HMENU WINAPI CreatePopupMenu(void)
 
 
 /**********************************************************************
- *         GetMenuCheckMarkDimensions    (USER.417) (USER32.@)
+ *         GetMenuCheckMarkDimensions    (USER.417)
+ *         GetMenuCheckMarkDimensions    (USER32.@)
  */
 DWORD WINAPI GetMenuCheckMarkDimensions(void)
 {
@@ -4085,7 +4086,8 @@ DWORD WINAPI DrawMenuBarTemp(DWORD p1, DWORD p2)
 }
 
 /***********************************************************************
- *           EndMenu   (USER.187) (USER32.@)
+ *           EndMenu   (USER.187)
+ *           EndMenu   (USER32.@)
  */
 void WINAPI EndMenu(void)
 {
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index b205f606f7d..a4997d6f808 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -79,7 +79,7 @@ ULONG WINAPI AVIFileRelease(PAVIFILE pfile)
 }
 
 /***********************************************************************
- *		AVIFileOpenA (AVIFILE.102)
+ *		AVIFileOpen  (AVIFILE.102)
  *		AVIFileOpenA (AVIFIL32.@)
  */
 HRESULT WINAPI AVIFileOpenA(
@@ -158,6 +158,7 @@ HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile,AVIFILEINFOW* pfi,LONG lSize)
 }
 
 /***********************************************************************
+ *		AVIFileInfo  (AVIFIL32.@)
  *		AVIFileInfoA (AVIFIL32.@)
  */
 HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile,AVIFILEINFOA* pfi,LONG lSize)
@@ -264,6 +265,7 @@ HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pas,AVISTREAMINFOW* psi,LONG lSize)
 }
 
 /***********************************************************************
+ *		AVIStreamInfo  (AVIFIL32.@)
  *		AVIStreamInfoA (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pas,AVISTREAMINFOA* psi,LONG lSize)
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index 880f6636319..c972e986834 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -457,7 +457,7 @@ CreateMRUListA (LPCREATEMRULIST lpcml)
 }
 
 /**************************************************************************
- *              FreeMRUListA [COMCTL32.152]
+ *              FreeMRUList [COMCTL32.152]
  *
  * PARAMS
  *     hMRUList [I] Handle to list.
@@ -2340,7 +2340,7 @@ INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
 }
 
 /**************************************************************************
- * COMCTL32_410 [COMCTL32.410]
+ * @ [COMCTL32.410]
  *
  * FIXME: What's this supposed to do?
  *        Parameter 1 is an HWND, you're on your own for the rest.
@@ -2354,7 +2354,7 @@ BOOL WINAPI COMCTL32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
 }
 
 /**************************************************************************
- * COMCTL32_411 [COMCTL32.411]
+ * @ [COMCTL32.411]
  *
  * FIXME: What's this supposed to do?
  *        Parameter 1 is an HWND, you're on your own for the rest.
@@ -2368,7 +2368,7 @@ BOOL WINAPI COMCTL32_411( HWND hw, DWORD b, DWORD c) {
 }
 
 /**************************************************************************
- * COMCTL32_412 [COMCTL32.412]
+ * @ [COMCTL32.412]
  *
  * FIXME: What's this supposed to do?
  *        Parameter 1 is an HWND, you're on your own for the rest.
@@ -2389,7 +2389,7 @@ BOOL WINAPI COMCTL32_412( HWND hwnd, DWORD b, DWORD c)
 }
 
 /**************************************************************************
- * COMCTL32_413 [COMCTL32.413]
+ * @ [COMCTL32.413]
  *
  * FIXME: What's this supposed to do?
  *        Parameter 1 is an HWND, you're on your own for the rest.
@@ -2404,7 +2404,7 @@ BOOL WINAPI COMCTL32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
 
 
 /**************************************************************************
- * COMCTL32_415 [COMCTL32.415]
+ * @ [COMCTL32.415]
  *
  * FIXME: What's this supposed to do?
  *        Parameter 1 is an HWND, you're on your own for the rest.
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 7efe3d739ca..1aa817ba6bc 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -1667,7 +1667,7 @@ ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect)
 
 
 /*************************************************************************
- * ImageList_LoadImageA [COMCTL32.65]
+ * ImageList_LoadImage  [COMCTL32.64]
  * ImageList_LoadImageA [COMCTL32.65]
  *
  * Creates an image list from a bitmap, icon or cursor.
diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index 4a77ac4c08d..9dc32cd22a3 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -1284,7 +1284,7 @@ static LRESULT WINAPI ColorDlgProc( HWND hDlg, UINT message,
 }
 
 /***********************************************************************
- *           ColorDlgProc16   (COMMDLG.8)
+ *           ColorDlgProc   (COMMDLG.8)
  */
 LRESULT WINAPI ColorDlgProc16( HWND16 hDlg, UINT16 message,
                             WPARAM16 wParam, LONG lParam )
@@ -1349,7 +1349,7 @@ LRESULT WINAPI ColorDlgProc16( HWND16 hDlg, UINT16 message,
 
 
 /***********************************************************************
- *            ChooseColor16  (COMMDLG.5)
+ *            ChooseColor  (COMMDLG.5)
  */
 BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
 {
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index 3df1ed1247a..a09dabb31b2 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -1326,7 +1326,7 @@ BOOL WINAPI GetFileName31W(
 /* ------------------ Dialog procedures ---------------------- */
 
 /***********************************************************************
- *           FileOpenDlgProc16   (COMMDLG.6)
+ *           FileOpenDlgProc   (COMMDLG.6)
  */
 LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
@@ -1374,7 +1374,7 @@ LRESULT WINAPI FileOpenDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 }
 
 /***********************************************************************
- *           FileSaveDlgProc16   (COMMDLG.7)
+ *           FileSaveDlgProc   (COMMDLG.7)
  */
 LRESULT WINAPI FileSaveDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                LPARAM lParam)
@@ -1474,7 +1474,7 @@ static LRESULT WINAPI FileOpenDlgProc(HWND hWnd, UINT wMsg,
 /* ------------------ APIs ---------------------- */ 
 
 /***********************************************************************
- *           GetOpenFileName16   (COMMDLG.1)
+ *           GetOpenFileName   (COMMDLG.1)
  *
  * Creates a dialog box for the user to select a file to open.
  *
@@ -1512,7 +1512,7 @@ BOOL16 WINAPI GetOpenFileName16(
 }
 
 /***********************************************************************
- *           GetSaveFileName16   (COMMDLG.2)
+ *           GetSaveFileName   (COMMDLG.2)
  *
  * Creates a dialog box for the user to select a file to save.
  *
diff --git a/dlls/commdlg/filetitle.c b/dlls/commdlg/filetitle.c
index 03a026aaeb1..d378f908987 100644
--- a/dlls/commdlg/filetitle.c
+++ b/dlls/commdlg/filetitle.c
@@ -88,7 +88,7 @@ short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf)
 
 
 /***********************************************************************
- *	GetFileTitle16		(COMMDLG.27)
+ *	GetFileTitle		(COMMDLG.27)
  */
 short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
 {
diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c
index c890d3ad46f..02d52f255ad 100644
--- a/dlls/commdlg/finddlg.c
+++ b/dlls/commdlg/finddlg.c
@@ -148,7 +148,7 @@ void FINDDLG_FreeResources(LFRPRIVATE lfr)
 }
 
 /***********************************************************************
- *           FindText16   (COMMDLG.11)
+ *           FindText   (COMMDLG.11)
  */
 HWND16 WINAPI FindText16( SEGPTR find )
 {
@@ -174,7 +174,7 @@ HWND16 WINAPI FindText16( SEGPTR find )
 
 
 /***********************************************************************
- *           ReplaceText16   (COMMDLG.12)
+ *           ReplaceText   (COMMDLG.12)
  */
 HWND16 WINAPI ReplaceText16( SEGPTR find )
 {
@@ -295,7 +295,7 @@ static LRESULT FINDDLG_WMCommand(HWND hWnd, WPARAM wParam,
 
 
 /***********************************************************************
- *           FindTextDlgProc16   (COMMDLG.13)
+ *           FindTextDlgProc   (COMMDLG.13)
  */
 LRESULT WINAPI FindTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                  LPARAM lParam)
@@ -451,7 +451,7 @@ static LRESULT REPLACEDLG_WMCommand(HWND hWnd, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           ReplaceTextDlgProc16   (COMMDLG.14)
+ *           ReplaceTextDlgProc   (COMMDLG.14)
  */
 LRESULT WINAPI ReplaceTextDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
                                     LPARAM lParam)
diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index 4e933a5fbf2..8d50a4fee04 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -118,7 +118,7 @@ _dump_cf_flags(DWORD cflags) {
 
 
 /***********************************************************************
- *                        ChooseFont16   (COMMDLG.15)     
+ *                        ChooseFont   (COMMDLG.15)     
  */
 BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
 {
@@ -517,7 +517,7 @@ static INT WINAPI FontFamilyEnumProc(const LOGFONTA *lpLogFont,
 }
 
 /***********************************************************************
- *                FontFamilyEnumProc16                     (COMMDLG.19)
+ *                FontFamilyEnumProc                     (COMMDLG.19)
  */
 INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
                                    UINT16 nFontType, LPARAM lParam )
@@ -648,7 +648,7 @@ static INT AddFontStyle(const LOGFONTA *lplf, UINT nFontType,
 }    
 
 /***********************************************************************
- *                 FontStyleEnumProc16                     (COMMDLG.18)
+ *                 FontStyleEnumProc                     (COMMDLG.18)
  */
 INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics,
                                   UINT16 nFontType, LPARAM lParam )
@@ -1099,7 +1099,7 @@ static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 /***********************************************************************
- *           FormatCharDlgProc16   (COMMDLG.16)
+ *           FormatCharDlgProc   (COMMDLG.16)
              FIXME: 1. some strings are "hardcoded", but it's better load from sysres
                     2. some CF_.. flags are not supported
                     3. some TType extensions
diff --git a/dlls/commdlg/generic.c b/dlls/commdlg/generic.c
index 53a476048d7..89c08f33dd2 100644
--- a/dlls/commdlg/generic.c
+++ b/dlls/commdlg/generic.c
@@ -20,7 +20,7 @@ HINSTANCE	COMMDLG_hInstance32 = 0;
 static int	COMMDLG_Attach = 0;
 
 /***********************************************************************
- *	COMMDLG_DllEntryPoint			[COMMDLG.32]
+ *	DllEntryPoint			[COMMDLG.32]
  *
  *    Initialization code for the COMMDLG DLL
  *
diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index a058b781def..e00caf32058 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -1484,7 +1484,7 @@ BOOL WINAPI PrintDlgA(
 }
 
 /***********************************************************************
- *           PrintDlg16   (COMMDLG.20)
+ *           PrintDlg   (COMMDLG.20)
  * 
  *  Displays the the PRINT dialog box, which enables the user to specify
  *  specific properties of the print job.
@@ -2046,7 +2046,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) {
  */
 
 /***********************************************************************
- *           PrintDlgProc16   (COMMDLG.21)
+ *           PrintDlgProc   (COMMDLG.21)
  */
 LRESULT WINAPI PrintDlgProc16(HWND16 hDlg, UINT16 uMsg, WPARAM16 wParam,
                             LPARAM lParam)
@@ -2104,7 +2104,7 @@ LRESULT WINAPI PrintDlgProc16(HWND16 hDlg, UINT16 uMsg, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           PrintSetupDlgProc16   (COMMDLG.22)
+ *           PrintSetupDlgProc   (COMMDLG.22)
  */
 LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
 				   LPARAM lParam)
diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c
index d0df9484259..aa0fb7941d5 100644
--- a/dlls/dplayx/dpclassfactory.c
+++ b/dlls/dplayx/dpclassfactory.c
@@ -78,7 +78,7 @@ static IClassFactoryImpl DP_and_DPL_CF = {&DP_and_DPL_Vtbl, 1 };
 
 
 /*******************************************************************************
- * DPLAYX_DllGetClassObject [DPLAYX.11]
+ * DllGetClassObject [DPLAYX.11]
  * Retrieves DP or DPL class object from a DLL object
  *
  * NOTES
diff --git a/dlls/gdi/bidi16.c b/dlls/gdi/bidi16.c
index 96593fcef8c..71786dafc55 100644
--- a/dlls/gdi/bidi16.c
+++ b/dlls/gdi/bidi16.c
@@ -10,17 +10,17 @@
 DEFAULT_DEBUG_CHANNEL(gdi);
 
 /***********************************************************************
- *		RawTextOut16   (GDI.530)
+ *		RawTextOut   (GDI.530)
  */
 LONG WINAPI RawTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		RawExtTextOut16   (GDI.531)
+ *		RawExtTextOut   (GDI.531)
  */
 LONG WINAPI RawExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		RawGetTextExtent16   (GDI.532)
+ *		RawGetTextExtent   (GDI.532)
  */
 LONG WINAPI RawGetTextExtent16(HDC16 hdc, LPCSTR lpszString, INT16 cbString ) { 
       FIXME("(%04hx, %p, %hd): stub\n", hdc, lpszString, cbString); 
@@ -28,87 +28,87 @@ LONG WINAPI RawGetTextExtent16(HDC16 hdc, LPCSTR lpszString, INT16 cbString ) {
 }
 
 /***********************************************************************
- *		BiDiLayout16   (GDI.536)
+ *		BiDiLayout   (GDI.536)
  */
 LONG WINAPI BiDiLayout16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiCreateTabString16   (GDI.538)
+ *		BiDiCreateTabString   (GDI.538)
  */
 LONG WINAPI BiDiCreateTabString16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiGlyphOut16   (GDI.540)
+ *		BiDiGlyphOut   (GDI.540)
  */
 LONG WINAPI BiDiGlyphOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiGetStringExtent16   (GDI.543)
+ *		BiDiGetStringExtent   (GDI.543)
  */
 LONG WINAPI BiDiGetStringExtent16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiDeleteString16   (GDI.555)
+ *		BiDiDeleteString   (GDI.555)
  */
 LONG WINAPI BiDiDeleteString16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiSetDefaults16   (GDI.556)
+ *		BiDiSetDefaults   (GDI.556)
  */
 LONG WINAPI BiDiSetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiGetDefaults16   (GDI.558)
+ *		BiDiGetDefaults   (GDI.558)
  */
 LONG WINAPI BiDiGetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiShape16   (GDI.560)
+ *		BiDiShape   (GDI.560)
  */
 LONG WINAPI BiDiShape16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiFontComplement16   (GDI.561)
+ *		BiDiFontComplement   (GDI.561)
  */
 LONG WINAPI BiDiFontComplement16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiSetKashida16   (GDI.564)
+ *		BiDiSetKashida   (GDI.564)
  */
 LONG WINAPI BiDiSetKashida16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiKExtTextOut16   (GDI.565)
+ *		BiDiKExtTextOut   (GDI.565)
  */
 LONG WINAPI BiDiKExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiShapeEx16   (GDI.566)
+ *		BiDiShapeEx   (GDI.566)
  */
 LONG WINAPI BiDiShapeEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiCreateStringEx16   (GDI.569)
+ *		BiDiCreateStringEx   (GDI.569)
  */
 LONG WINAPI BiDiCreateStringEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		GetTextExtentRtoL16   (GDI.571)
+ *		GetTextExtentRtoL   (GDI.571)
  */
 LONG WINAPI GetTextExtentRtoL16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		GetHDCCharSet16   (GDI.572)
+ *		GetHDCCharSet   (GDI.572)
  */
 LONG WINAPI GetHDCCharSet16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiLayoutEx16   (GDI.573)
+ *		BiDiLayoutEx   (GDI.573)
  */
 LONG WINAPI BiDiLayoutEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *           SetLayout16   (GDI.1000)
+ *           SetLayout   (GDI.1000)
  *
  * Sets left->right or right->left text layout flags of a dc.
  */
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index d7642a4ec3e..74295d7b49a 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -37,7 +37,7 @@ static char PrinterDriverData[] = "PrinterDriverData";
 static char Printers[]		= "System\\CurrentControlSet\\Control\\Print\\Printers\\";
 
 /******************************************************************
- *                  StartDoc16  [GDI.377]
+ *                  StartDoc  [GDI.377]
  *
  */
 INT16 WINAPI StartDoc16( HDC16 hdc, const DOCINFO16 *lpdoc )
@@ -119,7 +119,7 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc)
 }
 
 /******************************************************************
- *                  EndDoc16  [GDI.378]
+ *                  EndDoc  [GDI.378]
  *
  */
 INT16 WINAPI EndDoc16(HDC16 hdc)
@@ -146,7 +146,7 @@ INT WINAPI EndDoc(HDC hdc)
 }
 
 /******************************************************************
- *                  StartPage16  [GDI.379]
+ *                  StartPage  [GDI.379]
  *
  */
 INT16 WINAPI StartPage16(HDC16 hdc)
@@ -173,7 +173,7 @@ INT WINAPI StartPage(HDC hdc)
 }
 
 /******************************************************************
- *                  EndPage16  [GDI.380]
+ *                  EndPage  [GDI.380]
  *
  */
 INT16 WINAPI EndPage16( HDC16 hdc )
@@ -205,7 +205,7 @@ INT WINAPI EndPage(HDC hdc)
 }
 
 /******************************************************************************
- *                 AbortDoc16  [GDI.382]
+ *                 AbortDoc  [GDI.382]
  */
 INT16 WINAPI AbortDoc16(HDC16 hdc)
 {
@@ -230,7 +230,7 @@ INT WINAPI AbortDoc(HDC hdc)
 }
 
 /**********************************************************************
- *           QueryAbort16   (GDI.155)
+ *           QueryAbort   (GDI.155)
  *
  *  Calls the app's AbortProc function if avail.
  *
@@ -258,7 +258,7 @@ extern WORD CALLBACK PRTDRV_CallTo16_word_ww(FARPROC16,WORD,WORD);
 /* ### stop build ### */
 
 /**********************************************************************
- *           SetAbortProc16   (GDI.381)
+ *           SetAbortProc   (GDI.381)
  *
  */
 INT16 WINAPI SetAbortProc16(HDC16 hdc, SEGPTR abrtprc)
diff --git a/dlls/gdi/thunk.c b/dlls/gdi/thunk.c
index 1124ee5a926..63d2611e727 100644
--- a/dlls/gdi/thunk.c
+++ b/dlls/gdi/thunk.c
@@ -19,7 +19,7 @@ extern WORD CALLBACK THUNK_CallTo16_word_wwl  (FARPROC16,WORD,WORD,LONG);
 
 
 /***********************************************************************
- *           THUNK_EnumObjects16   (GDI.71)
+ *           EnumObjects   (GDI.71)
  */
 INT16 WINAPI THUNK_EnumObjects16( HDC16 hdc, INT16 nObjType,
                                   GOBJENUMPROC16 func, LPARAM lParam )
@@ -30,7 +30,7 @@ INT16 WINAPI THUNK_EnumObjects16( HDC16 hdc, INT16 nObjType,
 
 
 /*************************************************************************
- *           THUNK_EnumFonts16   (GDI.70)
+ *           EnumFonts   (GDI.70)
  */
 INT16 WINAPI THUNK_EnumFonts16( HDC16 hdc, LPCSTR lpFaceName,
                                 FONTENUMPROC16 func, LPARAM lParam )
@@ -40,7 +40,7 @@ INT16 WINAPI THUNK_EnumFonts16( HDC16 hdc, LPCSTR lpFaceName,
 }
 
 /******************************************************************
- *           THUNK_EnumMetaFile16   (GDI.175)
+ *           EnumMetaFile   (GDI.175)
  */
 BOOL16 WINAPI THUNK_EnumMetaFile16( HDC16 hdc, HMETAFILE16 hmf,
                                     MFENUMPROC16 func, LPARAM lParam )
@@ -51,7 +51,7 @@ BOOL16 WINAPI THUNK_EnumMetaFile16( HDC16 hdc, HMETAFILE16 hmf,
 
 
 /*************************************************************************
- *           THUNK_EnumFontFamilies16   (GDI.330)
+ *           EnumFontFamilies   (GDI.330)
  */
 INT16 WINAPI THUNK_EnumFontFamilies16( HDC16 hdc, LPCSTR lpszFamily,
                                        FONTENUMPROC16 func, LPARAM lParam )
@@ -62,7 +62,7 @@ INT16 WINAPI THUNK_EnumFontFamilies16( HDC16 hdc, LPCSTR lpszFamily,
 
 
 /*************************************************************************
- *           THUNK_EnumFontFamiliesEx16   (GDI.613)
+ *           EnumFontFamiliesEx   (GDI.613)
  */
 INT16 WINAPI THUNK_EnumFontFamiliesEx16( HDC16 hdc, LPLOGFONT16 lpLF,
                                          FONTENUMPROCEX16 func, LPARAM lParam,
@@ -75,7 +75,7 @@ INT16 WINAPI THUNK_EnumFontFamiliesEx16( HDC16 hdc, LPLOGFONT16 lpLF,
 
 
 /**********************************************************************
- *           LineDDA16   (GDI.100)
+ *           LineDDA   (GDI.100)
  */
 void WINAPI LineDDA16( INT16 nXStart, INT16 nYStart, INT16 nXEnd,
                        INT16 nYEnd, LINEDDAPROC16 func, LPARAM lParam )
diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c
index a027ef46508..0eb84e1e735 100644
--- a/dlls/gdi/wing.c
+++ b/dlls/gdi/wing.c
@@ -38,7 +38,7 @@ typedef enum WING_DITHER_TYPE
  */
 
 /***********************************************************************
- *          WinGCreateDC16	(WING.1001)
+ *          WinGCreateDC	(WING.1001)
  */
 HDC16 WINAPI WinGCreateDC16(void)
 {
@@ -47,7 +47,7 @@ HDC16 WINAPI WinGCreateDC16(void)
 }
 
 /***********************************************************************
- *  WinGRecommendDIBFormat16    (WING.1002)
+ *  WinGRecommendDIBFormat    (WING.1002)
  */
 BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi)
 {
@@ -73,7 +73,7 @@ BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi)
 }
 
 /***********************************************************************
- *        WinGCreateBitmap16    (WING.1003)
+ *        WinGCreateBitmap    (WING.1003)
  */
 HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi,
                                     SEGPTR *bits)
@@ -117,7 +117,7 @@ UINT16 WINAPI WinGSetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
 }
 
 /***********************************************************************
- *  WinGGetDIBColorTable16   (WING.1005)
+ *  WinGGetDIBColorTable   (WING.1005)
  */
 UINT16 WINAPI WinGGetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
 				     RGBQUAD *colors)
@@ -127,7 +127,7 @@ UINT16 WINAPI WinGGetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
 }
 
 /***********************************************************************
- *  WinGCreateHalfTonePalette16   (WING.1007)
+ *  WinGCreateHalfTonePalette   (WING.1007)
  */
 HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
 {
@@ -139,7 +139,7 @@ HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
 }
 
 /***********************************************************************
- *  WinGCreateHalfToneBrush16   (WING.1008)
+ *  WinGCreateHalfToneBrush   (WING.1008)
  */
 HBRUSH16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col,
                                             WING_DITHER_TYPE type)
@@ -149,7 +149,7 @@ HBRUSH16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col,
 }
 
 /***********************************************************************
- *  WinGStretchBlt16   (WING.1009)
+ *  WinGStretchBlt   (WING.1009)
  */
 BOOL16 WINAPI WinGStretchBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
                                INT16 widDest, INT16 heiDest,
@@ -166,7 +166,7 @@ BOOL16 WINAPI WinGStretchBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
 }
 
 /***********************************************************************
- *  WinGBitBlt16   (WING.1010)
+ *  WinGBitBlt   (WING.1010)
  */
 BOOL16 WINAPI WinGBitBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
                            INT16 widDest, INT16 heiDest, HDC16 srcDC,
diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index 94b4e536bb9..7cfbb7921af 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -372,7 +372,7 @@ static void comm_waitwrite(struct DosDeviceStruct *ptr)
 }
 
 /**************************************************************************
- *         BuildCommDCB16		(USER.213)
+ *         BuildCommDCB		(USER.213)
  *
  * According to the ECMA-234 (368.3) the function will return FALSE on 
  * success, otherwise it will return -1. 
@@ -503,7 +503,7 @@ INT16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
 }
 
 /*****************************************************************************
- *	OpenComm16		(USER.200)
+ *	OpenComm		(USER.200)
  */
 INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 {
@@ -604,7 +604,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 }
 
 /*****************************************************************************
- *	CloseComm16		(USER.207)
+ *	CloseComm		(USER.207)
  */
 INT16 WINAPI CloseComm16(INT16 cid)
 {
@@ -641,7 +641,7 @@ INT16 WINAPI CloseComm16(INT16 cid)
 }
 
 /*****************************************************************************
- *	SetCommBreak16		(USER.210)
+ *	SetCommBreak		(USER.210)
  */
 INT16 WINAPI SetCommBreak16(INT16 cid)
 {
@@ -659,7 +659,7 @@ INT16 WINAPI SetCommBreak16(INT16 cid)
 }
 
 /*****************************************************************************
- *	ClearCommBreak16	(USER.211)
+ *	ClearCommBreak	(USER.211)
  */
 INT16 WINAPI ClearCommBreak16(INT16 cid)
 {
@@ -676,7 +676,7 @@ INT16 WINAPI ClearCommBreak16(INT16 cid)
 }
 
 /*****************************************************************************
- *	EscapeCommFunction16	(USER.214)
+ *	EscapeCommFunction	(USER.214)
  */
 LONG WINAPI EscapeCommFunction16(UINT16 cid,UINT16 nFunction)
 {
@@ -779,7 +779,7 @@ LONG WINAPI EscapeCommFunction16(UINT16 cid,UINT16 nFunction)
 }
 
 /*****************************************************************************
- *	FlushComm16	(USER.215)
+ *	FlushComm	(USER.215)
  */
 INT16 WINAPI FlushComm16(INT16 cid,INT16 fnQueue)
 {
@@ -815,7 +815,7 @@ INT16 WINAPI FlushComm16(INT16 cid,INT16 fnQueue)
 }  
 
 /********************************************************************
- *	GetCommError16	(USER.203)
+ *	GetCommError	(USER.203)
  */
 INT16 WINAPI GetCommError16(INT16 cid,LPCOMSTAT16 lpStat)
 {
@@ -857,7 +857,7 @@ INT16 WINAPI GetCommError16(INT16 cid,LPCOMSTAT16 lpStat)
 }
 
 /*****************************************************************************
- *	SetCommEventMask16	(USER.208)
+ *	SetCommEventMask	(USER.208)
  */
 SEGPTR WINAPI SetCommEventMask16(INT16 cid,UINT16 fuEvtMask)
 {
@@ -889,7 +889,7 @@ SEGPTR WINAPI SetCommEventMask16(INT16 cid,UINT16 fuEvtMask)
 }
 
 /*****************************************************************************
- *	GetCommEventMask16	(USER.209)
+ *	GetCommEventMask	(USER.209)
  */
 UINT16 WINAPI GetCommEventMask16(INT16 cid,UINT16 fnEvtClear)
 {
@@ -913,7 +913,7 @@ UINT16 WINAPI GetCommEventMask16(INT16 cid,UINT16 fnEvtClear)
 }
 
 /*****************************************************************************
- *	SetCommState16	(USER.201)
+ *	SetCommState	(USER.201)
  */
 INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
 {
@@ -1170,7 +1170,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
 }
 
 /*****************************************************************************
- *	GetCommState16	(USER.202)
+ *	GetCommState	(USER.202)
  */
 INT16 WINAPI GetCommState16(INT16 cid, LPDCB16 lpdcb)
 {
@@ -1328,7 +1328,7 @@ INT16 WINAPI GetCommState16(INT16 cid, LPDCB16 lpdcb)
 }
 
 /*****************************************************************************
- *	TransmitCommChar16	(USER.206)
+ *	TransmitCommChar	(USER.206)
  */
 INT16 WINAPI TransmitCommChar16(INT16 cid,CHAR chTransmit)
 {
@@ -1370,7 +1370,7 @@ INT16 WINAPI TransmitCommChar16(INT16 cid,CHAR chTransmit)
 }
 
 /*****************************************************************************
- *	UngetCommChar16	(USER.212)
+ *	UngetCommChar	(USER.212)
  */
 INT16 WINAPI UngetCommChar16(INT16 cid,CHAR chUnget)
 {
@@ -1401,7 +1401,7 @@ INT16 WINAPI UngetCommChar16(INT16 cid,CHAR chUnget)
 }
 
 /*****************************************************************************
- *	ReadComm16	(USER.204)
+ *	ReadComm	(USER.204)
  */
 INT16 WINAPI ReadComm16(INT16 cid,LPSTR lpvBuf,INT16 cbRead)
 {
@@ -1451,7 +1451,7 @@ INT16 WINAPI ReadComm16(INT16 cid,LPSTR lpvBuf,INT16 cbRead)
 }
 
 /*****************************************************************************
- *	WriteComm16	(USER.205)
+ *	WriteComm	(USER.205)
  */
 INT16 WINAPI WriteComm16(INT16 cid, LPSTR lpvBuf, INT16 cbWrite)
 {
diff --git a/dlls/kernel/debugger.c b/dlls/kernel/debugger.c
index e8dea4a19c9..328898b326d 100644
--- a/dlls/kernel/debugger.c
+++ b/dlls/kernel/debugger.c
@@ -238,7 +238,7 @@ void WINAPI DebugBreak(void)
 
 
 /***********************************************************************
- *           DebugBreak16   (KERNEL.203)
+ *           DebugBreak   (KERNEL.203)
  *
  *  Raises an expection in a 16 bit application so that a debugger (if attached)
  *  can take some action.
diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c
index 2789616a529..1b585cbf4dd 100644
--- a/dlls/kernel/kernel_main.c
+++ b/dlls/kernel/kernel_main.c
@@ -106,7 +106,17 @@ BOOL WINAPI MAIN_KernelInit( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 }
 
 /***********************************************************************
- *		KERNEL_nop (KERNEL.361)
+ *		EnableDos (KERNEL.41)
+ *		DisableDos (KERNEL.42)
+ *		GetLastDiskChange (KERNEL.98)
+ *		ValidateCodeSegments (KERNEL.100)
+ *		KbdRst (KERNEL.123)
+ *		EnableKernel (KERNEL.124)
+ *		DisableKernel (KERNEL.125)
+ *		ValidateFreeSpaces (KERNEL.200)
+ *		K237 (KERNEL.237)
+ *		BUNNY_351 (KERNEL.351)
+ *		PIGLET_361 (KERNEL.361)
  *
  * Entry point for kernel functions that do nothing.
  */
diff --git a/dlls/kernel/string.c b/dlls/kernel/string.c
index 96537a918d1..a353dae0990 100644
--- a/dlls/kernel/string.c
+++ b/dlls/kernel/string.c
@@ -25,7 +25,7 @@ static void *user32_proc_address(const char *proc_name)
 
 
 /***********************************************************************
- *		KERNEL_lstrcmp16 (KERNEL.87)
+ *		Reserved5 (KERNEL.87)
  */
 INT16 WINAPI KERNEL_lstrcmp16( LPCSTR str1, LPCSTR str2 )
 {
@@ -130,7 +130,7 @@ INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...)
  */
 
 /***********************************************************************
- *		KERNEL_AnsiNext16 (KERNEL.77)
+ *		Reserved1 (KERNEL.77)
  */
 SEGPTR WINAPI KERNEL_AnsiNext16(SEGPTR current)
 {
@@ -138,7 +138,7 @@ SEGPTR WINAPI KERNEL_AnsiNext16(SEGPTR current)
 }
 
 /***********************************************************************
- *		KERNEL_AnsiPrev16(KERNEL.78)
+ *		Reserved2(KERNEL.78)
  */
 SEGPTR WINAPI KERNEL_AnsiPrev16( SEGPTR start, SEGPTR current )
 {
@@ -146,7 +146,7 @@ SEGPTR WINAPI KERNEL_AnsiPrev16( SEGPTR start, SEGPTR current )
 }
 
 /***********************************************************************
- *		KERNEL_AnsiUpper16 (KERNEL.79)
+ *		Reserved3 (KERNEL.79)
  */
 SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar )
 {
@@ -165,7 +165,7 @@ SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar )
 }
 
 /***********************************************************************
- *		KERNEL_AnsiLower16 (KERNEL.80)
+ *		Reserved4 (KERNEL.80)
  */
 SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar )
 {
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 741789ceafb..b19f6e54785 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -84,7 +84,7 @@ HANDLE WINAPI CreateEventW( SECURITY_ATTRIBUTES *sa, BOOL manual_reset,
 
 
 /***********************************************************************
- *           WIN16_CreateEvent    (KERNEL.457)
+ *           CreateW32Event    (KERNEL.457)
  */
 HANDLE WINAPI WIN16_CreateEvent( BOOL manual_reset, BOOL initial_state )
 {
@@ -228,6 +228,7 @@ VOID WINAPI VWin32_EventWait(HANDLE event)
 
 /***********************************************************************
  *       VWin32_EventSet	(KERNEL.451)
+ *       KERNEL_479             (KERNEL.479)
  */
 VOID WINAPI VWin32_EventSet(HANDLE event)
 {
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 02b363f801f..01805c9c914 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -1705,7 +1705,7 @@ SEGPTR WINAPI FindSLThunkletCallback( FARPROC target, DWORD relay )
 
 
 /***********************************************************************
- *     FreeThunklet16            (KERNEL.611)
+ *     FreeThunklet            (KERNEL.611)
  */
 BOOL16 WINAPI FreeThunklet16( DWORD unused1, DWORD unused2 )
 {
@@ -1924,7 +1924,7 @@ void WINAPI HouseCleanLogicallyDeadHandles(void)
 }
 
 /**********************************************************************
- *		_KERNEL32_100 (KERNEL32.100)
+ *		@ (KERNEL32.100)
  */
 BOOL WINAPI _KERNEL32_100(HANDLE threadid,DWORD exitcode,DWORD x)
 {
@@ -1933,7 +1933,7 @@ BOOL WINAPI _KERNEL32_100(HANDLE threadid,DWORD exitcode,DWORD x)
 }
 
 /**********************************************************************
- *		_KERNEL32_99 (KERNEL32.99)
+ *		@ (KERNEL32.99)
  *
  * Checks whether the clock has to be switched from daylight
  * savings time to standard time or vice versa.
diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c
index 7e5dd399cd4..9701bb93410 100644
--- a/dlls/kernel/toolhelp.c
+++ b/dlls/kernel/toolhelp.c
@@ -38,7 +38,7 @@ static int nrofnotifys = 0;
 static FARPROC16 HookNotify = NULL;
 
 /***********************************************************************
- *		NotifyRegister16 (TOOLHELP.73)
+ *		NotifyRegister (TOOLHELP.73)
  */
 BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback,
                               WORD wFlags )
@@ -68,7 +68,7 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback,
 }
 
 /***********************************************************************
- *		NotifyUnregister16 (TOOLHELP.74)
+ *		NotifyUnregister (TOOLHELP.74)
  */
 BOOL16 WINAPI NotifyUnregister16( HTASK16 htask )
 {
@@ -384,7 +384,7 @@ BOOL WINAPI Module32Next(HANDLE hSnapshot, LPMODULEENTRY32 lpme)
 }
 
 /************************************************************************
- *              GlobalMasterHandle16 (KERNEL.28)
+ *              GlobalMasterHandle (KERNEL.28)
  *
  *
  * Should return selector and handle of the information structure for 
diff --git a/dlls/kernel/utthunk.c b/dlls/kernel/utthunk.c
index 236b10d9159..32d0996c730 100644
--- a/dlls/kernel/utthunk.c
+++ b/dlls/kernel/utthunk.c
@@ -291,7 +291,7 @@ VOID WINAPI UTUnRegister( HMODULE hModule )
 }
 
 /****************************************************************************
- *		UTInit16     (KERNEL.493)
+ *		UTInit     (KERNEL.493)
  */
 WORD WINAPI UTInit16( DWORD x1, DWORD x2, DWORD x3, DWORD x4 )
 {
diff --git a/dlls/kernel/win87em.c b/dlls/kernel/win87em.c
index 47955376a46..28673ea48a6 100644
--- a/dlls/kernel/win87em.c
+++ b/dlls/kernel/win87em.c
@@ -79,7 +79,7 @@ void WIN87_Init( CONTEXT86 *context )
 }
 
 /***********************************************************************
- *		WIN87_fpmath (WIN87EM.1)
+ *		_fpMath (WIN87EM.1)
  */
 void WINAPI WIN87_fpmath( CONTEXT86 *context )
 {
@@ -204,7 +204,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context )
 }
 
 /***********************************************************************
- *		WIN87_WinEm87Info (WIN87EM.3)
+ *		__WinEm87Info (WIN87EM.3)
  */
 void WINAPI WIN87_WinEm87Info(struct Win87EmInfoStruct *pWIS,
                               int cbWin87EmInfoStruct)
@@ -213,7 +213,7 @@ void WINAPI WIN87_WinEm87Info(struct Win87EmInfoStruct *pWIS,
 }
 
 /***********************************************************************
- *		WIN87_WinEm87Restore (WIN87EM.4)
+ *		__WinEm87Restore (WIN87EM.4)
  */
 void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea,
                                  int cbWin87EmSaveArea)
@@ -223,7 +223,7 @@ void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea,
 }
 
 /***********************************************************************
- *		WIN87_WinEm87Save (WIN87EM.5)
+ *		__WinEm87Save (WIN87EM.5)
  */
 void WINAPI WIN87_WinEm87Save(void *pWin87EmSaveArea, int cbWin87EmSaveArea)
 {
diff --git a/dlls/kernel/wowthunk.c b/dlls/kernel/wowthunk.c
index 169868a7081..852df3bf513 100644
--- a/dlls/kernel/wowthunk.c
+++ b/dlls/kernel/wowthunk.c
@@ -84,8 +84,8 @@ LPVOID WINAPI K32WOWGetVDMPointerFix( DWORD vp, DWORD dwBytes, BOOL fProtectedMo
 }
 
 /**********************************************************************
- *           K32WOWGetVDMPointerUnFix   (WOW32.7)
- *           K32WOWGetVDMPointerUnFix   (KERNEL32.69)
+ *           K32WOWGetVDMPointerUnfix   (WOW32.7)
+ *           K32WOWGetVDMPointerUnfix   (KERNEL32.69)
  */
 VOID WINAPI K32WOWGetVDMPointerUnfix( DWORD vp )
 {
@@ -307,7 +307,7 @@ DWORD WINAPI K32WOWCallback16( DWORD vpfn16, DWORD dwParam )
  */
 
 /**********************************************************************
- *           GetVDMPointer32W16      (KERNEL.516)
+ *           GetVDMPointer32W      (KERNEL.516)
  */
 DWORD WINAPI GetVDMPointer32W16( SEGPTR vp, UINT16 fMode )
 {
@@ -315,7 +315,7 @@ DWORD WINAPI GetVDMPointer32W16( SEGPTR vp, UINT16 fMode )
 }
 
 /***********************************************************************
- *           LoadLibraryEx32W16      (KERNEL.513)
+ *           LoadLibraryEx32W      (KERNEL.513)
  */
 DWORD WINAPI LoadLibraryEx32W16( LPCSTR lpszLibFile, DWORD hFile, DWORD dwFlags )
 {
@@ -337,7 +337,7 @@ DWORD WINAPI LoadLibraryEx32W16( LPCSTR lpszLibFile, DWORD hFile, DWORD dwFlags
 }
 
 /***********************************************************************
- *           GetProcAddress32W16     (KERNEL.515)
+ *           GetProcAddress32W     (KERNEL.515)
  */
 DWORD WINAPI GetProcAddress32W16( DWORD hModule, LPCSTR lpszProc )
 {
@@ -345,7 +345,7 @@ DWORD WINAPI GetProcAddress32W16( DWORD hModule, LPCSTR lpszProc )
 }
 
 /***********************************************************************
- *           FreeLibrary32W16        (KERNEL.514)
+ *           FreeLibrary32W        (KERNEL.514)
  */
 DWORD WINAPI FreeLibrary32W16( DWORD hLibModule )
 {
@@ -458,7 +458,7 @@ static DWORD WOW_CallProc32W16( BOOL Ex )
 }
 
 /**********************************************************************
- *           CallProc32W16           (KERNEL.517)
+ *           CallProc32W           (KERNEL.517)
  *
  * DWORD PASCAL CallProc32W( DWORD p1, ... , DWORD lpProcAddress,
  *                           DWORD fAddressConvert, DWORD cParams );
@@ -469,7 +469,7 @@ DWORD WINAPI CallProc32W16( void )
 }
 
 /**********************************************************************
- *           CallProcEx32W16         (KERNEL.518)
+ *           _CallProcEx32W         (KERNEL.518)
  *
  * DWORD CallProcEx32W( DWORD cParams, DWORD fAddressConvert, 
  *                      DWORD lpProcAddress, DWORD p1, ... );
diff --git a/dlls/lzexpand/lzexpand_main.c b/dlls/lzexpand/lzexpand_main.c
index 194fd4c8b91..3f15b6bca0a 100644
--- a/dlls/lzexpand/lzexpand_main.c
+++ b/dlls/lzexpand/lzexpand_main.c
@@ -126,7 +126,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head)
 }
 
 /***********************************************************************
- *           LZStart16   (LZEXPAND.7)
+ *           LZStart   (LZEXPAND.7)
  */
 INT16 WINAPI LZStart16(void)
 {
@@ -146,7 +146,7 @@ INT WINAPI LZStart(void)
 
 
 /***********************************************************************
- *           LZInit16   (LZEXPAND.3)
+ *           LZInit   (LZEXPAND.3)
  */
 HFILE16 WINAPI LZInit16( HFILE16 hfSrc )
 {
@@ -221,7 +221,7 @@ void WINAPI LZDone(void)
 
 
 /***********************************************************************
- *           GetExpandedName16   (LZEXPAND.10)
+ *           GetExpandedName   (LZEXPAND.10)
  */
 INT16 WINAPI GetExpandedName16( LPCSTR in, LPSTR out )
 {
@@ -326,7 +326,7 @@ INT WINAPI GetExpandedNameW( LPCWSTR in, LPWSTR out )
 
 
 /***********************************************************************
- *           LZRead16   (LZEXPAND.5)
+ *           LZRead   (LZEXPAND.5)
  */
 INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread )
 {
@@ -427,7 +427,7 @@ INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread )
 
 
 /***********************************************************************
- *           LZSeek16   (LZEXPAND.4)
+ *           LZSeek   (LZEXPAND.4)
  */
 LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type )
 {
@@ -469,7 +469,7 @@ LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
 
 
 /***********************************************************************
- *           LZCopy16   (LZEXPAND.1)
+ *           LZCopy   (LZEXPAND.1)
  *
  */
 LONG WINAPI LZCopy16( HFILE16 src, HFILE16 dest )
@@ -566,7 +566,7 @@ static LPSTR LZEXPAND_MangleName( LPCSTR fn )
 
 
 /***********************************************************************
- *           LZOpenFile16   (LZEXPAND.2)
+ *           LZOpenFile   (LZEXPAND.2)
  */
 HFILE16 WINAPI LZOpenFile16( LPCSTR fn, LPOFSTRUCT ofs, UINT16 mode )
 {
@@ -623,7 +623,7 @@ HFILE WINAPI LZOpenFileW( LPCWSTR fn, LPOFSTRUCT ofs, UINT mode )
 
 
 /***********************************************************************
- *           LZClose16   (LZEXPAND.6)
+ *           LZClose   (LZEXPAND.6)
  */
 void WINAPI LZClose16( HFILE16 fd )
 {
@@ -651,7 +651,7 @@ void WINAPI LZClose( HFILE fd )
 }
 
 /***********************************************************************
- *           CopyLZFile16   (LZEXPAND.8)
+ *           CopyLZFile   (LZEXPAND.8)
  */
 LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
 {
diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c
index 80bbb866b94..976e12537f7 100644
--- a/dlls/mpr/mpr_main.c
+++ b/dlls/mpr/mpr_main.c
@@ -14,7 +14,7 @@ DEFAULT_DEBUG_CHANNEL(mpr);
   */
 
 /*****************************************************************
- *  MPR_Alloc  [MPR.22]
+ *  @  [MPR.22]
  */
 LPVOID WINAPI MPR_Alloc( DWORD dwSize )
 {
@@ -22,7 +22,7 @@ LPVOID WINAPI MPR_Alloc( DWORD dwSize )
 }
 
 /*****************************************************************
- *  MPR_ReAlloc  [MPR.23]
+ *  @  [MPR.23]
  */
 LPVOID WINAPI MPR_ReAlloc( LPVOID lpSrc, DWORD dwSize )
 {
@@ -33,7 +33,7 @@ LPVOID WINAPI MPR_ReAlloc( LPVOID lpSrc, DWORD dwSize )
 }
 
 /*****************************************************************
- *  MPR_Free  [MPR.24]
+ *  @  [MPR.24]
  */
 BOOL WINAPI MPR_Free( LPVOID lpMem )
 {
@@ -44,7 +44,7 @@ BOOL WINAPI MPR_Free( LPVOID lpMem )
 }
 
 /*****************************************************************
- *  _MPR_25  [MPR.25]
+ *  @  [MPR.25]
  */
 BOOL WINAPI _MPR_25( LPBYTE lpMem, INT len )
 {
diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c
index 5a86648f1a2..68a4a4f65e5 100644
--- a/dlls/msacm/pcmconverter.c
+++ b/dlls/msacm/pcmconverter.c
@@ -973,7 +973,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
 }
 
 /**************************************************************************
- * 			PCM_DriverProc			[exported]
+ * 			DriverProc			[exported]
  */
 LRESULT CALLBACK	PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, 
 				       LPARAM dwParam1, LPARAM dwParam2)
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 3060ac0d570..fd79b3c821c 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -52,7 +52,7 @@ typedef struct __type_info
 } type_info;
 
 /******************************************************************
- *		exception_ctor (MSVCRT.@)
+ *		??0exception@@QAE@ABQBD@Z (MSVCRT.@)
  */
 void MSVCRT_exception_ctor(exception * _this, const char ** name)
 {
@@ -64,7 +64,7 @@ void MSVCRT_exception_ctor(exception * _this, const char ** name)
 }
 
 /******************************************************************
- *		exception_copy_ctor (MSVCRT.@)
+ *		??0exception@@QAE@ABV0@@Z (MSVCRT.@)
  */
 void MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs)
 {
@@ -75,7 +75,7 @@ void MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs)
 }
 
 /******************************************************************
- *		exception_default_ctor (MSVCRT.@)
+ *		??0exception@@QAE@XZ (MSVCRT.@)
  */
 void MSVCRT_exception_default_ctor(exception * _this)
 {
@@ -86,7 +86,7 @@ void MSVCRT_exception_default_ctor(exception * _this)
 }
 
 /******************************************************************
- *		exception_dtor (MSVCRT.@)
+ *		??1exception@@UAE@XZ (MSVCRT.@)
  */
 void MSVCRT_exception_dtor(exception * _this)
 {
@@ -94,7 +94,7 @@ void MSVCRT_exception_dtor(exception * _this)
 }
 
 /******************************************************************
- *		exception_opequals (MSVCRT.@)
+ *		??4exception@@QAEAAV0@ABV0@@Z (MSVCRT.@)
  */
 exception * MSVCRT_exception_opequals(exception * _this, const exception * rhs)
 {
@@ -105,7 +105,7 @@ exception * MSVCRT_exception_opequals(exception * _this, const exception * rhs)
 }
 
 /******************************************************************
- *		exception__unknown_E (MSVCRT.@)
+ *		??_Eexception@@UAEPAXI@Z (MSVCRT.@)
  */
 void * MSVCRT_exception__unknown_E(exception * _this, unsigned int arg1)
 {
@@ -115,7 +115,7 @@ void * MSVCRT_exception__unknown_E(exception * _this, unsigned int arg1)
 }
 
 /******************************************************************
- *		exception__unknown_G (MSVCRT.@)
+ *		??_Gexception@@UAEPAXI@Z (MSVCRT.@)
  */
 void * MSVCRT_exception__unknown_G(exception * _this, unsigned int arg1)
 {
@@ -125,7 +125,7 @@ void * MSVCRT_exception__unknown_G(exception * _this, unsigned int arg1)
 }
 
 /******************************************************************
- *		exception_what (MSVCRT.@)
+ *		?what@exception@@UBEPBDXZ (MSVCRT.@)
  */
 const char * __stdcall MSVCRT_exception_what(exception * _this)
 {
@@ -138,7 +138,7 @@ static terminate_function func_terminate=NULL;
 static unexpected_function func_unexpected=NULL;
 
 /******************************************************************
- *		set_terminate (MSVCRT.@)
+ *		?set_terminate@@YAP6AXXZP6AXXZ@Z (MSVCRT.@)
  */
 terminate_function MSVCRT_set_terminate(terminate_function func)
 {
@@ -149,7 +149,7 @@ terminate_function MSVCRT_set_terminate(terminate_function func)
 }
 
 /******************************************************************
- *		set_unexpected (MSVCRT.@)
+ *		?set_unexpected@@YAP6AXXZP6AXXZ@Z (MSVCRT.@)
  */
 unexpected_function MSVCRT_set_unexpected(unexpected_function func)
 {
@@ -160,7 +160,7 @@ unexpected_function MSVCRT_set_unexpected(unexpected_function func)
 }
 
 /******************************************************************
- *		terminate (MSVCRT.@)
+ *		?terminate@@YAXXZ (MSVCRT.@)
  */
 void MSVCRT_terminate()
 {
@@ -168,7 +168,7 @@ void MSVCRT_terminate()
 }
 
 /******************************************************************
- *		unexpected (MSVCRT.@)
+ *		?unexpected@@YAXXZ (MSVCRT.@)
  */
 void MSVCRT_unexpected()
 {
@@ -177,7 +177,7 @@ void MSVCRT_unexpected()
 
 
 /******************************************************************
- *		bad_typeid_copy_ctor (MSVCRT.@)
+ *		??0bad_typeid@@QAE@ABV0@@Z (MSVCRT.@)
  */
 void MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs)
 {
@@ -186,7 +186,7 @@ void MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs)
 }
 
 /******************************************************************
- *		bad_typeid_ctor (MSVCRT.@)
+ *		??0bad_typeid@@QAE@PBD@Z (MSVCRT.@)
  */
 void MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name)
 {
@@ -196,7 +196,7 @@ void MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name)
 }
 
 /******************************************************************
- *		bad_typeid_dtor (MSVCRT.@)
+ *		??1bad_typeid@@UAE@XZ (MSVCRT.@)
  */
 void MSVCRT_bad_typeid_dtor(bad_typeid * _this)
 {
@@ -205,7 +205,7 @@ void MSVCRT_bad_typeid_dtor(bad_typeid * _this)
 }
 
 /******************************************************************
- *		bad_typeid_opequals (MSVCRT.@)
+ *		??4bad_typeid@@QAEAAV0@ABV0@@Z (MSVCRT.@)
  */
 bad_typeid * MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs)
 {
@@ -215,7 +215,7 @@ bad_typeid * MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * r
 }
 
 /******************************************************************
- *		__non_rtti_object_copy_ctor (MSVCRT.@)
+ *		??0__non_rtti_object@@QAE@ABV0@@Z (MSVCRT.@)
  */
 void MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this,
                                                 const __non_rtti_object * rhs)
@@ -225,7 +225,7 @@ void MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this,
 }
 
 /******************************************************************
- *		__non_rtti_object_ctor (MSVCRT.@)
+ *		??0__non_rtti_object@@QAE@PBD@Z (MSVCRT.@)
  */
 void MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this,
                                            const char * name)
@@ -236,7 +236,7 @@ void MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this,
 }
 
 /******************************************************************
- *		__non_rtti_object_dtor (MSVCRT.@)
+ *		??1__non_rtti_object@@UAE@XZ (MSVCRT.@)
  */
 void MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this)
 {
@@ -245,7 +245,7 @@ void MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this)
 }
 
 /******************************************************************
- *		__non_rtti_object_opequals (MSVCRT.@)
+ *		??4__non_rtti_object@@QAEAAV0@ABV0@@Z (MSVCRT.@)
  */
 __non_rtti_object * MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this,
                                                               const __non_rtti_object *rhs)
@@ -257,7 +257,7 @@ __non_rtti_object * MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this,
 }
 
 /******************************************************************
- *		__non_rtti_object__unknown_E (MSVCRT.@)
+ *		??_E__non_rtti_object@@UAEPAXI@Z (MSVCRT.@)
  */
 void * MSVCRT___non_rtti_object__unknown_E(__non_rtti_object * _this, unsigned int arg1)
 {
@@ -267,7 +267,7 @@ void * MSVCRT___non_rtti_object__unknown_E(__non_rtti_object * _this, unsigned i
 }
 
 /******************************************************************
- *		__non_rtti_object__unknown_G (MSVCRT.@)
+ *		??_G__non_rtti_object@@UAEPAXI@Z (MSVCRT.@)
  */
 void * MSVCRT___non_rtti_object__unknown_G(__non_rtti_object * _this, unsigned int arg1)
 {
@@ -277,7 +277,7 @@ void * MSVCRT___non_rtti_object__unknown_G(__non_rtti_object * _this, unsigned i
 }
 
 /******************************************************************
- *		bad_cast_ctor (MSVCRT.@)
+ *		??0bad_cast@@QAE@ABQBD@Z (MSVCRT.@)
  */
 void MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name)
 {
@@ -287,7 +287,7 @@ void MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name)
 }
 
 /******************************************************************
- *		bad_cast_copy_ctor (MSVCRT.@)
+ *		??0bad_cast@@QAE@ABV0@@Z (MSVCRT.@)
  */
 void MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs)
 {
@@ -296,7 +296,7 @@ void MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs)
 }
 
 /******************************************************************
- *		bad_cast_dtor (MSVCRT.@)
+ *		??1bad_cast@@UAE@XZ (MSVCRT.@)
  */
 void MSVCRT_bad_cast_dtor(bad_cast * _this)
 {
@@ -305,7 +305,7 @@ void MSVCRT_bad_cast_dtor(bad_cast * _this)
 }
 
 /******************************************************************
- *		bad_cast_opequals (MSVCRT.@)
+ *		??4bad_cast@@QAEAAV0@ABV0@@Z (MSVCRT.@)
  */
 bad_cast * MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs)
 {
@@ -315,7 +315,7 @@ bad_cast * MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs)
 }
 
 /******************************************************************
- *		type_info_opequals_equals (MSVCRT.@)
+ *		??8type_info@@QBEHABV0@@Z (MSVCRT.@)
  */
 int __stdcall MSVCRT_type_info_opequals_equals(type_info * _this, const type_info * rhs)
 {
@@ -324,7 +324,7 @@ int __stdcall MSVCRT_type_info_opequals_equals(type_info * _this, const type_inf
 }
 
 /******************************************************************
- *		type_info_opnot_equals (MSVCRT.@)
+ *		??9type_info@@QBEHABV0@@Z (MSVCRT.@)
  */
 int __stdcall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info * rhs)
 {
@@ -333,7 +333,7 @@ int __stdcall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info *
 }
 
 /******************************************************************
- *		type_info_dtor (MSVCRT.@)
+ *		??1type_info@@UAE@XZ (MSVCRT.@)
  */
 void MSVCRT_type_info_dtor(type_info * _this)
 {
@@ -343,7 +343,7 @@ void MSVCRT_type_info_dtor(type_info * _this)
 }
 
 /******************************************************************
- *		type_info_name (MSVCRT.@)
+ *		?name@type_info@@QBEPBDXZ (MSVCRT.@)
  */
 const char * __stdcall MSVCRT_type_info_name(type_info * _this)
 {
@@ -352,7 +352,7 @@ const char * __stdcall MSVCRT_type_info_name(type_info * _this)
 }
 
 /******************************************************************
- *		type_info_raw_name (MSVCRT.@)
+ *		?raw_name@type_info@@QBEPBDXZ (MSVCRT.@)
  */
 const char * __stdcall MSVCRT_type_info_raw_name(type_info * _this)
 {
diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c
index 762c45c1dba..6ad8113309e 100644
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -26,7 +26,7 @@ static int MSVCRT_new_mode;
 
 
 /*********************************************************************
- *		operator_new (MSVCRT.@)
+ *		??2@YAPAXI@Z (MSVCRT.@)
  */
 void* MSVCRT_operator_new(unsigned long size)
 {
@@ -40,7 +40,7 @@ void* MSVCRT_operator_new(unsigned long size)
 }
 
 /*********************************************************************
- *		operator_delete (MSVCRT.@)
+ *		??3@YAXPAX@Z (MSVCRT.@)
  */
 void MSVCRT_operator_delete(void *mem)
 {
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 77bc991810e..98d4442e791 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -359,7 +359,7 @@ BOOLEAN WINAPI RtlGetNtProductType(LPDWORD type)
 }
 
 /**************************************************************************
- *                 NTDLL_chkstk				[NTDLL.@]
+ *                 _chkstk				[NTDLL.@]
  *
  * Glorified "enter xxxx".
  */
@@ -369,7 +369,7 @@ void WINAPI NTDLL_chkstk( CONTEXT86 *context )
 }
 
 /**************************************************************************
- *                 NTDLL_alloca_probe		        [NTDLL.@]
+ *                 _alloca_probe		        [NTDLL.@]
  *
  * Glorified "enter xxxx".
  */
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index ce52d4a7283..8f2fd536383 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -104,7 +104,7 @@ BOOL WINAPI RtlEqualSid( PSID pSid1, PSID pSid2 )
 }
 
 /******************************************************************************
- * RtlEqualPrefixSid	[ntdll.]
+ * RtlEqualPrefixSid	[NTDLL.@]
  */
 BOOL WINAPI RtlEqualPrefixSid (PSID pSid1, PSID pSid2) 
 {
diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c
index e94699cd6b9..687c990268b 100644
--- a/dlls/ntdll/wcstring.c
+++ b/dlls/ntdll/wcstring.c
@@ -24,7 +24,7 @@ DEFAULT_DEBUG_CHANNEL(ntdll);
 
 
 /*********************************************************************
- *           NTDLL__wcsicmp    (NTDLL)
+ *           _wcsicmp    (NTDLL.@)
  */
 INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 )
 {
@@ -33,7 +33,7 @@ INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 )
 
 
 /*********************************************************************
- *           NTDLL__wcslwr    (NTDLL)
+ *           _wcslwr    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str )
 {
@@ -42,7 +42,7 @@ LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str )
 
 
 /*********************************************************************
- *           NTDLL__wcsnicmp    (NTDLL)
+ *           _wcsnicmp    (NTDLL.@)
  */
 INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n )
 {
@@ -51,7 +51,7 @@ INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n )
 
 
 /*********************************************************************
- *           NTDLL__wcsupr    (NTDLL)
+ *           _wcsupr    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str )
 {
@@ -60,7 +60,7 @@ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str )
 
 
 /*********************************************************************
- *           NTDLL_towlower    (NTDLL)
+ *           towlower    (NTDLL.@)
  */
 WCHAR __cdecl NTDLL_towlower( WCHAR ch )
 {
@@ -69,7 +69,7 @@ WCHAR __cdecl NTDLL_towlower( WCHAR ch )
 
 
 /*********************************************************************
- *           NTDLL_towupper    (NTDLL)
+ *           towupper    (NTDLL.@)
  */
 WCHAR __cdecl NTDLL_towupper( WCHAR ch )
 {
@@ -78,7 +78,7 @@ WCHAR __cdecl NTDLL_towupper( WCHAR ch )
 
 
 /***********************************************************************
- *           NTDLL_wcscat    (NTDLL)
+ *           wcscat    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src )
 {
@@ -87,7 +87,7 @@ LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src )
 
 
 /*********************************************************************
- *           NTDLL_wcschr    (NTDLL)
+ *           wcschr    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch )
 {
@@ -96,7 +96,7 @@ LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch )
 
 
 /*********************************************************************
- *           NTDLL_wcscmp    (NTDLL)
+ *           wcscmp    (NTDLL.@)
  */
 INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 )
 {
@@ -105,7 +105,7 @@ INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 )
 
 
 /***********************************************************************
- *           NTDLL_wcscpy    (NTDLL)
+ *           wcscpy    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src )
 {
@@ -114,7 +114,7 @@ LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src )
 
 
 /*********************************************************************
- *           NTDLL_wcscspn    (NTDLL)
+ *           wcscspn    (NTDLL.@)
  */
 INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject )
 {
@@ -131,7 +131,7 @@ INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject )
 
 
 /***********************************************************************
- *           NTDLL_wcslen    (NTDLL)
+ *           wcslen    (NTDLL.@)
  */
 INT __cdecl NTDLL_wcslen( LPCWSTR str )
 {
@@ -140,7 +140,7 @@ INT __cdecl NTDLL_wcslen( LPCWSTR str )
 
 
 /*********************************************************************
- *           NTDLL_wcsncat    (NTDLL)
+ *           wcsncat    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT n )
 {
@@ -153,7 +153,7 @@ LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT n )
 
 
 /*********************************************************************
- *           NTDLL_wcsncmp    (NTDLL)
+ *           wcsncmp    (NTDLL.@)
  */
 INT __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n )
 {
@@ -162,7 +162,7 @@ INT __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n )
 
 
 /*********************************************************************
- *           NTDLL_wcsncpy    (NTDLL)
+ *           wcsncpy    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, INT n )
 {
@@ -171,7 +171,7 @@ LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, INT n )
 
 
 /*********************************************************************
- *           NTDLL_wcspbrk    (NTDLL)
+ *           wcspbrk    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept )
 {
@@ -186,7 +186,7 @@ LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept )
 
 
 /*********************************************************************
- *           NTDLL_wcsrchr    (NTDLL)
+ *           wcsrchr    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch )
 {
@@ -201,7 +201,7 @@ LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch )
 
 
 /*********************************************************************
- *           NTDLL_wcsspn    (NTDLL)
+ *           wcsspn    (NTDLL.@)
  */
 INT __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept )
 {
@@ -218,7 +218,7 @@ INT __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept )
 
 
 /*********************************************************************
- *           NTDLL_wcsstr    (NTDLL)
+ *           wcsstr    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcsstr( LPCWSTR str, LPCWSTR sub )
 {
@@ -227,7 +227,7 @@ LPWSTR __cdecl NTDLL_wcsstr( LPCWSTR str, LPCWSTR sub )
 
 
 /*********************************************************************
- *           NTDLL_wcstok    (NTDLL)
+ *           wcstok    (NTDLL.@)
  */
 LPWSTR __cdecl NTDLL_wcstok( LPWSTR str, LPCWSTR delim )
 {
@@ -248,7 +248,7 @@ LPWSTR __cdecl NTDLL_wcstok( LPWSTR str, LPCWSTR delim )
 
 
 /*********************************************************************
- *           NTDLL_wcstombs    (NTDLL)
+ *           wcstombs    (NTDLL.@)
  */
 INT __cdecl NTDLL_wcstombs( LPSTR dst, LPCWSTR src, INT n )
 {
@@ -261,7 +261,7 @@ INT __cdecl NTDLL_wcstombs( LPSTR dst, LPCWSTR src, INT n )
 
 
 /*********************************************************************
- *           NTDLL_mbstowcs    (NTDLL)
+ *           mbstowcs    (NTDLL.@)
  */
 INT __cdecl NTDLL_mbstowcs( LPWSTR dst, LPCSTR src, INT n )
 {
@@ -289,7 +289,7 @@ INT __cdecl NTDLL_wcstol(LPWSTR s,LPWSTR *end,INT base)
 
 
 /*********************************************************************
- *           NTDLL_iswctype    (NTDLL)
+ *           iswctype    (NTDLL.@)
  */
 INT __cdecl NTDLL_iswctype( WCHAR wc, WCHAR wct )
 {
@@ -298,7 +298,7 @@ INT __cdecl NTDLL_iswctype( WCHAR wc, WCHAR wct )
 
 
 /*********************************************************************
- *           NTDLL_iswalpha    (NTDLL)
+ *           iswalpha    (NTDLL.@)
  */
 INT __cdecl NTDLL_iswalpha( WCHAR wc )
 {
@@ -501,7 +501,7 @@ int __cdecl _snwprintf(WCHAR *str, unsigned int len, const WCHAR *format, ...)
 
 
 /***********************************************************************
- *        NTDLL_swprintf (NTDLL)
+ *        swprintf (NTDLL.@)
  */
 int __cdecl NTDLL_swprintf(WCHAR *str, const WCHAR *format, ...)
 {
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index b291b8a4675..894538f01d0 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -177,7 +177,7 @@ DWORD WINAPI CoBuildVersion(void)
 }
 
 /******************************************************************************
- *		CoInitialize16	[COMPOBJ.2]
+ *		CoInitialize	[COMPOBJ.2]
  * Set the win16 IMalloc used for memory management
  */
 HRESULT WINAPI CoInitialize16(
@@ -274,7 +274,7 @@ HRESULT WINAPI CoInitializeEx(
 }
 
 /***********************************************************************
- *           CoUninitialize16   [COMPOBJ.3]
+ *           CoUninitialize   [COMPOBJ.3]
  * Don't know what it does. 
  * 3-Nov-98 -- this was originally misspelled, I changed it to what I
  *   believe is the correct spelling
@@ -331,7 +331,7 @@ void WINAPI CoUninitialize(void)
 }
 
 /***********************************************************************
- *           CoGetMalloc16    [COMPOBJ.4]
+ *           CoGetMalloc    [COMPOBJ.4]
  * RETURNS
  *	The current win16 IMalloc
  */
@@ -362,7 +362,7 @@ HRESULT WINAPI CoGetMalloc(
 }
 
 /***********************************************************************
- *           CoCreateStandardMalloc16 [COMPOBJ.71]
+ *           CoCreateStandardMalloc [COMPOBJ.71]
  */
 HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext,
 					  LPMALLOC16 *lpMalloc)
@@ -383,7 +383,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved )
 }
 
 /***********************************************************************
- *           IsEqualGUID16 [COMPOBJ.18]
+ *           IsEqualGUID [COMPOBJ.18]
  *
  * Compares two Unique Identifiers.
  *
@@ -398,7 +398,7 @@ BOOL16 WINAPI IsEqualGUID16(
 }
 
 /******************************************************************************
- *		CLSIDFromString16	[COMPOBJ.20]
+ *		CLSIDFromString	[COMPOBJ.20]
  * Converts a unique identifier from its string representation into 
  * the GUID struct.
  *
@@ -569,7 +569,7 @@ static HRESULT WINE_StringFromCLSID(
 }
 
 /******************************************************************************
- *		StringFromCLSID16	[COMPOBJ.19]
+ *		StringFromCLSID	[COMPOBJ.19]
  * Converts a GUID into the respective string representation.
  * The target string is allocated using the OLE IMalloc.
  * RETURNS
@@ -638,7 +638,8 @@ HRESULT WINAPI StringFromCLSID(
 }
 
 /******************************************************************************
- *		StringFromGUID2	[COMPOBJ.76] [OLE32.152]
+ *		StringFromGUID2	[COMPOBJ.76]
+ *		StringFromGUID2	[OLE32.152]
  *
  * Converts a global unique identifier into a string of an API-
  * specified fixed format. (The usual {.....} stuff.)
@@ -710,7 +711,7 @@ HRESULT WINAPI ProgIDFromCLSID(
 }
 
 /******************************************************************************
- *		CLSIDFromProgID16	[COMPOBJ.61]
+ *		CLSIDFromProgID	[COMPOBJ.61]
  * Converts a program id into the respective GUID. (By using a registry lookup)
  * RETURNS
  *	riid associated with the progid
@@ -891,7 +892,7 @@ HRESULT WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
 
 /* FIXME: this function is not declared in the WINELIB headers. But where should it go ? */
 /***********************************************************************
- *           CallObjectInWOW (COMPOBJ.201)
+ *           CALLOBJECTINWOW (COMPOBJ.201)
  */
 HRESULT WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
 	FIXME("(%p,%p),stub!\n",p1,p2);
@@ -899,7 +900,7 @@ HRESULT WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
 }
 
 /******************************************************************************
- *		CoRegisterClassObject16	[COMPOBJ.5]
+ *		CoRegisterClassObject	[COMPOBJ.5]
  *
  * Don't know where it registers it ...
  */
@@ -922,7 +923,7 @@ HRESULT WINAPI CoRegisterClassObject16(
 
 
 /******************************************************************************
- *      CoRevokeClassObject16 [COMPOBJ.6]
+ *      CoRevokeClassObject [COMPOBJ.6]
  *
  */
 HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class obj */
@@ -1365,7 +1366,7 @@ HRESULT WINAPI GetClassFile(LPOLESTR filePathName,CLSID *pclsid)
     return MK_E_INVALIDEXTENSION;
 }
 /******************************************************************************
- *		CoRegisterMessageFilter16	[COMPOBJ.27]
+ *		CoRegisterMessageFilter	[COMPOBJ.27]
  */
 HRESULT WINAPI CoRegisterMessageFilter16(
 	LPMESSAGEFILTER lpMessageFilter,
@@ -1684,7 +1685,7 @@ HRESULT WINAPI CoInitializeWOW(DWORD x,DWORD y) {
 }
 
 /******************************************************************************
- *		CoLockObjectExternal16	[COMPOBJ.63]
+ *		CoLockObjectExternal	[COMPOBJ.63]
  */
 HRESULT WINAPI CoLockObjectExternal16(
     LPUNKNOWN pUnk,		/* [in] object to be locked */
@@ -1725,7 +1726,7 @@ HRESULT WINAPI CoLockObjectExternal(
 }
 
 /***********************************************************************
- *           CoGetState16 [COMPOBJ.115]
+ *           CoGetState [COMPOBJ.115]
  */
 HRESULT WINAPI CoGetState16(LPDWORD state)
 {
@@ -1974,7 +1975,7 @@ static void COM_ExternalLockDelete(
 }
 
 /***********************************************************************
- *      COMPOBJ_DllEntryPoint                   [COMPOBJ.entry]
+ *      DllEntryPoint                   [COMPOBJ.116]
  *
  *    Initialization code for the COMPOBJ DLL
  *
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index e26e8ea5a51..53a3e6691d1 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -1301,7 +1301,7 @@ HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
 }
 
 /******************************************************************************
- *        CreateFileMoniker16 (OLE2.28)
+ *        CreateFileMoniker (OLE2.28)
  ******************************************************************************/
 HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName,LPMONIKER* ppmk)
 {
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 991a5f6390a..9c217f88409 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -455,7 +455,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObjectIndex(RunningObjectTableImpl* Thi
 }
 
 /******************************************************************************
- *		GetRunningObjectTable16	[OLE2.30]
+ *		GetRunningObjectTable	[OLE2.30]
  */
 HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
 {
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index dd0087365d2..ea927cecc36 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -153,7 +153,8 @@ DWORD WINAPI OleBuildVersion(void)
 }
 
 /***********************************************************************
- *           OleInitialize       (OLE2.2) (OLE32.108)
+ *           OleInitialize       (OLE2.2)
+ *           OleInitialize       (OLE32.108)
  */
 HRESULT WINAPI OleInitialize(LPVOID reserved)
 {
@@ -213,7 +214,8 @@ HRESULT WINAPI OleInitialize(LPVOID reserved)
 }
 
 /******************************************************************************
- *		CoGetCurrentProcess	[COMPOBJ.34] [OLE2.2][OLE32.108]
+ *		CoGetCurrentProcess	[COMPOBJ.34]
+ *		CoGetCurrentProcess	[OLE32.18]
  *
  * NOTES
  *   Is DWORD really the correct return type for this function?
@@ -224,7 +226,8 @@ DWORD WINAPI CoGetCurrentProcess(void)
 }
 
 /******************************************************************************
- *		OleUninitialize	[OLE2.3] [OLE32.131]
+ *		OleUninitialize	[OLE2.3]
+ *		OleUninitialize	[OLE32.131]
  */
 void WINAPI OleUninitialize(void)
 {
@@ -290,7 +293,7 @@ HRESULT WINAPI OleInitializeWOW(DWORD x) {
 }
 
 /***********************************************************************
- *           RegisterDragDrop16 (OLE2.35)
+ *           RegisterDragDrop (OLE2.35)
  */
 HRESULT WINAPI RegisterDragDrop16(
 	HWND16 hwnd,
@@ -344,7 +347,7 @@ HRESULT WINAPI RegisterDragDrop(
 }
 
 /***********************************************************************
- *           RevokeDragDrop16 (OLE2.36)
+ *           RevokeDragDrop (OLE2.36)
  */
 HRESULT WINAPI RevokeDragDrop16(
 	HWND16 hwnd
diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c
index 61ec4707259..20acaffcf26 100644
--- a/dlls/ole32/ole2nls.c
+++ b/dlls/ole32/ole2nls.c
@@ -28,7 +28,7 @@ DEFAULT_DEBUG_CHANNEL(ole);
 static LPVOID lpNLSInfo = NULL;
 
 /******************************************************************************
- *		GetLocaleInfo16	[OLE2NLS.5]
+ *		GetLocaleInfoA	[OLE2NLS.5]
  * Is the last parameter really WORD for Win16?
  */
 INT16 WINAPI GetLocaleInfo16(LCID lcid,LCTYPE LCType,LPSTR buf,INT16 len)
@@ -37,7 +37,7 @@ INT16 WINAPI GetLocaleInfo16(LCID lcid,LCTYPE LCType,LPSTR buf,INT16 len)
 }
 
 /******************************************************************************
- *		GetStringType16	[OLE2NLS.7]
+ *		GetStringTypeA	[OLE2NLS.7]
  */
 BOOL16 WINAPI GetStringType16(LCID locale,DWORD dwInfoType,LPCSTR src,
                               INT16 cchSrc,LPWORD chartype)
@@ -87,7 +87,7 @@ INT16 LCMapString16(LCID lcid, DWORD mapflags, LPCSTR srcstr, INT16 srclen,
 }
 
 /***********************************************************************
- *           CompareString16       (OLE2NLS.8)
+ *           CompareStringA       (OLE2NLS.8)
  */
 UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle,
                               LPCSTR s1,DWORD l1,LPCSTR s2,DWORD l2)
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index 6f75a99db91..5bf8f2a16cc 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -1561,7 +1561,7 @@ static void _create_istorage16(LPSTORAGE16 *stg) {
  */
 
 /******************************************************************************
- *		StgCreateDocFile16	[STORAGE.1]
+ *		StgCreateDocFileA	[STORAGE.1]
  */
 HRESULT WINAPI StgCreateDocFile16(
 	LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen
@@ -1606,7 +1606,7 @@ HRESULT WINAPI StgCreateDocFile16(
 }
 
 /******************************************************************************
- * StgIsStorageFile16 [STORAGE.5]
+ * StgIsStorageFile [STORAGE.5]
  */
 HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
 	HFILE		hf;
@@ -1657,7 +1657,7 @@ StgIsStorageFile(LPCOLESTR fn)
 
 
 /******************************************************************************
- * StgOpenStorage16 [STORAGE.3]
+ * StgOpenStorage [STORAGE.3]
  */
 HRESULT WINAPI StgOpenStorage16(
 	LPCOLESTR16 pwcsName,IStorage16 *pstgPriority,DWORD grfMode,
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index a2afae6cc6f..8e64c0384e6 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -49,7 +49,7 @@ static void* BSTR_GetAddr(BSTR16 in)
 }
 
 /******************************************************************************
- *		SysAllocString16	[OLE2DISP.2]
+ *		SysAllocString	[OLE2DISP.2]
  */
 BSTR16 WINAPI SysAllocString16(LPCOLESTR16 in)
 {
@@ -75,7 +75,7 @@ BSTR WINAPI SysAllocString(LPCOLESTR in)
 }
 
 /******************************************************************************
- *		SysReAllocString16	[OLE2DISP.3]
+ *		SysReallocString	[OLE2DISP.3]
  */
 INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPCOLESTR16 in)
 {
@@ -111,7 +111,7 @@ INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR in)
 }
 
 /******************************************************************************
- *		SysAllocStringLen16	[OLE2DISP.4]
+ *		SysAllocStringLen	[OLE2DISP.4]
  */
 BSTR16 WINAPI SysAllocStringLen16(const char *in, int len)
 {
@@ -201,7 +201,7 @@ BSTR WINAPI SysAllocStringLen(const OLECHAR *in, unsigned int len)
 }
 
 /******************************************************************************
- *		SysReAllocStringLen16	[OLE2DISP.5]
+ *		SysReAllocStringLen	[OLE2DISP.5]
  */
 int WINAPI SysReAllocStringLen16(BSTR16 *old,const char *in,int len)
 {
@@ -238,7 +238,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* in, unsigned int len)
 }
 
 /******************************************************************************
- *		SysFreeString16	[OLE2DISP.6]
+ *		SysFreeString	[OLE2DISP.6]
  */
 void WINAPI SysFreeString16(BSTR16 in)
 {
@@ -271,7 +271,7 @@ void WINAPI SysFreeString(BSTR in)
 }
 
 /******************************************************************************
- *		SysStringLen16	[OLE2DISP.7]
+ *		SysStringLen	[OLE2DISP.7]
  */
 int WINAPI SysStringLen16(BSTR16 str)
 {
@@ -327,7 +327,7 @@ int WINAPI SysStringByteLen(BSTR str)
 }
 
 /******************************************************************************
- * CreateDispTypeInfo16 [OLE2DISP.31]
+ * CreateDispTypeInfo [OLE2DISP.31]
  */
 HRESULT WINAPI CreateDispTypeInfo16(
 	INTERFACEDATA *pidata,
@@ -351,7 +351,7 @@ HRESULT WINAPI CreateDispTypeInfo(
 }
 
 /******************************************************************************
- * CreateStdDispatch16 [OLE2DISP.32]
+ * CreateStdDispatch [OLE2DISP.32]
  */
 HRESULT WINAPI CreateStdDispatch16(
         IUnknown* punkOuter,
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 0e1311b80d9..d995e036d9c 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -58,7 +58,7 @@ DEFAULT_DEBUG_CHANNEL(ole);
 DECLARE_DEBUG_CHANNEL(typelib);
 
 /****************************************************************************
- *		QueryPathOfRegTypeLib16	[TYPELIB.14]
+ *		QueryPathOfRegTypeLib	[TYPELIB.14]
  *
  * the path is "Classes\Typelib\<guid>\<major>.<minor>\<lcid>\win16\"
  * RETURNS
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index bf3a6bb4136..633cbd30a28 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -2976,7 +2976,7 @@ HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut) {
 }
 
 /******************************************************************************
- *		VarDateFromUI1		[OLEAUT32.]
+ *		VarDateFromUI1		[OLEAUT32.88]
  */
 HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut)
 {
diff --git a/dlls/olecli/olecli_main.c b/dlls/olecli/olecli_main.c
index 4e708e57762..40380f039e1 100644
--- a/dlls/olecli/olecli_main.c
+++ b/dlls/olecli/olecli_main.c
@@ -27,7 +27,7 @@ OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc)
 }
 
 /******************************************************************************
- *		OleSavedClientDoc16	[OLECLI.45]
+ *		OleSavedClientDoc	[OLECLI.45]
  */
 OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc)
 {
@@ -36,7 +36,7 @@ OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc)
 }
 
 /******************************************************************************
- *		OleRegisterClientDoc16	[OLECLI.41]
+ *		OleRegisterClientDoc	[OLECLI.41]
  */
 OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
                                         LONG reserved, LHCLIENTDOC *hRet )
@@ -58,7 +58,7 @@ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
 }
 
 /******************************************************************************
- *		OleRenameClientDoc16	[OLECLI.43]
+ *		OleRenameClientDoc	[OLECLI.43]
  */
 OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
 {
@@ -76,7 +76,7 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
 }
 
 /******************************************************************************
- *		OleRevokeClientDoc16	[OLECLI.42]
+ *		OleRevokeClientDoc	[OLECLI.42]
  */
 OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
 {
@@ -94,7 +94,7 @@ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
 }
 
 /******************************************************************************
- *		OleRevertClientDoc16	[OLECLI.44]
+ *		OleRevertClientDoc	[OLECLI.44]
  */
 OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
 {
@@ -103,7 +103,7 @@ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
 }
 
 /******************************************************************************
- *		OleEnumObjects16	[OLECLI.47]
+ *		OleEnumObjects	[OLECLI.47]
  */
 OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data)
 {
@@ -113,7 +113,7 @@ OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data)
 }
 
 /******************************************************************************
- *	     OleCreateLinkFromClip16	[OLECLI.11]
+ *	     OleCreateLinkFromClip	[OLECLI.11]
  */
 OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc,
                                           LPCSTR xname, SEGPTR lpoleob, UINT16 render,
@@ -138,7 +138,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip(
 }
 
 /******************************************************************************
- *           OleQueryLinkFromClip16	[OLECLI.9]
+ *           OleQueryLinkFromClip	[OLECLI.9]
  */
 OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat)
 {
@@ -155,7 +155,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFO
 }
 
 /******************************************************************************
- *           OleQueryCreateFromClip16	[OLECLI.10]
+ *           OleQueryCreateFromClip	[OLECLI.10]
  */
 OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat)
 {
@@ -182,7 +182,7 @@ BOOL WINAPI OleIsDcMeta(HDC hdc)
 
 
 /******************************************************************************
- *		OleIsDcMeta16	[OLECLI.60]
+ *		OleIsDcMeta	[OLECLI.60]
  */
 BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
 {
@@ -199,7 +199,7 @@ OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
 }
 
 /******************************************************************************
- *		OleQueryType16	[OLECLI.14]
+ *		OleQueryType	[OLECLI.14]
  */
 OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob,  SEGPTR xlong) {
 	FIXME("(%p, %p): stub!\n", oleob, MapSL(xlong));
@@ -219,7 +219,7 @@ OLESTATUS WINAPI OleQueryType(LPOLEOBJECT oleob,LONG*xlong) {
 }
 
 /******************************************************************************
- *		OleCreateFromClip16	[OLECLI.12]
+ *		OleCreateFromClip	[OLECLI.12]
  */
 OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc,
                                       LPCSTR xname, SEGPTR lpoleob,
diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c
index 60ca0d60b62..6b7018dbb4e 100644
--- a/dlls/olepro32/olepro32stubs.c
+++ b/dlls/olepro32/olepro32stubs.c
@@ -14,7 +14,7 @@
 DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
- *		OLEPRO32_DllUnregisterServer (OLEPRO32.258)
+ *		DllUnregisterServer (OLEPRO32.258)
  */
 HRESULT WINAPI OLEPRO32_DllUnregisterServer()
 {
@@ -23,7 +23,7 @@ HRESULT WINAPI OLEPRO32_DllUnregisterServer()
 }
 
 /***********************************************************************
- *		OLEPRO32_DllRegisterServer (OLEPRO32.257)
+ *		DllRegisterServer (OLEPRO32.257)
  */
 HRESULT WINAPI OLEPRO32_DllRegisterServer()
 {
@@ -32,7 +32,7 @@ HRESULT WINAPI OLEPRO32_DllRegisterServer()
 }
 
 /***********************************************************************
- *		OLEPRO32_DllCanUnloadNow (OLEPRO32.255)
+ *		DllCanUnloadNow (OLEPRO32.255)
  */
 HRESULT WINAPI OLEPRO32_DllCanUnloadNow( )
 {
@@ -41,7 +41,7 @@ HRESULT WINAPI OLEPRO32_DllCanUnloadNow( )
 }
 
 /***********************************************************************
- *		OLEPRO32_DllGetClassObject (OLEPRO32.256)
+ *		DllGetClassObject (OLEPRO32.256)
  */
 HRESULT WINAPI OLEPRO32_DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
 {
diff --git a/dlls/olesvr/olesvr_main.c b/dlls/olesvr/olesvr_main.c
index c6baef7bf60..55b2d7126da 100644
--- a/dlls/olesvr/olesvr_main.c
+++ b/dlls/olesvr/olesvr_main.c
@@ -18,7 +18,7 @@ DEFAULT_DEBUG_CHANNEL(ole);
 static LONG OLE_current_handle;
 
 /******************************************************************************
- *		OleRegisterServer16	[OLESVR.2]
+ *		OleRegisterServer	[OLESVR.2]
  */
 OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct,
                                       LHSERVER *hRet, HINSTANCE16 hServer,
@@ -31,7 +31,7 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct,
 }
 
 /******************************************************************************
- *		OleBlockServer16	[OLESVR.4]
+ *		OleBlockServer	[OLESVR.4]
  */
 OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
 {
@@ -49,7 +49,7 @@ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer)
 }
 
 /******************************************************************************
- *		OleUnblockServer16	[OLESVR.5]
+ *		OleUnblockServer	[OLESVR.5]
  */
 OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
 {
@@ -71,7 +71,7 @@ OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block)
 }
 
 /***********************************************************************
- *		OleRegisterServerDoc16	[OLESVR.6]
+ *		OleRegisterServerDoc	[OLESVR.6]
  */
 OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
                                          LPOLESERVERDOC document,
@@ -83,7 +83,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
 }
 
 /******************************************************************************
- *		OleRevokeServerDoc16	[OLESVR.7]
+ *		OleRevokeServerDoc	[OLESVR.7]
  */
 OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
 {
diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c
index 2b89025ac0a..5c502c4cc7f 100644
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@@ -60,7 +60,7 @@ SERIALUI_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
 
 /***********************************************************************
- * SERIALUI_EnumPropPages (SERIALUI.2)
+ * EnumPropPages (SERIALUI.2)
  *
  * Called by the device manager to add prop sheets in Control Panel ???
  * Pointed to in Win98 registry by 
@@ -384,7 +384,7 @@ BOOL WINAPI SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 }
 
 /***********************************************************************
- * SERIALUI_CommConfigDialog (SERIALUI.3)
+ * drvCommConfigDialog (SERIALUI.3)
  *
  * Used by Win9x KERNEL to show a dialog for configuring a COMM port.
  */
@@ -414,7 +414,7 @@ static LPCSTR lpszCommKey = "System\\CurrentControlSet\\Services\\Class\\Ports";
 static LPCSTR lpszDCB     = "DCB";
 
 /***********************************************************************
- * SERIALUI_SetDefaultCommConfig (SERIALUI.4)
+ * drvSetDefaultCommConfig (SERIALUI.4)
  *
  * Used by Win98 KERNEL to set the default config for a COMM port
  * FIXME: uses the wrong registry key... should use a digit, not
@@ -458,7 +458,7 @@ BOOL WINAPI SERIALUI_SetDefaultCommConfig(
 }
 
 /***********************************************************************
- * SERIALUI_GetDefaultCommConfig (SERIALUI.5)
+ * drvGetDefaultCommConfig (SERIALUI.5)
  *
  * Used by Win9x KERNEL to get the default config for a COMM port
  * FIXME: uses the wrong registry key... should use a digit, not
diff --git a/dlls/setupapi/infparse.c b/dlls/setupapi/infparse.c
index 0e330308066..379ebb41dba 100644
--- a/dlls/setupapi/infparse.c
+++ b/dlls/setupapi/infparse.c
@@ -96,7 +96,7 @@ RETERR16 IP_CloseInf(HINF16 hInf)
 }
 
 /***********************************************************************
- *		IpOpen16 (SETUPX.2)
+ *		IpOpen (SETUPX.2)
  *
  */
 RETERR16 WINAPI IpOpen16(LPCSTR lpInfFileName, HINF16 *lphInf)
@@ -106,7 +106,7 @@ RETERR16 WINAPI IpOpen16(LPCSTR lpInfFileName, HINF16 *lphInf)
 }
 
 /***********************************************************************
- *		IpClose16 (SETUPX.4)
+ *		IpClose (SETUPX.4)
  */
 RETERR16 WINAPI IpClose16(HINF16 hInf)
 {
@@ -114,7 +114,7 @@ RETERR16 WINAPI IpClose16(HINF16 hInf)
 }
 
 /***********************************************************************
- *		IpGetProfileString16 (SETUPX.210)
+ *		IpGetProfileString (SETUPX.210)
  */
 RETERR16 WINAPI IpGetProfileString16(HINF16 hInf, LPCSTR section, LPCSTR entry, LPSTR buffer, WORD buflen) 
 {
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 439dd5d6fa0..bf180d2c2ab 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -269,7 +269,7 @@ void WINAPI SHChangeNotifyA (LONG wEventId, UINT  uFlags, LPCVOID dwItem1, LPCVO
 }
 
 /*************************************************************************
- * SHChangeNotifyAW				[SHELL32.@]
+ * SHChangeNotify				[SHELL32.@]
  */
 void WINAPI SHChangeNotifyAW (LONG wEventId, UINT  uFlags, LPCVOID dwItem1, LPCVOID dwItem2)
 {
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 1658ea52995..8291a7c5833 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -369,7 +369,7 @@ INT WINAPI Shell_GetCachedImageIndexAW(LPCVOID szPath, INT nIndex, BOOL bSimulat
 }
 
 /*************************************************************************
- * ExtractIconEx			[shell32.189]
+ * ExtractIconEx			[SHELL32.@]
  */
 HICON WINAPI ExtractIconExAW ( LPCVOID lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons )
 {	if (SHELL_OsIsUnicode())
@@ -377,7 +377,7 @@ HICON WINAPI ExtractIconExAW ( LPCVOID lpszFile, INT nIconIndex, HICON * phiconL
 	return ExtractIconExA ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 /*************************************************************************
- * ExtractIconExA			[shell32.190]
+ * ExtractIconExA			[SHELL32.@]
  * RETURNS
  *  0 no icon found 
  *  1 file is not valid
@@ -414,7 +414,7 @@ HICON WINAPI ExtractIconExA ( LPCSTR lpszFile, INT nIconIndex, HICON * phiconLar
 	return ret;
 }
 /*************************************************************************
- * ExtractIconExW			[shell32.191]
+ * ExtractIconExW			[SHELL32.@]
  */
 HICON WINAPI ExtractIconExW ( LPCWSTR lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons )
 {	LPSTR sFile;
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 5624d796b9c..806395cd0dc 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1102,7 +1102,7 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI
 }
 
 /*************************************************************************
- * SHGetPathFromIDListAW		[SHELL32.@][NT 4.0: SHELL32.219]
+ * SHGetPathFromIDList		[SHELL32.@][NT 4.0: SHELL32.219]
  */
 BOOL WINAPI SHGetPathFromIDListAW(LPCITEMIDLIST pidl,LPVOID pszPath)
 {
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index e2d2e2639f3..66d7e3efbb2 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -45,7 +45,7 @@ HINSTANCE SHELL_hInstance32;
 static int SHELL_Attach = 0;
 
 /***********************************************************************
- * SHELL_DllEntryPoint [SHELL.entry]
+ * DllEntryPoint [SHELL.101]
  *
  * Initialization code for shell.dll. Automatically loads the
  * 32-bit shell32.dll to allow thunking up to 32-bit code.
@@ -86,7 +86,7 @@ BOOL WINAPI SHELL_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst,
 }
 
 /*************************************************************************
- *				DragAcceptFiles16		[SHELL.9]
+ *				DragAcceptFiles		[SHELL.9]
  */
 void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b)
 {
@@ -94,7 +94,7 @@ void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b)
 }
 
 /*************************************************************************
- *				DragQueryFile16		[SHELL.11]
+ *				DragQueryFile		[SHELL.11]
  */
 UINT16 WINAPI DragQueryFile16(
 	HDROP16 hDrop,
@@ -134,7 +134,7 @@ end:
 }
 
 /*************************************************************************
- *				DragFinish16		[SHELL.12]
+ *				DragFinish		[SHELL.12]
  */
 void WINAPI DragFinish16(HDROP16 h)
 {
@@ -144,7 +144,7 @@ void WINAPI DragFinish16(HDROP16 h)
 
 
 /*************************************************************************
- *				DragQueryPoint16		[SHELL.13]
+ *				DragQueryPoint		[SHELL.13]
  */
 BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p)
 {
@@ -328,7 +328,7 @@ HINSTANCE SHELL_FindExecutable( LPCSTR lpFile,
 }
 
 /*************************************************************************
- *				ShellExecute16		[SHELL.20]
+ *				ShellExecute		[SHELL.20]
  */
 HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
                                    LPCSTR lpFile, LPCSTR lpParameters,
@@ -454,7 +454,7 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation,
 }
 
 /*************************************************************************
- *             FindExecutable16   (SHELL.21)
+ *             FindExecutable   (SHELL.21)
  */
 HINSTANCE16 WINAPI FindExecutable16( LPCSTR lpFile, LPCSTR lpDirectory,
                                      LPSTR lpResult )
@@ -463,7 +463,7 @@ HINSTANCE16 WINAPI FindExecutable16( LPCSTR lpFile, LPCSTR lpDirectory,
 
 
 /*************************************************************************
- *             AboutDlgProc16   (SHELL.33)
+ *             AboutDlgProc   (SHELL.33)
  */
 BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam,
                                LPARAM lParam )
@@ -472,7 +472,7 @@ BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam,
 
 
 /*************************************************************************
- *             ShellAbout16   (SHELL.22)
+ *             ShellAbout   (SHELL.22)
  */
 BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
                             HICON16 hIcon )
@@ -551,7 +551,7 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance,
 }
 
 /*************************************************************************
- *             ExtractIcon16   (SHELL.34)
+ *             ExtractIcon   (SHELL.34)
  */
 HICON16 WINAPI ExtractIcon16( HINSTANCE16 hInstance, LPCSTR lpszExeFileName,
 	UINT16 nIconIndex )
@@ -560,7 +560,7 @@ HICON16 WINAPI ExtractIcon16( HINSTANCE16 hInstance, LPCSTR lpszExeFileName,
 }
 
 /*************************************************************************
- *             ExtractIconEx16   (SHELL.40)
+ *             ExtractIconEx   (SHELL.40)
  */
 HICON16 WINAPI ExtractIconEx16(
 	LPCSTR lpszFile, INT16 nIconIndex, HICON16 *phiconLarge,
@@ -818,7 +818,7 @@ BOOL WINAPI RegisterShellHook16(HWND16 hWnd, UINT16 uAction)
 
 
 /***********************************************************************
- *           DriveType16   (SHELL.262)
+ *           DriveType   (SHELL.262)
  */
 UINT16 WINAPI DriveType16( UINT16 drive )
 {
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 0884ca66ae6..7ac47722466 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -340,7 +340,7 @@ DWORD WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
 }
 
 /*************************************************************************
- * SHGetFileInfoAW			[SHELL32.@]
+ * SHGetFileInfo			[SHELL32.@]
  */
 DWORD WINAPI SHGetFileInfoAW(
 	LPCVOID path,
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index c182653f23a..a32266e079f 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -78,7 +78,7 @@ LRESULT WINAPI SHCoCreateInstance(
 }
 
 /*************************************************************************
- * SHELL32_DllGetClassObject   [SHELL32.128]
+ * DllGetClassObject   [SHELL32.128]
  */
 HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
 {	HRESULT	hres = E_OUTOFMEMORY;
@@ -553,7 +553,8 @@ BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p)
 }
 
 /*************************************************************************
- *  DragQueryFileA		[SHELL32.82] [shell32.82]
+ *  DragQueryFile 		[SHELL32.81]
+ *  DragQueryFileA		[SHELL32.82]
  */
 UINT WINAPI DragQueryFileA(
 	HDROP hDrop,
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index a67833ff1e1..a864343fb31 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -70,7 +70,7 @@ DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len)
 }
 
 /*************************************************************************
- * ParseFieldAW			[SHELL32.58]
+ * ParseField			[SHELL32.58]
  */
 DWORD WINAPI ParseFieldAW(LPCVOID src, DWORD nField, LPVOID dst, DWORD len) 
 {
@@ -883,7 +883,7 @@ BOOL WINAPI SHWaitForFileToOpen(
 }
 
 /************************************************************************
- *	shell32_654				[SHELL32.654]
+ *	@				[SHELL32.654]
  *
  * NOTES: first parameter seems to be a pointer (same as passed to WriteCabinetState)
  * second one could be a size (0x0c). The size is the same as the structure saved to
@@ -947,7 +947,7 @@ HRESULT WINAPI DoEnvironmentSubstAW(LPVOID x, LPVOID y)
 }
 
 /*************************************************************************
- *      shell32_243                             [SHELL32.243]
+ *      @                             [SHELL32.243]
  * 
  * Win98+ by-ordinal routine.  In Win98 this routine returns zero and
  * does nothing else.  Possibly this does something in NT or SHELL32 5.0?
@@ -960,7 +960,7 @@ BOOL WINAPI shell32_243(DWORD a, DWORD b)
 }
 
 /*************************************************************************
- *      SHELL32_714	[SHELL32]
+ *      @	[SHELL32.714]
  */
 DWORD WINAPI SHELL32_714(LPVOID x)
 {
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index aefb71f3f03..fde512f5fa1 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -24,7 +24,7 @@ DEFAULT_DEBUG_CHANNEL(shell);
 */
 
 /*************************************************************************
- * PathAppendAW		[SHELL32.36]
+ * PathAppend		[SHELL32.36]
  */
 BOOL WINAPI PathAppendAW(
 	LPVOID lpszPath1,
@@ -36,7 +36,7 @@ BOOL WINAPI PathAppendAW(
 }
 
 /*************************************************************************
- * PathCombineAW	 [SHELL32.37]
+ * PathCombine	 [SHELL32.37]
  */
 LPVOID WINAPI PathCombineAW(
 	LPVOID szDest,
@@ -49,7 +49,7 @@ LPVOID WINAPI PathCombineAW(
 }
 
 /*************************************************************************
- * PathAddBackslashAW		[SHELL32.32]
+ * PathAddBackslash		[SHELL32.32]
  */
 LPVOID WINAPI PathAddBackslashAW(LPVOID lpszPath)
 {
@@ -59,7 +59,7 @@ LPVOID WINAPI PathAddBackslashAW(LPVOID lpszPath)
 }
 
 /*************************************************************************
- * PathBuildRootAW		[SHELL32.30]
+ * PathBuildRoot		[SHELL32.30]
  */
 LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive)
 {
@@ -73,7 +73,7 @@ LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive)
 */
 
 /*************************************************************************
- * PathFindFileNameAW	[SHELL32.34]
+ * PathFindFileName	[SHELL32.34]
  */
 LPVOID WINAPI PathFindFileNameAW(LPCVOID lpszPath)
 {
@@ -83,7 +83,7 @@ LPVOID WINAPI PathFindFileNameAW(LPCVOID lpszPath)
 }
 
 /*************************************************************************
- * PathFindExtensionAW		[SHELL32.31]
+ * PathFindExtension		[SHELL32.31]
  */
 LPVOID WINAPI PathFindExtensionAW(LPCVOID lpszPath) 
 {
@@ -120,7 +120,7 @@ static LPWSTR PathGetExtensionW(LPCWSTR lpszPath)
 }
 
 /*************************************************************************
- * PathGetExtensionAW		[SHELL32.158]
+ * PathGetExtension		[SHELL32.158]
  */
 LPVOID WINAPI PathGetExtensionAW(LPCVOID lpszPath) 
 {
@@ -130,7 +130,7 @@ LPVOID WINAPI PathGetExtensionAW(LPCVOID lpszPath)
 }
 
 /*************************************************************************
- * PathGetArgsAW	[SHELL32.52]
+ * PathGetArgs	[SHELL32.52]
  */
 LPVOID WINAPI PathGetArgsAW(LPVOID lpszPath) 
 {
@@ -160,7 +160,7 @@ BOOL WINAPI PathRemoveFileSpecAW(LPVOID lpszPath)
 }
 
 /*************************************************************************
- * PathStripPathAW	[SHELL32.38]
+ * PathStripPath	[SHELL32.38]
  */
 void WINAPI PathStripPathAW(LPVOID lpszPath) 
 {
@@ -170,7 +170,7 @@ void WINAPI PathStripPathAW(LPVOID lpszPath)
 }
 
 /*************************************************************************
- * PathStripToRootAW	[SHELL32.50]
+ * PathStripToRoot	[SHELL32.50]
  */
 BOOL WINAPI PathStripToRootAW(LPVOID lpszPath) 
 {
@@ -180,7 +180,7 @@ BOOL WINAPI PathStripToRootAW(LPVOID lpszPath)
 }
 
 /*************************************************************************
- * PathRemoveArgsAW	[SHELL32.251]
+ * PathRemoveArgs	[SHELL32.251]
  */
 void WINAPI PathRemoveArgsAW(LPVOID lpszPath) 
 {
@@ -190,7 +190,7 @@ void WINAPI PathRemoveArgsAW(LPVOID lpszPath)
 }
 
 /*************************************************************************
- * PathRemoveExtensionAW	[SHELL32.250]
+ * PathRemoveExtension	[SHELL32.250]
  */
 void WINAPI PathRemoveExtensionAW(LPVOID lpszPath) 
 {
@@ -223,7 +223,7 @@ LPWSTR WINAPI PathGetShortPathW(LPWSTR lpszPath)
 }
 
 /*************************************************************************
- * PathGetShortPathAW [SHELL32.92]
+ * PathGetShortPath [SHELL32.92]
  */
 LPVOID WINAPI PathGetShortPathAW(LPVOID lpszPath)
 {
@@ -233,7 +233,7 @@ LPVOID WINAPI PathGetShortPathAW(LPVOID lpszPath)
 }
 
 /*************************************************************************
- * PathRemoveBlanksAW [SHELL32.33]
+ * PathRemoveBlanks [SHELL32.33]
  */
 void WINAPI PathRemoveBlanksAW(LPVOID str)
 {
@@ -243,7 +243,7 @@ void WINAPI PathRemoveBlanksAW(LPVOID str)
 }
 
 /*************************************************************************
- * PathQuoteSpacesAW [SHELL32.55]
+ * PathQuoteSpaces [SHELL32.55]
  */
 LPVOID WINAPI PathQuoteSpacesAW (LPVOID lpszPath)
 {
@@ -253,7 +253,7 @@ LPVOID WINAPI PathQuoteSpacesAW (LPVOID lpszPath)
 }
 
 /*************************************************************************
- * PathUnquoteSpacesAW [SHELL32.56]
+ * PathUnquoteSpaces [SHELL32.56]
  */
 VOID WINAPI PathUnquoteSpacesAW(LPVOID str) 
 {
@@ -264,7 +264,7 @@ VOID WINAPI PathUnquoteSpacesAW(LPVOID str)
 }
 
 /*************************************************************************
- * PathParseIconLocationAW	[SHELL32.249]
+ * PathParseIconLocation	[SHELL32.249]
  */
 int WINAPI PathParseIconLocationAW (LPVOID lpszPath)
 {
@@ -277,7 +277,7 @@ int WINAPI PathParseIconLocationAW (LPVOID lpszPath)
 	########## Path Testing ##########
 */
 /*************************************************************************
- * PathIsUNCAW		[SHELL32.39]
+ * PathIsUNC		[SHELL32.39]
  */
 BOOL WINAPI PathIsUNCAW (LPCVOID lpszPath)
 {
@@ -287,7 +287,7 @@ BOOL WINAPI PathIsUNCAW (LPCVOID lpszPath)
 }
 
 /*************************************************************************
- *  PathIsRelativeAW	[SHELL32.40]
+ *  PathIsRelative	[SHELL32.40]
  */
 BOOL WINAPI PathIsRelativeAW (LPCVOID lpszPath)
 {
@@ -297,7 +297,7 @@ BOOL WINAPI PathIsRelativeAW (LPCVOID lpszPath)
 }
 
 /*************************************************************************
- * PathIsRootAW		[SHELL32.29]
+ * PathIsRoot		[SHELL32.29]
  */
 BOOL WINAPI PathIsRootAW(LPCVOID lpszPath) 
 {
@@ -343,7 +343,7 @@ static BOOL PathIsExeW (LPCWSTR lpszPath)
 }
 
 /*************************************************************************
- *  PathIsExeAW		[SHELL32.43]
+ *  PathIsExe		[SHELL32.43]
  */
 BOOL WINAPI PathIsExeAW (LPCVOID path)
 {
@@ -353,7 +353,7 @@ BOOL WINAPI PathIsExeAW (LPCVOID path)
 }
 
 /*************************************************************************
- * PathIsDirectoryAW	[SHELL32.159]
+ * PathIsDirectory	[SHELL32.159]
  */
 BOOL WINAPI PathIsDirectoryAW (LPCVOID lpszPath)
 {
@@ -363,7 +363,7 @@ BOOL WINAPI PathIsDirectoryAW (LPCVOID lpszPath)
 }
 
 /*************************************************************************
- * PathFileExistsAW	[SHELL32.45]
+ * PathFileExists	[SHELL32.45]
  */ 
 BOOL WINAPI PathFileExistsAW (LPCVOID lpszPath)
 {
@@ -373,7 +373,7 @@ BOOL WINAPI PathFileExistsAW (LPCVOID lpszPath)
 }
 
 /*************************************************************************
- * PathMatchSpecAW	[SHELL32.46]
+ * PathMatchSpec	[SHELL32.46]
  */
 BOOL WINAPI PathMatchSpecAW(LPVOID name, LPVOID mask) 
 {
@@ -383,7 +383,7 @@ BOOL WINAPI PathMatchSpecAW(LPVOID name, LPVOID mask)
 }
 
 /*************************************************************************
- * PathIsSameRootAW	[SHELL32.650]
+ * PathIsSameRoot	[SHELL32.650]
  */
 BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2)
 {
@@ -393,7 +393,7 @@ BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2)
 }
 
 /*************************************************************************
- * IsLFNDriveA		[SHELL32.119]
+ * IsLFNDrive		[SHELL32.119]
  * 
  * NOTES
  *     exported by ordinal Name
@@ -443,7 +443,7 @@ BOOL WINAPI PathMakeUniqueNameW(
 }
 
 /*************************************************************************
- * PathMakeUniqueNameAW	[SHELL32.47]
+ * PathMakeUniqueName	[SHELL32.47]
  */
 BOOL WINAPI PathMakeUniqueNameAW(
 	LPVOID lpszBuffer,
@@ -458,7 +458,7 @@ BOOL WINAPI PathMakeUniqueNameAW(
 }
 
 /*************************************************************************
- * PathYetAnotherMakeUniqueNameA [SHELL32.75]
+ * PathYetAnotherMakeUniqueName [SHELL32.75]
  * 
  * NOTES
  *     exported by ordinal
@@ -480,7 +480,7 @@ BOOL WINAPI PathYetAnotherMakeUniqueNameA(
  */
 
 /*************************************************************************
- * PathFindOnPathAW	[SHELL32]
+ * PathFindOnPath	[SHELL32.145]
  */
 BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs)
 {
@@ -490,7 +490,7 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs)
 }
 
 /*************************************************************************
- * PathCleanupSpecAW	[SHELL32]
+ * PathCleanupSpec	[SHELL32.171]
  */
 DWORD WINAPI PathCleanupSpecAW (LPCVOID x, LPVOID y)
 {
@@ -517,7 +517,7 @@ BOOL WINAPI PathQualifyW(LPCWSTR pszPath)
 }
 
 /*************************************************************************
- * PathQualifyAW	[SHELL32]
+ * PathQualify	[SHELL32.49]
  */
 BOOL WINAPI PathQualifyAW(LPCVOID pszPath) 
 {
@@ -553,7 +553,7 @@ BOOL WINAPI PathResolveW(
 }
 
 /*************************************************************************
- * PathResolveAW [SHELL32]
+ * PathResolve [SHELL32.51]
  */
 BOOL WINAPI PathResolveAW(
 	LPVOID lpszPath,
@@ -596,7 +596,7 @@ HRESULT WINAPI PathProcessCommandW (
 }
 
 /*************************************************************************
-*	PathProcessCommandAW (SHELL32.653)
+*	PathProcessCommand (SHELL32.653)
 */
 HRESULT WINAPI PathProcessCommandAW (
 	LPCVOID lpszPath,
@@ -614,7 +614,7 @@ HRESULT WINAPI PathProcessCommandAW (
 */
 
 /*************************************************************************
- * PathSetDlgItemPathAW (SHELL32.48)
+ * PathSetDlgItemPath (SHELL32.48)
  */
 BOOL WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath) 
 {	if (SHELL_OsIsUnicode())
@@ -1079,7 +1079,7 @@ BOOL WINAPI SHGetSpecialFolderPathW (
 }
 
 /*************************************************************************
- * SHGetSpecialFolderPathAW (SHELL32.175)
+ * SHGetSpecialFolderPath (SHELL32.175)
  */
 BOOL WINAPI SHGetSpecialFolderPathAW (
 	HWND hwndOwner,
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index 41e1ba09306..63b44cf60f9 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -138,7 +138,7 @@ static inline void fix_win16_hkey( HKEY *hkey )
 }
 
 /******************************************************************************
- *           RegOpenKey16   [SHELL.1]
+ *           RegOpenKey   [SHELL.1]
  */
 DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -147,7 +147,7 @@ DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 }
 
 /******************************************************************************
- *           RegCreateKey16   [SHELL.2]
+ *           RegCreateKey   [SHELL.2]
  */
 DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -156,7 +156,7 @@ DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 }
 
 /******************************************************************************
- *           RegCloseKey16   [SHELL.3]
+ *           RegCloseKey   [SHELL.3]
  */
 DWORD WINAPI RegCloseKey16( HKEY hkey )
 {
@@ -165,7 +165,7 @@ DWORD WINAPI RegCloseKey16( HKEY hkey )
 }
 
 /******************************************************************************
- *           RegDeleteKey16   [SHELL.4]
+ *           RegDeleteKey   [SHELL.4]
  */
 DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name )
 {
@@ -174,7 +174,7 @@ DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name )
 }
 
 /******************************************************************************
- *           RegSetValue16   [SHELL.5]
+ *           RegSetValue   [SHELL.5]
  */
 DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count )
 {
@@ -183,7 +183,7 @@ DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWO
 }
 
 /******************************************************************************
- *           RegQueryValue16   [SHELL.6]
+ *           RegQueryValue   [SHELL.6]
  *
  * NOTES
  *    Is this HACK still applicable?
@@ -201,7 +201,7 @@ DWORD WINAPI RegQueryValue16( HKEY hkey, LPCSTR name, LPSTR data, LPDWORD count
 }
 
 /******************************************************************************
- *           RegEnumKey16   [SHELL.7]
+ *           RegEnumKey   [SHELL.7]
  */
 DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 {
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index b149967e6c8..ea1d37e41c2 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -277,7 +277,7 @@ void WINAPI FileMenu_Destroy (HMENU hmenu)
 }
 
 /*************************************************************************
- * FileMenu_AppendItemAW			[SHELL32.115]
+ * FileMenu_AppendItem			[SHELL32.115]
  *
  */
 BOOL WINAPI FileMenu_AppendItemA(
@@ -675,7 +675,7 @@ BOOL WINAPI FileMenu_DeleteAllItems (HMENU hmenu)
 }
 
 /*************************************************************************
- * FileMenu_DeleteItemByCmd 			[SHELL32.]
+ * FileMenu_DeleteItemByCmd 			[SHELL32.117]
  *
  */
 BOOL WINAPI FileMenu_DeleteItemByCmd (HMENU hMenu, UINT uID)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 341595ca7c2..db1c61988ef 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -49,7 +49,7 @@ extern HMODULE SHLWAPI_hmlang;
 */
 
 /*************************************************************************
- *      SHLWAPI_1	[SHLWAPI.1]
+ *      @	[SHLWAPI.1]
  */
 DWORD WINAPI SHLWAPI_1 (
 	LPSTR lpStr,
@@ -60,7 +60,7 @@ DWORD WINAPI SHLWAPI_1 (
 }
 
 /*************************************************************************
- *      SHLWAPI_2	[SHLWAPI.2]
+ *      @	[SHLWAPI.2]
  */
 DWORD WINAPI SHLWAPI_2 (LPCWSTR x,LPVOID y)
 {
@@ -69,7 +69,7 @@ DWORD WINAPI SHLWAPI_2 (LPCWSTR x,LPVOID y)
 }
 
 /*************************************************************************
- *      SHLWAPI_16	[SHLWAPI.16]
+ *      @	[SHLWAPI.16]
  */
 HRESULT WINAPI SHLWAPI_16 (
 	LPVOID w,
@@ -82,7 +82,7 @@ HRESULT WINAPI SHLWAPI_16 (
 }
 
 /*************************************************************************
- *      SHLWAPI_23	[SHLWAPI.23]
+ *      @	[SHLWAPI.23]
  *
  * NOTES
  *	converts a guid to a string
@@ -106,7 +106,7 @@ DWORD WINAPI SHLWAPI_23 (
 }
 
 /*************************************************************************
- *      SHLWAPI_24	[SHLWAPI.24]
+ *      @	[SHLWAPI.24]
  *
  * NOTES
  *	converts a guid to a string
@@ -146,7 +146,7 @@ BOOL WINAPI SHLWAPI_30(LPWSTR lpcChar)
 }
 
 /*************************************************************************
- *      SHLWAPI_32	[SHLWAPI.32]
+ *      @	[SHLWAPI.32]
  */
 BOOL WINAPI SHLWAPI_32(LPCWSTR lpcChar)
 {
@@ -160,7 +160,7 @@ BOOL WINAPI SHLWAPI_32(LPCWSTR lpcChar)
 }
 
 /*************************************************************************
- *      SHLWAPI_40	[SHLWAPI.40]
+ *      @	[SHLWAPI.40]
  *
  * Get pointer to next Unicode character.
  */
@@ -170,7 +170,7 @@ LPCWSTR WINAPI SHLWAPI_40(LPCWSTR str)
 }
 
 /*************************************************************************
- *      SHLWAPI_74	[SHLWAPI.74]
+ *      @	[SHLWAPI.74]
  *
  * Get the text from a given dialog item.
  */
@@ -186,7 +186,7 @@ INT WINAPI SHLWAPI_74(HWND hWnd, INT nItem, LPWSTR lpsDest,INT nDestLen)
 }
 
 /*************************************************************************
- *      SHLWAPI_151	[SHLWAPI.151]
+ *      @	[SHLWAPI.151]
  *
  *      pStr "HTTP/1.1", dw1 0x5
  */
@@ -197,7 +197,7 @@ DWORD WINAPI SHLWAPI_151(LPSTR pStr, LPVOID ptr, DWORD dw1)
 }
 
 /*************************************************************************
- *      SHLWAPI_152	[SHLWAPI.152]
+ *      @	[SHLWAPI.152]
  */
 DWORD WINAPI SHLWAPI_152(LPWSTR str1, LPWSTR str2, INT len)
 {
@@ -213,7 +213,7 @@ DWORD WINAPI SHLWAPI_152(LPWSTR str1, LPWSTR str2, INT len)
 }
 
 /*************************************************************************
- *      SHLWAPI_153	[SHLWAPI.153]
+ *      @	[SHLWAPI.153]
  */
 DWORD WINAPI SHLWAPI_153(LPSTR str1, LPSTR str2, DWORD dw3)
 {
@@ -222,7 +222,7 @@ DWORD WINAPI SHLWAPI_153(LPSTR str1, LPSTR str2, DWORD dw3)
 }
 
 /*************************************************************************
- *      SHLWAPI_156	[SHLWAPI.156]
+ *      @	[SHLWAPI.156]
  *
  *	Case sensitive string compare. Does not SetLastError().
  */
@@ -233,7 +233,7 @@ DWORD WINAPI SHLWAPI_156 ( LPWSTR str1, LPWSTR str2)
 }
 
 /*************************************************************************
- *      SHLWAPI_162	[SHLWAPI.162]
+ *      @	[SHLWAPI.162]
  *
  * Ensure a multibyte character string doesn't end in a hanging lead byte.
  */
@@ -257,7 +257,7 @@ DWORD WINAPI SHLWAPI_162(LPSTR lpStr, DWORD size)
 }
 
 /*************************************************************************
- *      SHLWAPI_165	[SHLWAPI.165]
+ *      @	[SHLWAPI.165]
  *
  * SetWindowLongA with mask.
  */
@@ -272,7 +272,7 @@ LONG WINAPI SHLWAPI_165(HWND hwnd, INT offset, UINT wFlags, UINT wMask)
 }
 
 /*************************************************************************
- *      SHLWAPI_169	[SHLWAPI.169]
+ *      @	[SHLWAPI.169]
  */
 DWORD WINAPI SHLWAPI_169 (IUnknown * lpUnknown)
 {
@@ -285,7 +285,7 @@ DWORD WINAPI SHLWAPI_169 (IUnknown * lpUnknown)
 }
 
 /*************************************************************************
- *      SHLWAPI_170	[SHLWAPI.170]
+ *      @	[SHLWAPI.170]
  *
  * Skip URL '//' sequence.
  */
@@ -297,7 +297,7 @@ LPCSTR WINAPI SHLWAPI_170(LPCSTR lpszSrc)
 }
 
 /*************************************************************************
- *      SHLWAPI_181	[SHLWAPI.181]
+ *      @	[SHLWAPI.181]
  *
  *	Enable or disable a menu item.
  */
@@ -307,7 +307,7 @@ UINT WINAPI SHLWAPI_181(HMENU hMenu, UINT wItemID, BOOL bEnable)
 }
 
 /*************************************************************************
- *      SHLWAPI_183	[SHLWAPI.183]
+ *      @	[SHLWAPI.183]
  *
  * Register a window class if it isn't already.
  */
@@ -320,7 +320,7 @@ DWORD WINAPI SHLWAPI_183(WNDCLASSA *wndclass)
 }
 
 /*************************************************************************
- *      SHLWAPI_193	[SHLWAPI.193]
+ *      @	[SHLWAPI.193]
  */
 DWORD WINAPI SHLWAPI_193 ()
 {
@@ -336,7 +336,7 @@ DWORD WINAPI SHLWAPI_193 ()
 }
 
 /*************************************************************************
- *      SHLWAPI_215	[SHLWAPI.215]
+ *      @	[SHLWAPI.215]
  *
  * NOTES
  *  check me!
@@ -351,7 +351,7 @@ LPWSTR WINAPI SHLWAPI_215 (
 }
 
 /*************************************************************************
- *      SHLWAPI_218	[SHLWAPI.218]
+ *      @	[SHLWAPI.218]
  *
  * WideCharToMultiByte with multi language support.
  */
@@ -441,7 +441,7 @@ INT WINAPI SHLWAPI_218(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr,
 }
 
 /*************************************************************************
- *      SHLWAPI_217	[SHLWAPI.217]
+ *      @	[SHLWAPI.217]
  *
  */
 INT WINAPI SHLWAPI_217(LPCWSTR lpSrcStr, LPSTR lpDstStr, LPINT lpnMultiCharCount)
@@ -450,7 +450,7 @@ INT WINAPI SHLWAPI_217(LPCWSTR lpSrcStr, LPSTR lpDstStr, LPINT lpnMultiCharCount
 }
 
 /*************************************************************************
- *      SHLWAPI_219	[SHLWAPI.219]
+ *      @	[SHLWAPI.219]
  *
  * NOTES
  *  error codes: E_POINTER, E_NOINTERFACE
@@ -466,7 +466,7 @@ HRESULT WINAPI SHLWAPI_219 (
 }
 
 /*************************************************************************
- *      SHLWAPI_222	[SHLWAPI.222]
+ *      @	[SHLWAPI.222]
  *
  * NOTES
  *  securityattributes missing
@@ -484,7 +484,7 @@ HANDLE WINAPI SHLWAPI_222 (LPCLSID guid)
 }
 
 /*************************************************************************
- *      SHLWAPI_223	[SHLWAPI.223]
+ *      @	[SHLWAPI.223]
  *
  * NOTES
  *  get the count of the semaphore
@@ -501,7 +501,7 @@ DWORD WINAPI SHLWAPI_223 (HANDLE handle)
 }
 
 /*************************************************************************
- *      SHLWAPI_237	[SHLWAPI.237]
+ *      @	[SHLWAPI.237]
  *
  * Unicode version of SHLWAPI_183.
  */
@@ -517,7 +517,7 @@ DWORD WINAPI SHLWAPI_237 (WNDCLASSW * lpWndClass)
 }
 
 /*************************************************************************
- *      SHLWAPI_240	[SHLWAPI.240]
+ *      @	[SHLWAPI.240]
  *
  *	Calls ASCII or Unicode WindowProc for the given window.
  */
@@ -529,7 +529,7 @@ LRESULT CALLBACK SHLWAPI_240(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lPa
 }
 
 /*************************************************************************
- *      SHLWAPI_241	[SHLWAPI.241]
+ *      @	[SHLWAPI.241]
  *
  */
 DWORD WINAPI SHLWAPI_241 ()
@@ -539,7 +539,7 @@ DWORD WINAPI SHLWAPI_241 ()
 }
 
 /*************************************************************************
- *      SHLWAPI_266	[SHLWAPI.266]
+ *      @	[SHLWAPI.266]
  */
 DWORD WINAPI SHLWAPI_266 (
 	LPVOID w,
@@ -552,7 +552,7 @@ DWORD WINAPI SHLWAPI_266 (
 }
 
 /*************************************************************************
- *      SHLWAPI_267	[SHLWAPI.267]
+ *      @	[SHLWAPI.267]
  */
 HRESULT WINAPI SHLWAPI_267 (
 	LPVOID w, /* [???] NOTE: same as 1th parameter of SHLWAPI_219 */
@@ -566,7 +566,7 @@ HRESULT WINAPI SHLWAPI_267 (
 }
 
 /*************************************************************************
- *      SHLWAPI_268	[SHLWAPI.268]
+ *      @	[SHLWAPI.268]
  */
 DWORD WINAPI SHLWAPI_268 (
 	LPVOID w,
@@ -577,7 +577,7 @@ DWORD WINAPI SHLWAPI_268 (
 }
 
 /*************************************************************************
- *      SHLWAPI_276	[SHLWAPI.276]
+ *      @	[SHLWAPI.276]
  *
  */
 DWORD WINAPI SHLWAPI_276 ()
@@ -587,7 +587,7 @@ DWORD WINAPI SHLWAPI_276 ()
 }
 
 /*************************************************************************
- *      SHLWAPI_278	[SHLWAPI.278]
+ *      @	[SHLWAPI.278]
  *
  */
 DWORD WINAPI SHLWAPI_278 (
@@ -628,7 +628,7 @@ DWORD WINAPI SHLWAPI_278 (
 }
 
 /*************************************************************************
- *      SHLWAPI_289	[SHLWAPI.289]
+ *      @	[SHLWAPI.289]
  *
  * Late bound call to winmm.PlaySoundW
  */
@@ -641,7 +641,7 @@ BOOL WINAPI SHLWAPI_289(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound)
 }
 
 /*************************************************************************
- *      SHLWAPI_294	[SHLWAPI.294]
+ *      @	[SHLWAPI.294]
  */
 BOOL WINAPI SHLWAPI_294(LPSTR str1, LPSTR str2, LPSTR pStr, DWORD some_len,  LPCSTR lpStr2)
 {
@@ -665,7 +665,7 @@ BOOL WINAPI SHLWAPI_294(LPSTR str1, LPSTR str2, LPSTR pStr, DWORD some_len,  LPC
 }
 
 /*************************************************************************
- *      SHLWAPI_313	[SHLWAPI.313]
+ *      @	[SHLWAPI.313]
  *
  * Late bound call to shell32.SHGetFileInfoW
  */
@@ -679,7 +679,7 @@ DWORD WINAPI SHLWAPI_313(LPCWSTR path, DWORD dwFileAttributes,
 }
 
 /*************************************************************************
- *      SHLWAPI_318	[SHLWAPI.318]
+ *      @	[SHLWAPI.318]
  *
  * Late bound call to shell32.DragQueryFileW
  */
@@ -692,7 +692,7 @@ UINT WINAPI SHLWAPI_318(HDROP hDrop, UINT lFile, LPWSTR lpszFile, UINT lLength)
 }
 
 /*************************************************************************
- *      SHLWAPI_333	[SHLWAPI.333]
+ *      @	[SHLWAPI.333]
  *
  * Late bound call to shell32.SHBrowseForFolderW
  */
@@ -705,7 +705,7 @@ LPITEMIDLIST WINAPI SHLWAPI_333(LPBROWSEINFOW lpBi)
 }
 
 /*************************************************************************
- *      SHLWAPI_334	[SHLWAPI.334]
+ *      @	[SHLWAPI.334]
  *
  * Late bound call to shell32.SHGetPathFromIDListW
  */
@@ -718,7 +718,7 @@ BOOL WINAPI SHLWAPI_334(LPCITEMIDLIST pidl,LPWSTR pszPath)
 }
 
 /*************************************************************************
- *      SHLWAPI_335	[SHLWAPI.335]
+ *      @	[SHLWAPI.335]
  *
  * Late bound call to shell32.ShellExecuteExW
  */
@@ -731,7 +731,7 @@ BOOL WINAPI SHLWAPI_335(LPSHELLEXECUTEINFOW lpExecInfo)
 }
 
 /*************************************************************************
- *      SHLWAPI_336	[SHLWAPI.336]
+ *      @	[SHLWAPI.336]
  *
  * Late bound call to shell32.SHFileOperationW.
  */
@@ -744,7 +744,7 @@ DWORD WINAPI SHLWAPI_336(LPSHFILEOPSTRUCTW lpFileOp)
 }
 
 /*************************************************************************
- *      SHLWAPI_337	[SHLWAPI.337]
+ *      @	[SHLWAPI.337]
  *
  * Late bound call to shell32.ExtractIconExW.
  */
@@ -758,7 +758,7 @@ HICON WINAPI SHLWAPI_337(LPCWSTR lpszFile, INT nIconIndex, HICON *phiconLarge,
 }
 
 /*************************************************************************
- *      SHLWAPI_342	[SHLWAPI.342]
+ *      @	[SHLWAPI.342]
  *
  */
 DWORD WINAPI SHLWAPI_342 (
@@ -772,7 +772,7 @@ DWORD WINAPI SHLWAPI_342 (
 }
 
 /*************************************************************************
- *      SHLWAPI_346	[SHLWAPI.346]
+ *      @	[SHLWAPI.346]
  */
 DWORD WINAPI SHLWAPI_346 (
 	LPCWSTR src,
@@ -785,7 +785,7 @@ DWORD WINAPI SHLWAPI_346 (
 }
 
 /*************************************************************************
- *      SHLWAPI_357	[SHLWAPI.357]
+ *      @	[SHLWAPI.357]
  *
  * Late bound call to shell32.SHGetNewLinkInfoW
  */
@@ -799,7 +799,7 @@ BOOL WINAPI SHLWAPI_357(LPCWSTR pszLinkTo, LPCWSTR pszDir, LPWSTR pszName,
 }
 
 /*************************************************************************
- *      SHLWAPI_358	[SHLWAPI.358]
+ *      @	[SHLWAPI.358]
  *
  * Late bound call to shell32.SHDefExtractIconW
  */
@@ -814,7 +814,7 @@ DWORD WINAPI SHLWAPI_358(LPVOID arg1, LPVOID arg2, LPVOID arg3, LPVOID arg4,
 }
 
 /*************************************************************************
- *      SHLWAPI_364	[SHLWAPI.364]
+ *      @	[SHLWAPI.364]
  *
  * Wrapper for lstrcpynA with src and dst swapped.
  */
@@ -825,7 +825,7 @@ DWORD WINAPI SHLWAPI_364(LPCSTR src, LPSTR dst, INT n)
 }
 
 /*************************************************************************
- *      SHLWAPI_370	[SHLWAPI.370]
+ *      @	[SHLWAPI.370]
  *
  * Late bound call to shell32.ExtractIconW
  */
@@ -839,7 +839,7 @@ HICON WINAPI SHLWAPI_370(HINSTANCE hInstance, LPCWSTR lpszExeFileName,
 }
 
 /*************************************************************************
- *      SHLWAPI_376	[SHLWAPI.376]
+ *      @	[SHLWAPI.376]
  */
 DWORD WINAPI SHLWAPI_376 (LONG x)
 {
@@ -851,7 +851,7 @@ DWORD WINAPI SHLWAPI_376 (LONG x)
 }
 
 /*************************************************************************
- *      SHLWAPI_377	[SHLWAPI.377]
+ *      @	[SHLWAPI.377]
  */
 DWORD WINAPI SHLWAPI_377 (LPVOID x, LPVOID y, LPVOID z)
 {
@@ -860,7 +860,7 @@ DWORD WINAPI SHLWAPI_377 (LPVOID x, LPVOID y, LPVOID z)
 }
 
 /*************************************************************************
- *      SHLWAPI_378	[SHLWAPI.378]
+ *      @	[SHLWAPI.378]
  */
 DWORD WINAPI SHLWAPI_378 (
 	LPSTR x,
@@ -872,7 +872,7 @@ DWORD WINAPI SHLWAPI_378 (
 }
 
 /*************************************************************************
- *      SHLWAPI_389	[SHLWAPI.389]
+ *      @	[SHLWAPI.389]
  *
  * Late bound call to comdlg32.GetSaveFileNameW
  */
@@ -885,7 +885,7 @@ BOOL WINAPI SHLWAPI_389(LPOPENFILENAMEW ofn)
 }
 
 /*************************************************************************
- *      SHLWAPI_390	[SHLWAPI.390]
+ *      @	[SHLWAPI.390]
  *
  * Late bound call to mpr.WNetRestoreConnectionW
  */
@@ -899,7 +899,7 @@ DWORD WINAPI SHLWAPI_390(LPVOID arg1, LPVOID arg2)
 }
 
 /*************************************************************************
- *      SHLWAPI_391	[SHLWAPI.391]
+ *      @	[SHLWAPI.391]
  *
  * Late bound call to mpr.WNetGetLastErrorW
  */
@@ -914,7 +914,7 @@ DWORD WINAPI SHLWAPI_391(LPVOID arg1, LPVOID arg2, LPVOID arg3, LPVOID arg4,
 }
 
 /*************************************************************************
- *      SHLWAPI_401	[SHLWAPI.401]
+ *      @	[SHLWAPI.401]
  *
  * Late bound call to comdlg32.PageSetupDlgW
  */
@@ -927,7 +927,7 @@ BOOL WINAPI SHLWAPI_401(LPPAGESETUPDLGW pagedlg)
 }
 
 /*************************************************************************
- *      SHLWAPI_402	[SHLWAPI.402]
+ *      @	[SHLWAPI.402]
  *
  * Late bound call to comdlg32.PrintDlgW
  */
@@ -940,7 +940,7 @@ BOOL WINAPI SHLWAPI_402(LPPRINTDLGW printdlg)
 }
 
 /*************************************************************************
- *      SHLWAPI_403	[SHLWAPI.403]
+ *      @	[SHLWAPI.403]
  *
  * Late bound call to comdlg32.GetOpenFileNameW
  */
@@ -1005,7 +1005,7 @@ COLORREF WINAPI ColorHLSToRGB(WORD wHue, WORD wLuminosity, WORD wSaturation)
 }
 
 /*************************************************************************
- *      SHLWAPI_431	[SHLWAPI.431]
+ *      @	[SHLWAPI.431]
  */
 DWORD WINAPI SHLWAPI_431 (DWORD x)
 {
@@ -1014,7 +1014,7 @@ DWORD WINAPI SHLWAPI_431 (DWORD x)
 }
 
 /*************************************************************************
- *      SHLWAPI_437	[SHLWAPI.437]
+ *      @	[SHLWAPI.437]
  *
  * NOTES
  *  In the real shlwapi, One time initialisation calls GetVersionEx and reads
@@ -1077,7 +1077,7 @@ INT WINAPI GetMenuPosFromID(HMENU hMenu, UINT wID)
 }
 
 /*************************************************************************
- *      _SHGetInstanceExplorer	[SHLWAPI.@]
+ *      _SHGetInstanceExplorer@4	[SHLWAPI.@]
  *
  * Late bound call to shell32.SHGetInstanceExplorer.
  */
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 8ee2e26620f..c379f237e20 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -477,7 +477,7 @@ DWORD WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey)
 }
 
 /*************************************************************************
- * SHLWAPI_205   [SHLWAPI.205]
+ * @   [SHLWAPI.205]
  *
  * Wrapper for SHGetValueA in case machine is in safe mode.
  */
@@ -490,7 +490,7 @@ DWORD WINAPI SHLWAPI_205(HKEY hkey, LPCSTR pSubKey, LPCSTR pValue,
 }
 
 /*************************************************************************
- * SHLWAPI_206   [SHLWAPI.206]
+ * @   [SHLWAPI.206]
  *
  * Unicode version of SHLWAPI_205.
  */
@@ -503,7 +503,7 @@ DWORD WINAPI SHLWAPI_206(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue,
 }
 
 /*************************************************************************
- * SHLWAPI_320   [SHLWAPI.320]
+ * @   [SHLWAPI.320]
  *
  */
 BOOL WINAPI SHLWAPI_320(LPCSTR lpszSubKey, LPCSTR lpszValue)
@@ -515,7 +515,7 @@ BOOL WINAPI SHLWAPI_320(LPCSTR lpszSubKey, LPCSTR lpszValue)
 }
 
 /*************************************************************************
- * SHLWAPI_321   [SHLWAPI.321]
+ * @   [SHLWAPI.321]
  *
  * Unicode version of SHLWAPI_320.
  */
@@ -528,7 +528,7 @@ BOOL WINAPI SHLWAPI_321(LPCWSTR lpszSubKey, LPCWSTR lpszValue)
 }
 
 /*************************************************************************
- * SHLWAPI_322   [SHLWAPI.322]
+ * @   [SHLWAPI.322]
  *
  */
 BOOL WINAPI SHLWAPI_322(LPCSTR lpszSubKey)
@@ -538,7 +538,7 @@ BOOL WINAPI SHLWAPI_322(LPCSTR lpszSubKey)
 }
 
 /*************************************************************************
- * SHLWAPI_323   [SHLWAPI.323]
+ * @   [SHLWAPI.323]
  *
  * Unicode version of SHLWAPI_322.
  */
diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c
index 95c41e12744..10103210a64 100644
--- a/dlls/ttydrv/user.c
+++ b/dlls/ttydrv/user.c
@@ -13,14 +13,14 @@ DEFAULT_DEBUG_CHANNEL(ttydrv);
 
 
 /***********************************************************************
- *		TTYDRV_InitKeyboard (TTYDRV.@)
+ *		InitKeyboard (TTYDRV.@)
  */
 void TTYDRV_InitKeyboard(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_VkKeyScan (TTYDRV.@)
+ *		VkKeyScan (TTYDRV.@)
  */
 WORD TTYDRV_VkKeyScan(CHAR cChar)
 {
@@ -28,7 +28,7 @@ WORD TTYDRV_VkKeyScan(CHAR cChar)
 }
 
 /***********************************************************************
- *		TTYDRV_MapVirtualKey (TTYDRV.@)
+ *		MapVirtualKey (TTYDRV.@)
  */
 UINT16 TTYDRV_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
 {
@@ -36,7 +36,7 @@ UINT16 TTYDRV_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
 }
 
 /***********************************************************************
- *		TTYDRV_GetKeyNameText (TTYDRV.@)
+ *		GetKeyNameText (TTYDRV.@)
  */
 INT16 TTYDRV_GetKeyNameText( LONG lParam, LPSTR lpBuffer, INT16 nSize )
 {  
@@ -48,7 +48,7 @@ INT16 TTYDRV_GetKeyNameText( LONG lParam, LPSTR lpBuffer, INT16 nSize )
 }
 
 /***********************************************************************
- *		TTYDRV_ToUnicode (TTYDRV.@)
+ *		ToUnicode (TTYDRV.@)
  */
 INT TTYDRV_ToUnicode( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 		      LPWSTR pwszBuff, int cchBuff, UINT flags )
@@ -57,14 +57,14 @@ INT TTYDRV_ToUnicode( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 }
 
 /***********************************************************************
- *		TTYDRV_Beep (TTYDRV.@)
+ *		Beep (TTYDRV.@)
  */
 void TTYDRV_Beep(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_GetDIState (TTYDRV.@)
+ *		GetDIState (TTYDRV.@)
  */
 BOOL TTYDRV_GetDIState(DWORD len, LPVOID ptr)
 {
@@ -72,7 +72,7 @@ BOOL TTYDRV_GetDIState(DWORD len, LPVOID ptr)
 }
 
 /***********************************************************************
- *		TTYDRV_GetDIData (TTYDRV.@)
+ *		GetDIData (TTYDRV.@)
  */
 BOOL TTYDRV_GetDIData( BYTE *keystate, DWORD dodsize, LPDIDEVICEOBJECTDATA dod,
                        LPDWORD entries, DWORD flags )
@@ -81,21 +81,21 @@ BOOL TTYDRV_GetDIData( BYTE *keystate, DWORD dodsize, LPDIDEVICEOBJECTDATA dod,
 }
 
 /***********************************************************************
- *           TTYDRV_InitMouse (TTYDRV.@)
+ *           InitMouse (TTYDRV.@)
  */
 void TTYDRV_InitMouse(LPMOUSE_EVENT_PROC proc)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_SetCursor (TTYDRV.@)
+ *		SetCursor (TTYDRV.@)
  */
 void TTYDRV_SetCursor( struct tagCURSORICONINFO *lpCursor )
 {
 }
 
 /***********************************************************************
- *              TTYDRV_GetScreenSaveActive (TTYDRV.@)
+ *              GetScreenSaveActive (TTYDRV.@)
  *
  * Returns the active status of the screen saver
  */
@@ -105,7 +105,7 @@ BOOL TTYDRV_GetScreenSaveActive(void)
 }
 
 /***********************************************************************
- *              TTYDRV_SetScreenSaveActive (TTYDRV.@)
+ *              SetScreenSaveActive (TTYDRV.@)
  *
  * Activate/Deactivate the screen saver
  */
@@ -115,7 +115,7 @@ void TTYDRV_SetScreenSaveActive(BOOL bActivate)
 }
 
 /***********************************************************************
- *              TTYDRV_GetScreenSaveTimeout (TTYDRV.@)
+ *              GetScreenSaveTimeout (TTYDRV.@)
  *
  * Return the screen saver timeout
  */
@@ -125,7 +125,7 @@ int TTYDRV_GetScreenSaveTimeout(void)
 }
 
 /***********************************************************************
- *              TTYDRV_SetScreenSaveTimeout (TTYDRV.@)
+ *              SetScreenSaveTimeout (TTYDRV.@)
  *
  * Set the screen saver timeout
  */
@@ -135,7 +135,7 @@ void TTYDRV_SetScreenSaveTimeout(int nTimeout)
 }
 
 /**********************************************************************
- *		TTYDRV_LoadOEMResource (TTYDRV.@)
+ *		LoadOEMResource (TTYDRV.@)
  */
 HANDLE TTYDRV_LoadOEMResource(WORD resid, WORD type)
 {
@@ -156,28 +156,28 @@ HANDLE TTYDRV_LoadOEMResource(WORD resid, WORD type)
 }
 
 /***********************************************************************
- *		TTYDRV_AcquireClipboard (TTYDRV.@)
+ *		AcquireClipboard (TTYDRV.@)
  */
 void TTYDRV_AcquireClipboard(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_ReleaseClipboard (TTYDRV.@)
+ *		ReleaseClipboard (TTYDRV.@)
  */
 void TTYDRV_ReleaseClipboard(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_SetClipboardData (TTYDRV.@)
+ *		SetClipboardData (TTYDRV.@)
  */
 void TTYDRV_SetClipboardData(UINT wFormat)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_GetClipboardData (TTYDRV.@)
+ *		GetClipboardData (TTYDRV.@)
  */
 BOOL TTYDRV_GetClipboardData(UINT wFormat)
 {
@@ -185,7 +185,7 @@ BOOL TTYDRV_GetClipboardData(UINT wFormat)
 }
 
 /***********************************************************************
- *		TTYDRV_IsClipboardFormatAvailable (TTYDRV.@)
+ *		IsClipboardFormatAvailable (TTYDRV.@)
  */
 BOOL TTYDRV_IsClipboardFormatAvailable(UINT wFormat)
 {
@@ -193,7 +193,7 @@ BOOL TTYDRV_IsClipboardFormatAvailable(UINT wFormat)
 }
 
 /**************************************************************************
- *		TTYDRV_RegisterClipboardFormat (TTYDRV.@)
+ *		RegisterClipboardFormat (TTYDRV.@)
  *
  * Registers a custom clipboard format
  * Returns: TRUE - new format registered, FALSE - Format already registered
@@ -204,7 +204,7 @@ BOOL TTYDRV_RegisterClipboardFormat( LPCSTR FormatName )
 }
 
 /**************************************************************************
- *		TTYDRV_IsSelectionOwner (TTYDRV.@)
+ *		IsSelectionOwner (TTYDRV.@)
  *
  * Returns: TRUE - We(WINE) own the selection, FALSE - Selection not owned by us
  */
@@ -214,7 +214,7 @@ BOOL TTYDRV_IsSelectionOwner(void)
 }
 
 /***********************************************************************
- *		TTYDRV_ResetSelectionOwner (TTYDRV.@)
+ *		ResetSelectionOwner (TTYDRV.@)
  */
 void TTYDRV_ResetSelectionOwner(struct tagWND *pWnd, BOOL bFooBar)
 {
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index ef3dc5186bf..22446fa5b1c 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -14,7 +14,7 @@
 DEFAULT_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
- *		URLMON_DllInstall (URLMON.@)
+ *		DllInstall (URLMON.@)
  */
 HRESULT WINAPI URLMON_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
diff --git a/dlls/user/bidi16.c b/dlls/user/bidi16.c
index 87e3af9d9ea..1f3b90d006d 100644
--- a/dlls/user/bidi16.c
+++ b/dlls/user/bidi16.c
@@ -13,20 +13,20 @@
 DEFAULT_DEBUG_CHANNEL(relay);
 
 /***********************************************************************
- *		ChangeDialogTemplate16   (USER.905)
+ *		ChangeDialogTemplate   (USER.905)
  * FIXME: The prototypes of this function have not been found yet.
  */
 LONG WINAPI ChangeDialogTemplate16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 /***********************************************************************
- *		BiDiMessageBoxEx16   (USER.910)
+ *		BiDiMessageBoxEx   (USER.910)
  * FIXME: The prototypes of this function have not been found yet.
  */
 LONG WINAPI BiDiMessageBoxEx16(void) { FIXME("stub (no prototype)\n"); return 0; }
 
 
 /******************************************************************************
- *                    ChangeKeyboardCodePage16 [USER.924]
+ *                    ChangeKeyboardCodePage [USER.924]
  * Change the keyboard layouts to a new pair.
  * If the language IDs are set to -1, the language is not to be changed.
  */
@@ -38,7 +38,7 @@ DWORD WINAPI ChangeKeyboardCodePage16( UINT16 iLangLeft, UINT16 iLangRight )
 
 
 /******************************************************************************
- *                    ChangeKeyboardLanguage16 [USER.912]
+ *                    ChangeKeyboardLanguage [USER.912]
  * Change the keyboard layouts to a new pair.
  *
  * RETURNS
@@ -52,7 +52,7 @@ DWORD WINAPI ChangeKeyboardLanguage16( UINT16 iLangLeft, UINT iLangRight )
 
 
 /******************************************************************************
- *                    CreateDialogIndirectParamML16 [USER.916]
+ *                    CreateDialogIndirectParamML [USER.916]
  */
 HWND16 WINAPI CreateDialogIndirectParamML16( HINSTANCE16 hinstWnd,
                                              const void * lpvDlgTmp,
@@ -71,7 +71,7 @@ HWND16 WINAPI CreateDialogIndirectParamML16( HINSTANCE16 hinstWnd,
 
 
 /******************************************************************************
- *                    DialogBoxIndirectParamML16 [USER.918]
+ *                    DialogBoxIndirectParamML [USER.918]
  */
 HWND16 WINAPI DialogBoxIndirectParamML16( HINSTANCE16 hinstWnd,
                                           HGLOBAL16 hglbDlgTemp,
@@ -91,7 +91,7 @@ HWND16 WINAPI DialogBoxIndirectParamML16( HINSTANCE16 hinstWnd,
 
 
 /******************************************************************************
- *                    FindLanguageResource16 [USER.923]
+ *                    FindLanguageResource [USER.923]
  */
 HRSRC16 WINAPI FindLanguageResource16( HINSTANCE16 hinst, LPCSTR lpRes,
                                        LPCSTR lpResType, UINT16 iLang )
@@ -102,7 +102,7 @@ HRSRC16 WINAPI FindLanguageResource16( HINSTANCE16 hinst, LPCSTR lpRes,
 
 
 /******************************************************************************
- *                    GetAppCodePage16 [USER.915]
+ *                    GetAppCodePage [USER.915]
  * Returns the code page and language of the window
  *
  * RETURNS
@@ -116,7 +116,7 @@ DWORD WINAPI GetAppCodePage16( HWND16 hwnd )
 
 
 /******************************************************************************
- *                    GetBaseCodePage16 [USER.922]
+ *                    GetBaseCodePage [USER.922]
  * Returns the base code page and resource language.
  * For example, Hebrew windows will return HebrewCodePage in the low word
  * and English in the high word.
@@ -130,7 +130,7 @@ DWORD WINAPI GetBaseCodePage16( void )
 
 
 /******************************************************************************
- *                    GetCodePageSystemFont16 [USER.913]
+ *                    GetCodePageSystemFont [USER.913]
  * Returns the stock font for the requested code page.
  */
 HFONT16 WINAPI GetCodePageSystemFont16( UINT16 iFont, UINT16 iCodePage )
@@ -142,7 +142,7 @@ HFONT16 WINAPI GetCodePageSystemFont16( UINT16 iFont, UINT16 iCodePage )
 
 
 /******************************************************************************
- *                    GetLanguageName16 [USER.907]
+ *                    GetLanguageName [USER.907]
  * Returns the name of one language in (possibly) a different language.
  * Currently only handles language 0 (english).
  *
@@ -168,7 +168,7 @@ UINT WINAPI GetLanguageName16( UINT16 iLang, UINT16 iName,
 
 
 /******************************************************************************
- *                    GetNumLanguages16 [USER.906]
+ *                    GetNumLanguages [USER.906]
  * Returns the number of languages in the system.
  */
 UINT WINAPI GetNumLanguages16( void )
@@ -180,7 +180,7 @@ UINT WINAPI GetNumLanguages16( void )
 
 
 /******************************************************************************
- *                    GetProcessDefaultLayout16 [USER.1001]
+ *                    GetProcessDefaultLayout [USER.1001]
  *
  * Gets the default layout for parentless windows.
  * Right now, just returns 0 (left-to-right).
@@ -197,7 +197,7 @@ BOOL16 WINAPI GetProcessDefaultLayout16( DWORD *pdwDefaultLayout )
 
 
 /******************************************************************************
- *                   LoadLanguageString16 [USER.919]
+ *                   LoadLanguageString [USER.919]
  * Loads a string for a specific language.
  *
  * RETURNS
@@ -214,7 +214,7 @@ UINT16 WINAPI LoadLanguageString16( HINSTANCE16 hinst, UINT16 id, UINT16 iLang,
 
 
 /******************************************************************************
- *                   LoadSystemLanguageString16 [USER.902]
+ *                   LoadSystemLanguageString [USER.902]
  * Loads a string which is in one of the system language modules.
  *
  * RETURNS
@@ -230,7 +230,7 @@ UINT WINAPI LoadSystemLanguageString16( HINSTANCE16 hinstCaller, UINT16 id,
 
 
 /***********************************************************************
- *           MessageBoxEx16 [USER.930]
+ *           MessageBoxEx [USER.930]
  * The multilingual version of MessageBox.
  */
 INT16 WINAPI MessageBoxEx16( HWND16 hwndParent, LPCSTR lpszText,
@@ -243,7 +243,7 @@ INT16 WINAPI MessageBoxEx16( HWND16 hwndParent, LPCSTR lpszText,
 
 
 /***********************************************************************
- *           QueryCodePage16   [USER.914]
+ *           QueryCodePage   [USER.914]
  * Query code page specific data.
  */
 LRESULT WINAPI QueryCodePage16( UINT16 idxLang, UINT16 msg,
@@ -254,7 +254,7 @@ LRESULT WINAPI QueryCodePage16( UINT16 idxLang, UINT16 msg,
 }
 
 /***********************************************************************
- *           SetAppCodePage16   [USER.920]
+ *           SetAppCodePage   [USER.920]
  * Set the code page and language of the window to new values.
  *
  * RETURNS
@@ -269,7 +269,7 @@ DWORD WINAPI SetAppCodePage16( HWND16 hwnd, UINT16 iCodePage, UINT16 iLang,
 }
 
 /***********************************************************************
- *           SetDlgItemTextEx16   [USER.911]
+ *           SetDlgItemTextEx   [USER.911]
  * Sets the title or text of a control in a dialog box.
  * Currently only works for language 0 (english)
  */
@@ -280,7 +280,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id,
 }
 
 /******************************************************************************
- *                    SetProcessDefaultLayout16 [USER.1000]
+ *                    SetProcessDefaultLayout [USER.1000]
  *
  * Sets the default layout for parentless windows.
  * Right now, only accepts 0 (left-to-right).
@@ -296,7 +296,7 @@ BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout )
 }
 
 /******************************************************************************
- *                    SetWindowTextEx16 [USER.909]
+ *                    SetWindowTextEx [USER.909]
  * Sets the given window's title to the specified text in the specified language.
  */
 void WINAPI SetWindowTextEx16( HWND16 hwnd, LPCSTR lpsz, UINT16 iLang )
diff --git a/dlls/user/dde/ddeml16.c b/dlls/user/dde/ddeml16.c
index cecc8dc61cd..1d20e26dbb4 100644
--- a/dlls/user/dde/ddeml16.c
+++ b/dlls/user/dde/ddeml16.c
@@ -56,7 +56,7 @@ typedef struct
 
 
 /******************************************************************************
- *            DdeInitialize16   (DDEML.2)
+ *            DdeInitialize   (DDEML.2)
  */
 UINT16 WINAPI DdeInitialize16(LPDWORD pidInst, PFNCALLBACK16 pfnCallback,
 			      DWORD afCmd, DWORD ulRes)
@@ -66,7 +66,7 @@ UINT16 WINAPI DdeInitialize16(LPDWORD pidInst, PFNCALLBACK16 pfnCallback,
 }
 
 /*****************************************************************
- *            DdeUninitialize16   (DDEML.3)
+ *            DdeUninitialize   (DDEML.3)
  */
 BOOL16 WINAPI DdeUninitialize16(DWORD idInst)
 {
@@ -75,7 +75,7 @@ BOOL16 WINAPI DdeUninitialize16(DWORD idInst)
 }
 
 /*****************************************************************
- * DdeConnectList16 [DDEML.4]
+ * DdeConnectList [DDEML.4]
  */
 
 HCONVLIST WINAPI DdeConnectList16(DWORD idInst, HSZ hszService, HSZ hszTopic,
@@ -86,7 +86,7 @@ HCONVLIST WINAPI DdeConnectList16(DWORD idInst, HSZ hszService, HSZ hszTopic,
 }
 
 /*****************************************************************
- * DdeQueryNextServer16 [DDEML.5]
+ * DdeQueryNextServer [DDEML.5]
  */
 HCONV WINAPI DdeQueryNextServer16(HCONVLIST hConvList, HCONV hConvPrev)
 {
@@ -103,7 +103,7 @@ BOOL16 WINAPI DdeDisconnectList16(HCONVLIST hConvList)
 
 
 /*****************************************************************
- *		DdeQueryString16 (DDEML.23)
+ *		DdeQueryString (DDEML.23)
  */
 DWORD WINAPI DdeQueryString16(DWORD idInst, HSZ hsz, LPSTR lpsz, DWORD cchMax, INT16 codepage)
 {
@@ -113,7 +113,7 @@ DWORD WINAPI DdeQueryString16(DWORD idInst, HSZ hsz, LPSTR lpsz, DWORD cchMax, I
 }
 
 /*****************************************************************
- *            DdeConnect16   (DDEML.7)
+ *            DdeConnect   (DDEML.7)
  */
 HCONV WINAPI DdeConnect16(DWORD idInst, HSZ hszService, HSZ hszTopic,
 			  LPCONVCONTEXT16 pCC16)
@@ -133,7 +133,7 @@ HCONV WINAPI DdeConnect16(DWORD idInst, HSZ hszService, HSZ hszTopic,
 }
 
 /*****************************************************************
- *            DdeDisconnect16   (DDEML.8)
+ *            DdeDisconnect   (DDEML.8)
  */
 BOOL16 WINAPI DdeDisconnect16(HCONV hConv)
 {
@@ -141,7 +141,7 @@ BOOL16 WINAPI DdeDisconnect16(HCONV hConv)
 }
 
 /*****************************************************************
- *            DdeSetUserHandle16 (DDEML.10)
+ *            DdeSetUserHandle (DDEML.10)
  */
 BOOL16 WINAPI DdeSetUserHandle16(HCONV hConv, DWORD id, DWORD hUser)
 {
@@ -150,7 +150,7 @@ BOOL16 WINAPI DdeSetUserHandle16(HCONV hConv, DWORD id, DWORD hUser)
 }
 
 /*****************************************************************
- *            DdeCreateDataHandle16 (DDEML.14)
+ *            DdeCreateDataHandle (DDEML.14)
  */
 HDDEDATA WINAPI DdeCreateDataHandle16(DWORD idInst, LPBYTE pSrc, DWORD cb, 
 				      DWORD cbOff, HSZ hszItem, UINT16 wFmt, 
@@ -160,7 +160,7 @@ HDDEDATA WINAPI DdeCreateDataHandle16(DWORD idInst, LPBYTE pSrc, DWORD cb,
 }
 
 /*****************************************************************
- *            DdeCreateStringHandle16   (DDEML.21)
+ *            DdeCreateStringHandle   (DDEML.21)
  */
 HSZ WINAPI DdeCreateStringHandle16(DWORD idInst, LPCSTR str, INT16 codepage)
 {
@@ -174,7 +174,7 @@ HSZ WINAPI DdeCreateStringHandle16(DWORD idInst, LPCSTR str, INT16 codepage)
 }
 
 /*****************************************************************
- *            DdeFreeStringHandle16   (DDEML.22)
+ *            DdeFreeStringHandle   (DDEML.22)
  */
 BOOL16 WINAPI DdeFreeStringHandle16(DWORD idInst, HSZ hsz)
 {
@@ -183,7 +183,7 @@ BOOL16 WINAPI DdeFreeStringHandle16(DWORD idInst, HSZ hsz)
 }
 
 /*****************************************************************
- *            DdeFreeDataHandle16   (DDEML.19)
+ *            DdeFreeDataHandle   (DDEML.19)
  */
 BOOL16 WINAPI DdeFreeDataHandle16(HDDEDATA hData)
 {
@@ -191,7 +191,7 @@ BOOL16 WINAPI DdeFreeDataHandle16(HDDEDATA hData)
 }
 
 /*****************************************************************
- *            DdeKeepStringHandle16   (DDEML.24)
+ *            DdeKeepStringHandle   (DDEML.24)
  */
 BOOL16 WINAPI DdeKeepStringHandle16(DWORD idInst, HSZ hsz)
 {
@@ -199,7 +199,7 @@ BOOL16 WINAPI DdeKeepStringHandle16(DWORD idInst, HSZ hsz)
 }
 
 /*****************************************************************
- *            DdeClientTransaction16  (DDEML.11)
+ *            DdeClientTransaction  (DDEML.11)
  */
 HDDEDATA WINAPI DdeClientTransaction16(LPVOID pData, DWORD cbData,
 				       HCONV hConv, HSZ hszItem, UINT16 wFmt,
@@ -212,7 +212,7 @@ HDDEDATA WINAPI DdeClientTransaction16(LPVOID pData, DWORD cbData,
 
 /*****************************************************************
  *
- *            DdeAbandonTransaction16 (DDEML.12)
+ *            DdeAbandonTransaction (DDEML.12)
  *
  */
 BOOL16 WINAPI DdeAbandonTransaction16(DWORD idInst, HCONV hConv, 
@@ -223,7 +223,7 @@ BOOL16 WINAPI DdeAbandonTransaction16(DWORD idInst, HCONV hConv,
 }
 
 /*****************************************************************
- * DdePostAdvise16 [DDEML.13]
+ * DdePostAdvise [DDEML.13]
  */
 BOOL16 WINAPI DdePostAdvise16(DWORD idInst, HSZ hszTopic, HSZ hszItem)
 {
@@ -231,7 +231,7 @@ BOOL16 WINAPI DdePostAdvise16(DWORD idInst, HSZ hszTopic, HSZ hszItem)
 }
 
 /*****************************************************************
- *            DdeAddData16 (DDEML.15)
+ *            DdeAddData (DDEML.15)
  */
 HDDEDATA WINAPI DdeAddData16(HDDEDATA hData, LPBYTE pSrc, DWORD cb,
 			     DWORD cbOff)
@@ -240,7 +240,7 @@ HDDEDATA WINAPI DdeAddData16(HDDEDATA hData, LPBYTE pSrc, DWORD cb,
 }
 
 /*****************************************************************
- * DdeGetData16 [DDEML.16]
+ * DdeGetData [DDEML.16]
  */
 DWORD WINAPI DdeGetData16(
      HDDEDATA hData,
@@ -252,7 +252,7 @@ DWORD WINAPI DdeGetData16(
 }
 
 /*****************************************************************
- *            DdeAccessData16 (DDEML.17)
+ *            DdeAccessData (DDEML.17)
  */
 LPBYTE WINAPI DdeAccessData16(HDDEDATA hData, LPDWORD pcbDataSize)
 {
@@ -260,7 +260,7 @@ LPBYTE WINAPI DdeAccessData16(HDDEDATA hData, LPDWORD pcbDataSize)
 }
 
 /*****************************************************************
- *            DdeUnaccessData16 (DDEML.18)
+ *            DdeUnaccessData (DDEML.18)
  */
 BOOL16 WINAPI DdeUnaccessData16(HDDEDATA hData)
 {
@@ -268,7 +268,7 @@ BOOL16 WINAPI DdeUnaccessData16(HDDEDATA hData)
 }
 
 /*****************************************************************
- *            DdeEnableCallback16 (DDEML.26)
+ *            DdeEnableCallback (DDEML.26)
  */
 BOOL16 WINAPI DdeEnableCallback16(DWORD idInst, HCONV hConv, UINT16 wCmd)
 {
@@ -276,7 +276,7 @@ BOOL16 WINAPI DdeEnableCallback16(DWORD idInst, HCONV hConv, UINT16 wCmd)
 }
 
 /*****************************************************************
- *            DdeNameService16  (DDEML.27)
+ *            DdeNameService  (DDEML.27)
  */
 HDDEDATA WINAPI DdeNameService16(DWORD idInst, HSZ hsz1, HSZ hsz2,
 				 UINT16 afCmd)
@@ -285,7 +285,7 @@ HDDEDATA WINAPI DdeNameService16(DWORD idInst, HSZ hsz1, HSZ hsz2,
 }
 
 /*****************************************************************
- *            DdeGetLastError16  (DDEML.20)
+ *            DdeGetLastError  (DDEML.20)
  */
 UINT16 WINAPI DdeGetLastError16(DWORD idInst)
 {
@@ -293,7 +293,7 @@ UINT16 WINAPI DdeGetLastError16(DWORD idInst)
 }
 
 /*****************************************************************
- *            DdeCmpStringHandles16 (DDEML.36)
+ *            DdeCmpStringHandles (DDEML.36)
  */
 INT16 WINAPI DdeCmpStringHandles16(HSZ hsz1, HSZ hsz2)
 {
@@ -301,7 +301,7 @@ INT16 WINAPI DdeCmpStringHandles16(HSZ hsz1, HSZ hsz2)
 }
 
 /******************************************************************
- *		DdeQueryConvInfo16 (DDEML.9)
+ *		DdeQueryConvInfo (DDEML.9)
  *
  */
 UINT16 WINAPI DdeQueryConvInfo16(HCONV hconv, DWORD idTransaction, LPCONVINFO16 lpConvInfo)
diff --git a/dlls/user/display.c b/dlls/user/display.c
index e5416b64153..2ff1e47b374 100644
--- a/dlls/user/display.c
+++ b/dlls/user/display.c
@@ -21,7 +21,7 @@ typedef struct tagCURSORINFO
 #include "poppack.h"
 
 /***********************************************************************
- *           DISPLAY_Inquire			(DISPLAY.101)
+ *           Inquire			(DISPLAY.101)
  */
 WORD WINAPI DISPLAY_Inquire(LPCURSORINFO lpCursorInfo) 
 {
@@ -32,7 +32,7 @@ WORD WINAPI DISPLAY_Inquire(LPCURSORINFO lpCursorInfo)
 }
 
 /***********************************************************************
- *           DISPLAY_SetCursor			(DISPLAY.102)
+ *           SetCursor			(DISPLAY.102)
  */
 VOID WINAPI DISPLAY_SetCursor( struct tagCURSORICONINFO *lpCursor )
 {
@@ -40,7 +40,7 @@ VOID WINAPI DISPLAY_SetCursor( struct tagCURSORICONINFO *lpCursor )
 }
 
 /***********************************************************************
- *           DISPLAY_MoveCursor			(DISPLAY.103)
+ *           MoveCursor			(DISPLAY.103)
  */
 VOID WINAPI DISPLAY_MoveCursor( WORD wAbsX, WORD wAbsY )
 {
@@ -48,7 +48,7 @@ VOID WINAPI DISPLAY_MoveCursor( WORD wAbsX, WORD wAbsY )
 }
 
 /***********************************************************************
- *           DISPLAY_CheckCursor                  (DISPLAY.104)
+ *           CheckCursor                  (DISPLAY.104)
  */
 VOID WINAPI DISPLAY_CheckCursor( void )
 {
@@ -56,7 +56,7 @@ VOID WINAPI DISPLAY_CheckCursor( void )
 }
 
 /***********************************************************************
- *           DISPLAY_GetDriverResourceID                  (DISPLAY.450)
+ *           GetDriverResourceID                  (DISPLAY.450)
  *
  * Used by USER to check if driver contains better version of a builtin
  * resource than USER (yes, our DISPLAY does !).
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index e4ec9a7a01f..95ac5859a40 100644
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
@@ -36,7 +36,7 @@ static WINE_EXCEPTION_FILTER(page_fault)
 }
 
 /***********************************************************************
- *           AnsiToOem16   (KEYBOARD.5)
+ *           AnsiToOem   (KEYBOARD.5)
  */
 INT16 WINAPI AnsiToOem16( LPCSTR s, LPSTR d )
 {
@@ -46,7 +46,7 @@ INT16 WINAPI AnsiToOem16( LPCSTR s, LPSTR d )
 
 
 /***********************************************************************
- *           OemToAnsi16   (KEYBOARD.6)
+ *           OemToAnsi   (KEYBOARD.6)
  */
 INT16 WINAPI OemToAnsi16( LPCSTR s, LPSTR d )
 {
@@ -56,7 +56,7 @@ INT16 WINAPI OemToAnsi16( LPCSTR s, LPSTR d )
 
 
 /***********************************************************************
- *           AnsiToOemBuff16   (KEYBOARD.134)
+ *           AnsiToOemBuff   (KEYBOARD.134)
  */
 void WINAPI AnsiToOemBuff16( LPCSTR s, LPSTR d, UINT16 len )
 {
@@ -65,7 +65,7 @@ void WINAPI AnsiToOemBuff16( LPCSTR s, LPSTR d, UINT16 len )
 
 
 /***********************************************************************
- *           OemToAnsiBuff16   (KEYBOARD.135)
+ *           OemToAnsiBuff   (KEYBOARD.135)
  */
 void WINAPI OemToAnsiBuff16( LPCSTR s, LPSTR d, UINT16 len )
 {
@@ -74,7 +74,7 @@ void WINAPI OemToAnsiBuff16( LPCSTR s, LPSTR d, UINT16 len )
 
 
 /***********************************************************************
- *           lstrcmp16   (USER.430)
+ *           lstrcmp   (USER.430)
  */
 INT16 WINAPI lstrcmp16( LPCSTR str1, LPCSTR str2 )
 {
@@ -83,7 +83,7 @@ INT16 WINAPI lstrcmp16( LPCSTR str1, LPCSTR str2 )
 
 
 /***********************************************************************
- *           AnsiUpper16   (USER.431)
+ *           AnsiUpper   (USER.431)
  */
 SEGPTR WINAPI AnsiUpper16( SEGPTR strOrChar )
 {
@@ -98,7 +98,7 @@ SEGPTR WINAPI AnsiUpper16( SEGPTR strOrChar )
 
 
 /***********************************************************************
- *           AnsiLower16   (USER.432)
+ *           AnsiLower   (USER.432)
  */
 SEGPTR WINAPI AnsiLower16( SEGPTR strOrChar )
 {
@@ -113,7 +113,7 @@ SEGPTR WINAPI AnsiLower16( SEGPTR strOrChar )
 
 
 /***********************************************************************
- *           AnsiUpperBuff16   (USER.437)
+ *           AnsiUpperBuff   (USER.437)
  */
 UINT16 WINAPI AnsiUpperBuff16( LPSTR str, UINT16 len )
 {
@@ -123,7 +123,7 @@ UINT16 WINAPI AnsiUpperBuff16( LPSTR str, UINT16 len )
 
 
 /***********************************************************************
- *           AnsiLowerBuff16   (USER.438)
+ *           AnsiLowerBuff   (USER.438)
  */
 UINT16 WINAPI AnsiLowerBuff16( LPSTR str, UINT16 len )
 {
@@ -133,7 +133,7 @@ UINT16 WINAPI AnsiLowerBuff16( LPSTR str, UINT16 len )
 
 
 /***********************************************************************
- *           AnsiNext16   (USER.472)
+ *           AnsiNext   (USER.472)
  */
 SEGPTR WINAPI AnsiNext16(SEGPTR current)
 {
@@ -143,7 +143,7 @@ SEGPTR WINAPI AnsiNext16(SEGPTR current)
 
 
 /***********************************************************************
- *           AnsiPrev16   (USER.473)
+ *           AnsiPrev   (USER.473)
  */
 SEGPTR WINAPI AnsiPrev16( LPCSTR start, SEGPTR current )
 {
@@ -526,6 +526,7 @@ BOOL WINAPI IsCharUpperW(WCHAR x)
 
 
 /***********************************************************************
+ *           IsCharAlphaNumeric    (USER.434)
  *           IsCharAlphaNumericA   (USER32.@)
  */
 BOOL WINAPI IsCharAlphaNumericA(CHAR x)
@@ -546,6 +547,7 @@ BOOL WINAPI IsCharAlphaNumericW(WCHAR x)
 
 
 /***********************************************************************
+ *           IsCharAlpha    (USER.433)
  *           IsCharAlphaA   (USER32.@)
  */
 BOOL WINAPI IsCharAlphaA(CHAR x)
@@ -566,7 +568,7 @@ BOOL WINAPI IsCharAlphaW(WCHAR x)
 
 
 /***********************************************************************
- *           FormatMessage16   (USER.606)
+ *           FormatMessage   (USER.606)
  */
 DWORD WINAPI FormatMessage16(
     DWORD   dwFlags,
diff --git a/dlls/user/misc.c b/dlls/user/misc.c
index 46b9f4a76b9..b4628d4dd22 100644
--- a/dlls/user/misc.c
+++ b/dlls/user/misc.c
@@ -209,21 +209,21 @@ DWORD WINAPI RegisterTasklist (DWORD x)
 }
 
 /***********************************************************************
- *		stub_USER_489 (USER.489)
+ *		USER_489 (USER.489)
  */
 LONG WINAPI stub_USER_489(void) { FIXME("stub\n"); return 0; }
 
 /***********************************************************************
- *		stub_USER_490 (USER.490)
+ *		USER_490 (USER.490)
  */
 LONG WINAPI stub_USER_490(void) { FIXME("stub\n"); return 0; }
 
 /***********************************************************************
- *		stub_USER_492 (USER.492)
+ *		USER_492 (USER.492)
  */
 LONG WINAPI stub_USER_492(void) { FIXME("stub\n"); return 0; }
 
 /***********************************************************************
- *		stub_USER_496 (USER.496)
+ *		USER_496 (USER.496)
  */
 LONG WINAPI stub_USER_496(void) { FIXME("stub\n"); return 0; }
diff --git a/dlls/user/mouse.c b/dlls/user/mouse.c
index b65a25da728..124e27d0546 100644
--- a/dlls/user/mouse.c
+++ b/dlls/user/mouse.c
@@ -38,7 +38,7 @@ typedef struct _MOUSEINFO
 static LPMOUSE_EVENT_PROC DefMouseEventProc = NULL;
 
 /***********************************************************************
- *           MOUSE_Inquire                       (MOUSE.1)
+ *           Inquire                       (MOUSE.1)
  */
 WORD WINAPI MOUSE_Inquire(LPMOUSEINFO mouseInfo)
 {
@@ -56,7 +56,7 @@ WORD WINAPI MOUSE_Inquire(LPMOUSEINFO mouseInfo)
 }
 
 /***********************************************************************
- *           MOUSE_Enable                        (MOUSE.2)
+ *           Enable                        (MOUSE.2)
  */
 VOID WINAPI MOUSE_Enable(LPMOUSE_EVENT_PROC lpMouseEventProc)
 {
@@ -93,7 +93,7 @@ VOID WINAPI WIN16_MOUSE_Enable( FARPROC16 proc )
 }
 
 /***********************************************************************
- *           MOUSE_Disable                       (MOUSE.3)
+ *           Disable                       (MOUSE.3)
  */
 VOID WINAPI MOUSE_Disable(VOID)
 {
diff --git a/dlls/user/network.c b/dlls/user/network.c
index 06fc9ebf818..3e344e393f0 100644
--- a/dlls/user/network.c
+++ b/dlls/user/network.c
@@ -21,7 +21,7 @@ DEFAULT_DEBUG_CHANNEL(wnet);
  */
 
 /**************************************************************************
- *              WNetOpenJob16       [USER.501]
+ *              WNetOpenJob       [USER.501]
  */
 WORD WINAPI WNetOpenJob16( LPSTR szQueue, LPSTR szJobTitle, WORD nCopies, LPINT16 pfh )
 {
@@ -31,7 +31,7 @@ WORD WINAPI WNetOpenJob16( LPSTR szQueue, LPSTR szJobTitle, WORD nCopies, LPINT1
 }
 
 /**************************************************************************
- *              WNetCloseJob16      [USER.502]
+ *              WNetCloseJob      [USER.502]
  */
 WORD WINAPI WNetCloseJob16( WORD fh, LPINT16 pidJob, LPSTR szQueue )
 {
@@ -40,7 +40,7 @@ WORD WINAPI WNetCloseJob16( WORD fh, LPINT16 pidJob, LPSTR szQueue )
 }
 
 /**************************************************************************
- *              WNetWriteJob16      [USER.524]
+ *              WNetWriteJob      [USER.524]
  */
 WORD WINAPI WNetWriteJob16( HANDLE16 hJob, LPSTR lpData, LPINT16 lpcbData )
 {
@@ -49,7 +49,7 @@ WORD WINAPI WNetWriteJob16( HANDLE16 hJob, LPSTR lpData, LPINT16 lpcbData )
 }
 
 /**************************************************************************
- *              WNetAbortJob16       [USER.503]
+ *              WNetAbortJob       [USER.503]
  */
 WORD WINAPI WNetAbortJob16( LPSTR szQueue, WORD wJobId )
 {
@@ -58,7 +58,7 @@ WORD WINAPI WNetAbortJob16( LPSTR szQueue, WORD wJobId )
 }
 
 /**************************************************************************
- *              WNetHoldJob16       [USER.504]
+ *              WNetHoldJob       [USER.504]
  */
 WORD WINAPI WNetHoldJob16( LPSTR szQueue, WORD wJobId )
 {
@@ -67,7 +67,7 @@ WORD WINAPI WNetHoldJob16( LPSTR szQueue, WORD wJobId )
 }
 
 /**************************************************************************
- *              WNetReleaseJob16       [USER.505]
+ *              WNetReleaseJob       [USER.505]
  */
 WORD WINAPI WNetReleaseJob16( LPSTR szQueue, WORD wJobId )
 {
@@ -76,7 +76,7 @@ WORD WINAPI WNetReleaseJob16( LPSTR szQueue, WORD wJobId )
 }
 
 /**************************************************************************
- *              WNetCancelJob16       [USER.506]
+ *              WNetCancelJob       [USER.506]
  */
 WORD WINAPI WNetCancelJob16( LPSTR szQueue, WORD wJobId )
 {
@@ -85,7 +85,7 @@ WORD WINAPI WNetCancelJob16( LPSTR szQueue, WORD wJobId )
 }
 
 /**************************************************************************
- *              WNetSetJobCopies16     [USER.507]
+ *              WNetSetJobCopies     [USER.507]
  */
 WORD WINAPI WNetSetJobCopies16( LPSTR szQueue, WORD wJobId, WORD nCopies )
 {
@@ -94,7 +94,7 @@ WORD WINAPI WNetSetJobCopies16( LPSTR szQueue, WORD wJobId, WORD nCopies )
 }
 
 /**************************************************************************
- *              WNetWatchQueue16       [USER.508]
+ *              WNetWatchQueue       [USER.508]
  */
 WORD WINAPI WNetWatchQueue16( HWND16 hWnd, LPSTR szLocal, LPSTR szUser, WORD nQueue )
 {
@@ -104,7 +104,7 @@ WORD WINAPI WNetWatchQueue16( HWND16 hWnd, LPSTR szLocal, LPSTR szUser, WORD nQu
 }
 
 /**************************************************************************
- *              WNetUnwatchQueue16     [USER.509]
+ *              WNetUnwatchQueue     [USER.509]
  */
 WORD WINAPI WNetUnwatchQueue16( LPSTR szQueue )
 {
@@ -113,7 +113,7 @@ WORD WINAPI WNetUnwatchQueue16( LPSTR szQueue )
 }
 
 /**************************************************************************
- *              WNetLockQueueData16       [USER.510]
+ *              WNetLockQueueData       [USER.510]
  */
 WORD WINAPI WNetLockQueueData16( LPSTR szQueue, LPSTR szUser, 
                                  LPQUEUESTRUCT16 *lplpQueueStruct )
@@ -124,7 +124,7 @@ WORD WINAPI WNetLockQueueData16( LPSTR szQueue, LPSTR szUser,
 }
 
 /**************************************************************************
- *              WNetUnlockQueueData16       [USER.511]
+ *              WNetUnlockQueueData       [USER.511]
  */
 WORD WINAPI WNetUnlockQueueData16( LPSTR szQueue )
 {
@@ -138,7 +138,7 @@ WORD WINAPI WNetUnlockQueueData16( LPSTR szQueue )
  */
 
 /********************************************************************
- *  WNetAddConnection16 [USER.517]  Directs a local device to net
+ *  WNetAddConnection [USER.517]  Directs a local device to net
  * 
  * Redirects a local device (either a disk drive or printer port)
  * to a shared device on a remote server.
@@ -152,7 +152,7 @@ WORD WINAPI WNetAddConnection16( LPSTR lpNetPath, LPSTR lpPassWord,
 }
 
 /********************************************************************
- *   WNetCancelConnection16 [USER.518]  undirects a local device
+ *   WNetCancelConnection [USER.518]  undirects a local device
  */
 WORD WINAPI WNetCancelConnection16( LPSTR lpName, BOOL16 bForce )
 {
@@ -161,7 +161,7 @@ WORD WINAPI WNetCancelConnection16( LPSTR lpName, BOOL16 bForce )
 }
 
 /********************************************************************
- * WNetGetConnection16 [USER.512] reverse-resolves a local device
+ * WNetGetConnection [USER.512] reverse-resolves a local device
  */
 WORD WINAPI WNetGetConnection16( LPSTR lpLocalName, 
                                  LPSTR lpRemoteName, UINT16 *cbRemoteName )
@@ -192,7 +192,7 @@ WORD WINAPI WNetGetConnection16( LPSTR lpLocalName,
 }
 
 /**************************************************************************
- *              WNetRestoreConnection16       [USER.523]
+ *              WNetRestoreConnection       [USER.523]
  */
 WORD WINAPI WNetRestoreConnection16( HWND16 hwndOwner, LPSTR lpszDevice )
 {
@@ -206,7 +206,7 @@ WORD WINAPI WNetRestoreConnection16( HWND16 hwndOwner, LPSTR lpszDevice )
  */
 
 /**************************************************************************
- *		WNetGetCaps16		[USER.513]
+ *		WNetGetCaps		[USER.513]
  */
 WORD WINAPI WNetGetCaps16( WORD capability )
 {
@@ -285,7 +285,7 @@ WORD WINAPI WNetGetCaps16( WORD capability )
  */
 
 /**************************************************************************
- *		WNetGetUser16			[USER.516]
+ *		WNetGetUser			[USER.516]
  */
 WORD WINAPI WNetGetUser16( LPCSTR lpName, LPSTR szUser, LPINT16 nBufferSize )
 {
@@ -299,7 +299,7 @@ WORD WINAPI WNetGetUser16( LPCSTR lpName, LPSTR szUser, LPINT16 nBufferSize )
  */
 
 /**************************************************************************
- *              WNetDeviceMode16       [USER.514]
+ *              WNetDeviceMode       [USER.514]
  */
 WORD WINAPI WNetDeviceMode16( HWND16 hWndOwner )
 {
@@ -308,7 +308,7 @@ WORD WINAPI WNetDeviceMode16( HWND16 hWndOwner )
 }
 
 /**************************************************************************
- *              WNetBrowseDialog16       [USER.515]
+ *              WNetBrowseDialog       [USER.515]
  */
 WORD WINAPI WNetBrowseDialog16( HWND16 hParent, WORD nType, LPSTR szPath )
 {
@@ -326,7 +326,7 @@ WORD WINAPI WNetConnectDialog( HWND16 hWndParent, WORD iType )
 }
 
 /**************************************************************************
- *              WNetDisconnectDialog16       [USER.526]
+ *              WNetDisconnectDialog       [USER.526]
  */
 WORD WINAPI WNetDisconnectDialog16( HWND16 hwndOwner, WORD iType )
 {
@@ -335,7 +335,7 @@ WORD WINAPI WNetDisconnectDialog16( HWND16 hwndOwner, WORD iType )
 }
 
 /**************************************************************************
- *              WNetConnectionDialog16     [USER.527]
+ *              WNetConnectionDialog     [USER.527]
  */
 WORD WINAPI WNetConnectionDialog16( HWND16 hWndParent, WORD iType )
 {
@@ -344,7 +344,7 @@ WORD WINAPI WNetConnectionDialog16( HWND16 hWndParent, WORD iType )
 }
 
 /**************************************************************************
- *              WNetViewQueueDialog16       [USER.528]
+ *              WNetViewQueueDialog       [USER.528]
  */
 WORD WINAPI WNetViewQueueDialog16( HWND16 hwndOwner, LPSTR lpszQueue )
 {
@@ -353,7 +353,7 @@ WORD WINAPI WNetViewQueueDialog16( HWND16 hwndOwner, LPSTR lpszQueue )
 }
 
 /**************************************************************************
- *              WNetPropertyDialog16       [USER.529]
+ *              WNetPropertyDialog       [USER.529]
  */
 WORD WINAPI WNetPropertyDialog16( HWND16 hwndParent, WORD iButton,
                                   WORD nPropSel, LPSTR lpszName, WORD nType )
@@ -364,7 +364,7 @@ WORD WINAPI WNetPropertyDialog16( HWND16 hwndParent, WORD iButton,
 }
 
 /**************************************************************************
- *              WNetGetPropertyText16       [USER.532]
+ *              WNetGetPropertyText       [USER.532]
  */
 WORD WINAPI WNetGetPropertyText16( WORD iButton, WORD nPropSel, LPSTR lpszName,
                                    LPSTR lpszButtonName, WORD cbButtonName, WORD nType )
@@ -380,7 +380,7 @@ WORD WINAPI WNetGetPropertyText16( WORD iButton, WORD nPropSel, LPSTR lpszName,
  */
 
 /*********************************************************************
- *  WNetGetDirectoryType16 [USER.530]  Decides whether resource is local
+ *  WNetGetDirectoryType [USER.530]  Decides whether resource is local
  *
  * RETURNS
  *    on success,  puts one of the following in *lpType:
@@ -401,7 +401,7 @@ WORD WINAPI WNetGetDirectoryType16( LPSTR lpName, LPINT16 lpType )
 }
 
 /**************************************************************************
- *              WNetDirectoryNotify16       [USER.531]
+ *              WNetDirectoryNotify       [USER.531]
  */
 WORD WINAPI WNetDirectoryNotify16( HWND16 hwndOwner, LPSTR lpDir, WORD wOper )
 {
@@ -418,7 +418,7 @@ WORD WINAPI WNetDirectoryNotify16( HWND16 hwndOwner, LPSTR lpDir, WORD wOper )
  */
 
 /**************************************************************************
- *              WNetGetError16       [USER.519]
+ *              WNetGetError       [USER.519]
  */
 WORD WINAPI WNetGetError16( LPINT16 nError )
 {
@@ -427,7 +427,7 @@ WORD WINAPI WNetGetError16( LPINT16 nError )
 }
 
 /**************************************************************************
- *              WNetGetErrorText16       [USER.520]
+ *              WNetGetErrorText       [USER.520]
  */
 WORD WINAPI WNetGetErrorText16( WORD nError, LPSTR lpBuffer, LPINT16 nBufferSize )
 {
@@ -436,7 +436,7 @@ WORD WINAPI WNetGetErrorText16( WORD nError, LPSTR lpBuffer, LPINT16 nBufferSize
 }
 
 /**************************************************************************
- *              WNetErrorText16       [USER.499]
+ *              WNetErrorText       [USER.499]
  */
 WORD WINAPI WNetErrorText16( WORD nError, LPSTR lpszText, WORD cbText )
 {
diff --git a/dlls/user/resource.c b/dlls/user/resource.c
index 0c3acf94851..8d819e609e0 100644
--- a/dlls/user/resource.c
+++ b/dlls/user/resource.c
@@ -29,7 +29,7 @@ typedef struct
 } PE_ACCEL, *LPPE_ACCEL;
 
 /**********************************************************************
- *			LoadAccelerators16	[USER.177]
+ *			LoadAccelerators	[USER.177]
  */
 HACCEL16 WINAPI LoadAccelerators16(HINSTANCE16 instance, LPCSTR lpTableName)
 {
@@ -290,7 +290,7 @@ BOOL WINAPI DestroyAcceleratorTable( HACCEL handle )
 }
   
 /**********************************************************************
- *     LoadString16   (USER.176)
+ *     LoadString   (USER.176)
  */
 INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id,
                            LPSTR buffer, INT16 buflen )
diff --git a/dlls/user/text.c b/dlls/user/text.c
index e7022853023..a11f1d229ab 100644
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
@@ -203,7 +203,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
 
 
 /***********************************************************************
- *           DrawText16    (USER.85)
+ *           DrawText    (USER.85)
  */
 INT16 WINAPI DrawText16( HDC16 hdc, LPCSTR str, INT16 count, LPRECT16 rect, UINT16 flags )
 {
@@ -684,7 +684,7 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCSTR lpstr,
 
 
 /***********************************************************************
- *           TabbedTextOut16    (USER.196)
+ *           TabbedTextOut    (USER.196)
  */
 LONG WINAPI TabbedTextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR lpstr,
                              INT16 count, INT16 cTabStops,
@@ -730,7 +730,7 @@ LONG WINAPI TabbedTextOutW( HDC hdc, INT x, INT y, LPCWSTR str, INT count,
 
 
 /***********************************************************************
- *           GetTabbedTextExtent16    (USER.197)
+ *           GetTabbedTextExtent    (USER.197)
  */
 DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count,
                                     INT16 cTabStops, const INT16 *lpTabPos )
diff --git a/dlls/user/thunk.c b/dlls/user/thunk.c
index f16648c4db3..7fb9fd1d958 100644
--- a/dlls/user/thunk.c
+++ b/dlls/user/thunk.c
@@ -17,7 +17,7 @@ extern WORD CALLBACK THUNK_CallTo16_word_wlw  (FARPROC16,WORD,LONG,WORD);
 
 
 /*******************************************************************
- *           EnumWindows16   (USER.54)
+ *           EnumWindows   (USER.54)
  */
 BOOL16 WINAPI EnumWindows16( WNDENUMPROC16 func, LPARAM lParam )
 {
@@ -27,7 +27,7 @@ BOOL16 WINAPI EnumWindows16( WNDENUMPROC16 func, LPARAM lParam )
 
 
 /**********************************************************************
- *           EnumChildWindows16   (USER.55)
+ *           EnumChildWindows   (USER.55)
  */
 BOOL16 WINAPI EnumChildWindows16( HWND16 parent, WNDENUMPROC16 func, LPARAM lParam )
 {
@@ -37,7 +37,7 @@ BOOL16 WINAPI EnumChildWindows16( HWND16 parent, WNDENUMPROC16 func, LPARAM lPar
 
 
 /**********************************************************************
- *           THUNK_EnumTaskWindows16   (USER.225)
+ *           EnumTaskWindows   (USER.225)
  */
 BOOL16 WINAPI THUNK_EnumTaskWindows16( HTASK16 hTask, WNDENUMPROC16 func,
                                        LPARAM lParam )
@@ -48,7 +48,7 @@ BOOL16 WINAPI THUNK_EnumTaskWindows16( HTASK16 hTask, WNDENUMPROC16 func,
 
 
 /***********************************************************************
- *           THUNK_EnumProps16   (USER.27)
+ *           EnumProps   (USER.27)
  */
 INT16 WINAPI THUNK_EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 {
@@ -58,7 +58,7 @@ INT16 WINAPI THUNK_EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 
 
 /***********************************************************************
- *           THUNK_GrayString16   (USER.185)
+ *           GrayString   (USER.185)
  */
 BOOL16 WINAPI THUNK_GrayString16( HDC16 hdc, HBRUSH16 hbr,
                                   GRAYSTRINGPROC16 func, LPARAM lParam,
diff --git a/dlls/user/wsprintf.c b/dlls/user/wsprintf.c
index 87a13cab1bf..5c07af1d0f0 100644
--- a/dlls/user/wsprintf.c
+++ b/dlls/user/wsprintf.c
@@ -547,7 +547,7 @@ INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args )
 
 
 /***********************************************************************
- *           wvsprintf16   (USER.421)
+ *           wvsprintf   (USER.421)
  */
 INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, LPCVOID args )
 {
@@ -580,7 +580,7 @@ INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args )
 
 
 /***********************************************************************
- *           wsprintf16   (USER.420)
+ *           _wsprintf   (USER.420)
  */
 INT16 WINAPIV wsprintf16(void)
 {
diff --git a/dlls/version/install.c b/dlls/version/install.c
index bf52a0d3e70..77790880fd7 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -94,7 +94,7 @@ static int testFileExistenceW( const WCHAR *path, const WCHAR *file, BOOL excl )
 
 /*****************************************************************************
  *
- *   VerFindFileA() [VER.8]
+ *   VerFindFileA [VER.8]
  *   Determines where to install a file based on whether it locates another
  *   version of the file in the system.  The values VerFindFile returns are
  *   used in a subsequent call to the VerInstallFile function.
diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index 4a526431392..b533c7f0f65 100644
--- a/dlls/version/resource.c
+++ b/dlls/version/resource.c
@@ -371,7 +371,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid,
 
 
 /*************************************************************************
- * GetFileResourceSize16                     [VER.2]
+ * GetFileResourceSize                     [VER.2]
  */
 DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
                                     LPCSTR lpszResId, LPDWORD lpdwFileOffset )
@@ -407,7 +407,7 @@ DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
 
 
 /*************************************************************************
- * GetFileResource16                         [VER.3]
+ * GetFileResource                         [VER.3]
  */
 DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
                                 LPCSTR lpszResId, DWORD dwFileOffset,
diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c
index 889c153433e..685c9f750a4 100644
--- a/dlls/version/ver16.c
+++ b/dlls/version/ver16.c
@@ -13,7 +13,7 @@ DEFAULT_DEBUG_CHANNEL(ver);
 
 
 /*************************************************************************
- * GetFileVersionInfoSize16                  [VER.6]
+ * GetFileVersionInfoSize                  [VER.6]
  */
 DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
 {
@@ -22,7 +22,7 @@ DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
 }
 
 /*************************************************************************
- * GetFileVersionInfo16                      [VER.7]
+ * GetFileVersionInfo                      [VER.7]
  */
 DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
                                    DWORD cbBuf, LPVOID lpvData )
@@ -34,7 +34,7 @@ DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
 }
 
 /*************************************************************************
- * VerFindFile16                             [VER.8]
+ * VerFindFile                             [VER.8]
  */
 DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename, 
                             LPCSTR lpszWinDir, LPCSTR lpszAppDir,
@@ -51,7 +51,7 @@ DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename,
 }
 
 /*************************************************************************
- * VerInstallFile16                          [VER.9]
+ * VerInstallFile                          [VER.9]
  */
 DWORD WINAPI VerInstallFile16( UINT16 flags, 
                                LPCSTR lpszSrcFilename, LPCSTR lpszDestFilename, 
@@ -68,7 +68,7 @@ DWORD WINAPI VerInstallFile16( UINT16 flags,
 }
 
 /*************************************************************************
- * VerLanguageName16                        [VER.10]
+ * VerLanguageName                        [VER.10]
  */
 DWORD WINAPI VerLanguageName16( UINT16 uLang, LPSTR lpszLang, UINT16 cbLang )
 {
@@ -76,7 +76,7 @@ DWORD WINAPI VerLanguageName16( UINT16 uLang, LPSTR lpszLang, UINT16 cbLang )
 }
 
 /*************************************************************************
- * VerQueryValue16                          [VER.11]
+ * VerQueryValue                          [VER.11]
  */
 DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock, 
                               SEGPTR *lpspBuffer, UINT16 *lpcb )
diff --git a/dlls/win32s/w32skernel.c b/dlls/win32s/w32skernel.c
index a5cfe5da45d..0bca7ac7471 100644
--- a/dlls/win32s/w32skernel.c
+++ b/dlls/win32s/w32skernel.c
@@ -12,7 +12,7 @@
 #include "thread.h"
 
 /***********************************************************************
- *		GetWin32sDirectory (W32SKRNL.14)
+ *		_kGetWin32sDirectory@0 (W32SKRNL.14)
  */
 LPSTR WINAPI GetWin32sDirectory(void)
 {
diff --git a/dlls/win32s/w32sys.c b/dlls/win32s/w32sys.c
index 125ea8af92f..72ce582711c 100644
--- a/dlls/win32s/w32sys.c
+++ b/dlls/win32s/w32sys.c
@@ -39,7 +39,7 @@ WORD WINAPI GetWin32sInfo16(
 }
 
 /***********************************************************************
- *            GetW32SysVersion16  (W32SYS.5)
+ *            GetW32SysVersion  (W32SYS.5)
  */
 WORD WINAPI GetW32SysVersion16(void)
 {
@@ -68,7 +68,7 @@ DWORD WINAPI LoadPeResource16(WORD x,SEGPTR y) {
 
 
 /**********************************************************************
- *		IsPeFormat16		(W32SYS.2)
+ *		IsPeFormat		(W32SYS.2)
  * Checks the passed filename if it is a PE format executeable
  * RETURNS
  *  TRUE, if it is.
diff --git a/dlls/win32s/win32s16.c b/dlls/win32s/win32s16.c
index 655442aa155..0b351c1e7d7 100644
--- a/dlls/win32s/win32s16.c
+++ b/dlls/win32s/win32s16.c
@@ -14,7 +14,7 @@
 DEFAULT_DEBUG_CHANNEL(dll);
 
 /***********************************************************************
- *		BootTask16 (WIN32S16.2)
+ *		BootTask (WIN32S16.2)
  */
 void WINAPI BootTask16()
 {
@@ -34,7 +34,7 @@ SEGPTR WINAPI StackLinearToSegmented16(WORD w1, WORD w2)
 
 
 /***********************************************************************
- *           UTSelectorOffsetToLinear16       (WIN32S16.48)
+ *           UTSelectorOffsetToLinear       (WIN32S16.48)
  *
  * rough guesswork, but seems to work (I had no "reasonable" docu)
  */
@@ -44,7 +44,7 @@ LPVOID WINAPI UTSelectorOffsetToLinear16(SEGPTR sptr)
 }
 
 /***********************************************************************
- *           UTLinearToSelectorOffset16       (WIN32S16.49)
+ *           UTLinearToSelectorOffset       (WIN32S16.49)
  *
  * FIXME: I don't know if that's the right way to do linear -> segmented
  */
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index d26151193ce..6a225ee5114 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -398,7 +398,7 @@ error_exit:
 
 
 /***********************************************************************
- *             GetASPISupportInfo16   (WINASPI.1)
+ *             GetASPISupportInfo   (WINASPI.1)
  */
 
 WORD WINAPI GetASPISupportInfo16(void)
@@ -473,7 +473,7 @@ adapter name */
 
 
 /***********************************************************************
- *             SendASPICommand16   (WINASPI.2)
+ *             SendASPICommand   (WINASPI.2)
  */
 WORD WINAPI SendASPICommand16(SEGPTR segptr_srb)
 {
@@ -486,7 +486,7 @@ WORD WINAPI SendASPICommand16(SEGPTR segptr_srb)
 
 
 /***********************************************************************
- *             InsertInASPIChain16   (WINASPI.3)
+ *             InsertInASPIChain   (WINASPI.3)
  */
 WORD WINAPI InsertInASPIChain16(BOOL16 remove, FARPROC16 pASPIChainFunc)
 {
@@ -514,7 +514,7 @@ WORD WINAPI InsertInASPIChain16(BOOL16 remove, FARPROC16 pASPIChainFunc)
 
 
 /***********************************************************************
- *             GetASPIDLLVersion16   (WINASPI.4)
+ *             GETASPIDLLVERSION   (WINASPI.4)
  */
 
 DWORD WINAPI GetASPIDLLVersion16()
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index 87ba3a3d004..ad2c3d5145e 100644
--- a/dlls/winedos/dosvm.c
+++ b/dlls/winedos/dosvm.c
@@ -648,16 +648,38 @@ UINT WINAPI DOSVM_GetTimer( void )
 
 #else /* !MZ_SUPPORTED */
 
+/***********************************************************************
+ *		Enter (WINEDOS.@)
+ */
 INT WINAPI DOSVM_Enter( CONTEXT86 *context )
 {
  ERR_(module)("DOS realmode not supported on this architecture!\n");
  return -1;
 }
 
+/***********************************************************************
+ *		Wait (WINEDOS.@)
+ */
 void WINAPI DOSVM_Wait( INT read_pipe, HANDLE hObject) {}
+
+/***********************************************************************
+ *		OutPIC (WINEDOS.@)
+ */
 void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val) {}
+
+/***********************************************************************
+ *		SetTimer (WINEDOS.@)
+ */
 void WINAPI DOSVM_SetTimer( UINT ticks ) {}
+
+/***********************************************************************
+ *		GetTimer (WINEDOS.@)
+ */
 UINT WINAPI DOSVM_GetTimer( void ) { return 0; }
+
+/***********************************************************************
+ *		QueueEvent (WINEDOS.@)
+ */
 void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data)
 {
   if (irq<0) {
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index 3c1ec74fa2a..47a5f439775 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -597,12 +597,18 @@ void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
 
 #else /* !MZ_SUPPORTED */
 
+/***********************************************************************
+ *		LoadDosExe (WINEDOS.@)
+ */
 void WINAPI MZ_LoadImage( LPCSTR filename, HANDLE hFile )
 {
   WARN("DOS executables not supported on this platform\n");
   SetLastError(ERROR_BAD_FORMAT);
 }
 
+/***********************************************************************
+ *		Exec (WINEDOS.@)
+ */
 BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk )
 {
   /* can't happen */
@@ -610,12 +616,18 @@ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID para
   return FALSE;
 }
 
+/***********************************************************************
+ *		LoadDPMI (WINEDOS.@)
+ */
 LPDOSTASK WINAPI MZ_AllocDPMITask( void )
 {
     ERR("Actual real-mode calls not supported on this platform!\n");
     return NULL;
 }
 
+/***********************************************************************
+ *		Exit (WINEDOS.@)
+ */
 void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
 {
   ExitThread( retval );
diff --git a/dlls/wineps/driver.c b/dlls/wineps/driver.c
index 021e3fc0a26..d0fbaf58d3d 100644
--- a/dlls/wineps/driver.c
+++ b/dlls/wineps/driver.c
@@ -148,7 +148,7 @@ void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2,
 
 /**************************************************************
  *
- *	PSDRV_AdvancedSetupDialog16	[WINEPS.93]
+ *	AdvancedSetupDialog	[WINEPS.93]
  *
  */
 WORD WINAPI PSDRV_AdvancedSetupDialog16(HWND16 hwnd, HANDLE16 hDriver,
@@ -246,7 +246,7 @@ static int WINAPI (*pPropertySheet) (LPCPROPSHEETHEADERA);
 
 /***************************************************************
  *
- *	PSDRV_ExtDeviceMode16	[WINEPS.90]
+ *	ExtDeviceMode	[WINEPS.90]
  *
  * Just returns default devmode at the moment
  */
@@ -331,7 +331,7 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput,
 
 /***********************************************************************
  *
- *	PSDRV_DeviceCapabilities16	[WINEPS.91]
+ *	DeviceCapabilities	[WINEPS.91]
  *
  */
 DWORD WINAPI PSDRV_DeviceCapabilities16(LPCSTR lpszDevice, LPCSTR lpszPort,
@@ -554,7 +554,7 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice,
 
 /***************************************************************
  *
- *	PSDRV_DeviceMode16	[WINEPS.13]
+ *	DeviceMode	[WINEPS.13]
  *
  */
 void WINAPI PSDRV_DeviceMode16(HWND16 hwnd, HANDLE16 hDriver,
diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c
index 6cc40f217f1..85deb327d1b 100644
--- a/dlls/wininet/wininet_main.c
+++ b/dlls/wininet/wininet_main.c
@@ -13,7 +13,7 @@
 DEFAULT_DEBUG_CHANNEL(wininet);
 
 /***********************************************************************
- *		WININET_DllInstall (WININET.@)
+ *		DllInstall (WININET.@)
  */
 HRESULT WINAPI WININET_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 2e07117eba6..38c22ea4096 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -426,7 +426,8 @@ HDRVR WINAPI OpenDriverA(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lPara
 }
 
 /**************************************************************************
- *				OpenDriverW		        [WINMM.@]
+ *				OpenDriver 		        [WINMM.@]
+ *				DrvOpen				[WINMM.@]
  */
 HDRVR WINAPI OpenDriverW(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam)
 {
diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index aaf35275b65..667398f474d 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -242,7 +242,7 @@ MMRESULT WINAPI joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo)
 }
 
 /**************************************************************************
- *                              joyGetPosEx16           [MMSYSTEM.]
+ *                              joyGetPosEx           [MMSYSTEM.110]
  */
 MMRESULT16 WINAPI joyGetPosEx16(UINT16 wID, LPJOYINFOEX lpInfo)
 {
@@ -268,7 +268,7 @@ MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo)
 }
 
 /**************************************************************************
- * 				joyGetPos16	       	[MMSYSTEM.103]
+ * 				joyGetPos	       	[MMSYSTEM.103]
  */
 MMRESULT16 WINAPI joyGetPos16(UINT16 wID, LPJOYINFO16 lpInfo)
 {
diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c
index 7965ed5c25a..3dab2ec2e2a 100644
--- a/dlls/winmm/joystick/joystick.c
+++ b/dlls/winmm/joystick/joystick.c
@@ -336,7 +336,7 @@ static LONG	JSTCK_GetPos(DWORD dwDevID, LPJOYINFO lpInfo)
 }
 
 /**************************************************************************
- * 				JSTCK_DriverProc		[internal]
+ * 				DriverProc		[internal]
  */
 LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				 DWORD dwParam1, DWORD dwParam2)
@@ -370,7 +370,7 @@ LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
 #else
 
 /**************************************************************************
- * 				JSTCK_DriverProc		[internal]
+ * 				DriverProc		[internal]
  */
 LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				 DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 81e7c7b88de..f9c6abcf528 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -1035,7 +1035,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpwstrCommand, LPSTR lpstrRet,
 }
 
 /**************************************************************************
- * 				mciSendString16			[MMSYSTEM.702]
+ * 				mciSendString			[MMSYSTEM.702]
  */
 DWORD WINAPI mciSendString16(LPCSTR lpstrCommand, LPSTR lpstrRet, 
 			     UINT16 uRetLen, HWND16 hwndCallback)
diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c
index d044c3430ad..a702e18f583 100644
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -792,7 +792,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
 }
 
 /**************************************************************************
- * 			MCICDA_DriverProc			[exported]
+ * 			DriverProc			[exported]
  */
 LONG CALLBACK	MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				      DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/midimap/midimap.c b/dlls/winmm/midimap/midimap.c
index 398c42e87ec..20f0a967255 100644
--- a/dlls/winmm/midimap/midimap.c
+++ b/dlls/winmm/midimap/midimap.c
@@ -514,7 +514,7 @@ static	DWORD	MIDIMAP_drvClose(DWORD dwDevID)
 }
 
 /**************************************************************************
- * 				MIDIMAP_DriverProc		[internal]
+ * 				DriverProc		[internal]
  */
 LONG CALLBACK	MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				   DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index 5747c120022..b03072302fa 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -1172,7 +1172,7 @@ UINT WINAPI mmioGetInfo(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags)
 }
 
 /**************************************************************************
- * 				mmioSetInfo16  		[MMSYSTEM.1216]
+ * 				mmioSetInfo  		[MMSYSTEM.1216]
  */
 UINT16 WINAPI mmioSetInfo16(HMMIO16 hmmio, const MMIOINFO16* lpmmioinfo, UINT16 uFlags)
 {
@@ -1398,7 +1398,7 @@ FOURCC WINAPI mmioStringToFOURCC16(LPCSTR sz, UINT16 uFlags)
 }
 
 /**************************************************************************
- *              mmioInstallIOProc16    [MMSYSTEM.1221]
+ *              mmioInstallIOProc    [MMSYSTEM.1221]
  */
 LPMMIOPROC16 WINAPI mmioInstallIOProc16(FOURCC fccIOProc, LPMMIOPROC16 pIOProc,
                                         DWORD dwFlags)
@@ -1417,7 +1417,7 @@ LPMMIOPROC WINAPI mmioInstallIOProcA(FOURCC fccIOProc,
 }
 
 /**************************************************************************
- * 				mmioInstallIOProcW	   [WINMM.]
+ * 				mmioInstallIOProcW	   [WINMM.@]
  */
 LPMMIOPROC WINAPI mmioInstallIOProcW(FOURCC fccIOProc, 
 				     LPMMIOPROC pIOProc, DWORD dwFlags)
@@ -1426,7 +1426,7 @@ LPMMIOPROC WINAPI mmioInstallIOProcW(FOURCC fccIOProc,
 }
 
 /**************************************************************************
- * 				mmioSendMessage16	[MMSYSTEM.1222]
+ * 				mmioSendMessage	[MMSYSTEM.1222]
  */
 LRESULT WINAPI mmioSendMessage16(HMMIO16 hmmio, UINT16 uMessage,
 				 LPARAM lParam1, LPARAM lParam2)
@@ -1445,7 +1445,7 @@ LRESULT WINAPI mmioSendMessage16(HMMIO16 hmmio, UINT16 uMessage,
 }
 
 /**************************************************************************
- * 				mmioSendMessage		[WINMM.]
+ * 				mmioSendMessage		[WINMM.@]
  */
 LRESULT WINAPI mmioSendMessage(HMMIO hmmio, UINT uMessage,
 			       LPARAM lParam1, LPARAM lParam2)
@@ -1568,7 +1568,7 @@ UINT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck,
 }
 
 /**************************************************************************
- * 				mmioDescend16	       	[MMSYSTEM.1223]
+ * 				mmioDescend	       	[MMSYSTEM.1223]
  */
 UINT16 WINAPI mmioDescend16(HMMIO16 hmmio, LPMMCKINFO lpck,
 			    const MMCKINFO* lpckParent, UINT16 uFlags)
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index 1b82737e688..b0d87dbf02a 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -132,7 +132,7 @@ BOOL WINAPI WINMM_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad)
 }
 
 /**************************************************************************
- * 			MMSYSTEM_LibMain			[EntryPoint]
+ * 			DllEntryPoint			[EntryPoint]
  *
  * MMSYSTEM DLL entry point
  *
@@ -472,6 +472,7 @@ static DWORD WINAPI PlaySound_Thread(LPVOID arg)
 }
 
 /**************************************************************************
+ * 				PlaySound 		[MMSYSTEM.3]
  * 				PlaySoundA		[WINMM.@]
  */
 BOOL WINAPI PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound)
@@ -562,7 +563,7 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound)
 }
 
 /**************************************************************************
- * 				PlaySound16		[MMSYSTEM.3]
+ * 				PlaySound		[MMSYSTEM.3]
  */
 BOOL16 WINAPI PlaySound16(LPCSTR pszSound, HMODULE16 hmod, DWORD fdwSound)
 {
@@ -595,7 +596,7 @@ BOOL WINAPI sndPlaySoundW(LPCWSTR lpszSoundName, UINT uFlags)
 }
 
 /**************************************************************************
- * 				sndPlaySound16		[MMSYSTEM.2]
+ * 				sndPlaySound		[MMSYSTEM.2]
  */
 BOOL16 WINAPI sndPlaySound16(LPCSTR lpszSoundName, UINT16 uFlags)
 {
@@ -4009,7 +4010,7 @@ UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut)
 }
 
 /**************************************************************************
- * 				waveOutBreakLoop16	[MMSYSTEM.419]
+ * 				waveOutBreakLoop	[MMSYSTEM.419]
  */
 UINT16 WINAPI waveOutBreakLoop16(HWAVEOUT16 hWaveOut16)
 {
@@ -4037,7 +4038,7 @@ UINT WINAPI waveOutPause(HWAVEOUT hWaveOut)
 }
 
 /**************************************************************************
- * 				waveOutPause16		[MMSYSTEM.409]
+ * 				waveOutPause		[MMSYSTEM.409]
  */
 UINT16 WINAPI waveOutPause16(HWAVEOUT16 hWaveOut16)
 {
@@ -4065,7 +4066,7 @@ UINT WINAPI waveOutReset(HWAVEOUT hWaveOut)
 }
 
 /**************************************************************************
- * 				waveOutReset16		[MMSYSTEM.411]
+ * 				waveOutReset		[MMSYSTEM.411]
  */
 UINT16 WINAPI waveOutReset16(HWAVEOUT16 hWaveOut16)
 {
@@ -4093,7 +4094,7 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut)
 }
 
 /**************************************************************************
- * 				waveOutRestart16	[MMSYSTEM.410]
+ * 				waveOutRestart	[MMSYSTEM.410]
  */
 UINT16 WINAPI waveOutRestart16(HWAVEOUT16 hWaveOut16)
 {
@@ -4964,7 +4965,7 @@ HTASK16 WINAPI mmGetCurrentTask16(void)
 }
 
 /**************************************************************************
- * 				mmTaskYield16		[MMSYSTEM.905]
+ * 				mmTaskYield		[MMSYSTEM.905]
  */
 void	WINAPI	mmTaskYield16(void)
 {
@@ -5230,7 +5231,7 @@ extern LONG CALLBACK MMSYSTEM_CallTo16_long_l    (FARPROC16,LONG);
 /* ### stop build ### */
 
 /**************************************************************************
- * 				WINE_mmThreadEntryPoint		[internal]
+ * 				__wine_mmThreadEntryPoint		[internal]
  */
 void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt)
 {
diff --git a/dlls/winmm/sound16.c b/dlls/winmm/sound16.c
index daee652342a..45bbc32504f 100644
--- a/dlls/winmm/sound16.c
+++ b/dlls/winmm/sound16.c
@@ -12,7 +12,7 @@
 DEFAULT_DEBUG_CHANNEL(sound);
 
 /***********************************************************************
- *		OpenSound16 (SOUND.1)
+ *		OpenSound (SOUND.1)
  */
 INT16 WINAPI OpenSound16(void)
 {
@@ -21,7 +21,7 @@ INT16 WINAPI OpenSound16(void)
 }
 
 /***********************************************************************
- *		CloseSound16 (SOUND.2)
+ *		CloseSound (SOUND.2)
  */
 void WINAPI CloseSound16(void)
 {
@@ -29,7 +29,7 @@ void WINAPI CloseSound16(void)
 }
 
 /***********************************************************************
- *		SetVoiceQueueSize16 (SOUND.3)
+ *		SetVoiceQueueSize (SOUND.3)
  */
 INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes)
 {
@@ -38,7 +38,7 @@ INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes)
 }
 
 /***********************************************************************
- *		SetVoiceNote16 (SOUND.4)
+ *		SetVoiceNote (SOUND.4)
  */
 INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
                             INT16 nCdots)
@@ -48,7 +48,7 @@ INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
 }
 
 /***********************************************************************
- *		SetVoiceAccent16 (SOUND.5)
+ *		SetVoiceAccent (SOUND.5)
  */
 INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
                               INT16 nMode, INT16 nPitch)
@@ -59,7 +59,7 @@ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
 }
 
 /***********************************************************************
- *		SetVoiceEnvelope16 (SOUND.6)
+ *		SetVoiceEnvelope (SOUND.6)
  */
 INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
 {
@@ -68,7 +68,7 @@ INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
 }
 
 /***********************************************************************
- *		SetSoundNoise16 (SOUND.7)
+ *		SetSoundNoise (SOUND.7)
  */
 INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
 {
@@ -77,7 +77,7 @@ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
 }
 
 /***********************************************************************
- *		SetVoiceSound16 (SOUND.8)
+ *		SetVoiceSound (SOUND.8)
  */
 INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
 {
@@ -86,7 +86,7 @@ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
 }
 
 /***********************************************************************
- *		StartSound16 (SOUND.9)
+ *		StartSound (SOUND.9)
  */
 INT16 WINAPI StartSound16(void)
 {
@@ -94,7 +94,7 @@ INT16 WINAPI StartSound16(void)
 }
 
 /***********************************************************************
- *		StopSound16 (SOUND.10)
+ *		StopSound (SOUND.10)
  */
 INT16 WINAPI StopSound16(void)
 {
@@ -102,7 +102,7 @@ INT16 WINAPI StopSound16(void)
 }
 
 /***********************************************************************
- *		WaitSoundState16 (SOUND.11)
+ *		WaitSoundState (SOUND.11)
  */
 INT16 WINAPI WaitSoundState16(INT16 x)
 {
@@ -111,7 +111,7 @@ INT16 WINAPI WaitSoundState16(INT16 x)
 }
 
 /***********************************************************************
- *		SyncAllVoices16 (SOUND.12)
+ *		SyncAllVoices (SOUND.12)
  */
 INT16 WINAPI SyncAllVoices16(void)
 {
@@ -120,7 +120,7 @@ INT16 WINAPI SyncAllVoices16(void)
 }
 
 /***********************************************************************
- *		CountVoiceNotes16 (SOUND.13)
+ *		CountVoiceNotes (SOUND.13)
  */
 INT16 WINAPI CountVoiceNotes16(INT16 x)
 {
@@ -129,7 +129,7 @@ INT16 WINAPI CountVoiceNotes16(INT16 x)
 }
 
 /***********************************************************************
- *		GetThresholdEvent16 (SOUND.14)
+ *		GetThresholdEvent (SOUND.14)
  */
 LPINT16 WINAPI GetThresholdEvent16(void)
 {
@@ -138,7 +138,7 @@ LPINT16 WINAPI GetThresholdEvent16(void)
 }
 
 /***********************************************************************
- *		GetThresholdStatus16 (SOUND.15)
+ *		GetThresholdStatus (SOUND.15)
  */
 INT16 WINAPI GetThresholdStatus16(void)
 {
@@ -147,7 +147,7 @@ INT16 WINAPI GetThresholdStatus16(void)
 }
 
 /***********************************************************************
- *		SetVoiceThreshold16 (SOUND.16)
+ *		SetVoiceThreshold (SOUND.16)
  */
 INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
 {
@@ -156,7 +156,7 @@ INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
 }
 
 /***********************************************************************
- *		DoBeep16 (SOUND.17)
+ *		DoBeep (SOUND.17)
  */
 void WINAPI DoBeep16(void)
 {
diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c
index c30b1f0f792..fddd5d2c785 100644
--- a/dlls/winmm/time.c
+++ b/dlls/winmm/time.c
@@ -379,7 +379,7 @@ MMRESULT WINAPI timeBeginPeriod(UINT wPeriod)
 }
 
 /**************************************************************************
- * 				timeBeginPeriod16	[MMSYSTEM.605]
+ * 				timeBeginPeriod	[MMSYSTEM.605]
  */
 MMRESULT16 WINAPI timeBeginPeriod16(UINT16 wPeriod)
 {
@@ -403,7 +403,7 @@ MMRESULT WINAPI timeEndPeriod(UINT wPeriod)
 }
 
 /**************************************************************************
- * 				timeEndPeriod16		[MMSYSTEM.606]
+ * 				timeEndPeriod		[MMSYSTEM.606]
  */
 MMRESULT16 WINAPI timeEndPeriod16(UINT16 wPeriod)
 {
diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c
index 67bb3b40d1e..1deda85b906 100644
--- a/dlls/winmm/wavemap/wavemap.c
+++ b/dlls/winmm/wavemap/wavemap.c
@@ -803,7 +803,7 @@ static	DWORD	WAVEMAP_drvClose(DWORD dwDevID)
 }
 
 /**************************************************************************
- * 				WAVEMAP_DriverProc		[internal]
+ * 				DriverProc		[internal]
  */
 LONG CALLBACK	WAVEMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				   DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c
index e2e26a3d7b5..ba6bbb72706 100644
--- a/dlls/winmm/wineoss/oss.c
+++ b/dlls/winmm/wineoss/oss.c
@@ -47,7 +47,7 @@ static	DWORD	OSS_drvClose(DWORD dwDevID)
 
 
 /**************************************************************************
- * 				OSS_DriverProc			[internal]
+ * 				DriverProc			[internal]
  */
 LONG CALLBACK	OSS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 			       DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c
index 1a16a7fe540..9b02ef6827a 100644
--- a/dlls/winsock/async.c
+++ b/dlls/winsock/async.c
@@ -533,7 +533,7 @@ static HANDLE16	__WSAsyncDBQuery(
 
 
 /***********************************************************************
- *       WSAAsyncGetHostByAddr()	(WINSOCK.102)
+ *       WSAAsyncGetHostByAddr	(WINSOCK.102)
  */
 HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr,
                                INT16 len, INT16 type, SEGPTR sbuf, INT16 buflen)
@@ -545,7 +545,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr,
 }
 
 /***********************************************************************
- *       WSAAsyncGetHostByAddr()        (WSOCK32.102)
+ *       WSAAsyncGetHostByAddr        (WS2_32.102)
  */
 HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr,
                                INT len, INT type, LPSTR sbuf, INT buflen)
@@ -557,7 +557,7 @@ HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr,
 }
 
 /***********************************************************************
- *       WSAAsyncGetHostByName()	(WINSOCK.103)
+ *       WSAAsyncGetHostByName	(WINSOCK.103)
  */
 HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, 
                                       SEGPTR sbuf, INT16 buflen)
@@ -569,7 +569,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
 }                     
 
 /***********************************************************************
- *       WSAAsyncGetHostByName()	(WSOCK32.103)
+ *       WSAAsyncGetHostByName	(WS2_32.103)
  */
 HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, 
 					LPSTR sbuf, INT buflen)
@@ -581,7 +581,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name,
 }
 
 /***********************************************************************
- *       WSAAsyncGetProtoByName()	(WINSOCK.105)
+ *       WSAAsyncGetProtoByName	(WINSOCK.105)
  */
 HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, 
                                          SEGPTR sbuf, INT16 buflen)
@@ -593,7 +593,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
 }
 
 /***********************************************************************
- *       WSAAsyncGetProtoByName()       (WSOCK32.105)
+ *       WSAAsyncGetProtoByName       (WS2_32.105)
  */
 HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name,
                                          LPSTR sbuf, INT buflen)
@@ -606,7 +606,7 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name,
 
 
 /***********************************************************************
- *       WSAAsyncGetProtoByNumber()	(WINSOCK.104)
+ *       WSAAsyncGetProtoByNumber	(WINSOCK.104)
  */
 HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number,
                                            SEGPTR sbuf, INT16 buflen)
@@ -617,7 +617,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number,
 }
 
 /***********************************************************************
- *       WSAAsyncGetProtoByNumber()     (WSOCK32.104)
+ *       WSAAsyncGetProtoByNumber     (WS2_32.104)
  */
 HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number,
                                            LPSTR sbuf, INT buflen)
@@ -628,7 +628,7 @@ HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number,
 }
 
 /***********************************************************************
- *       WSAAsyncGetServByName()	(WINSOCK.107)
+ *       WSAAsyncGetServByName	(WINSOCK.107)
  */
 HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, 
                                         LPCSTR proto, SEGPTR sbuf, INT16 buflen)
@@ -640,7 +640,7 @@ HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name,
 }
 
 /***********************************************************************
- *       WSAAsyncGetServByName()        (WSOCK32.107)
+ *       WSAAsyncGetServByName        (WS2_32.107)
  */
 HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name,
                                         LPCSTR proto, LPSTR sbuf, INT buflen)
@@ -652,7 +652,7 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name,
 }
 
 /***********************************************************************
- *       WSAAsyncGetServByPort()	(WINSOCK.106)
+ *       WSAAsyncGetServByPort	(WINSOCK.106)
  */
 HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port, 
                                         LPCSTR proto, SEGPTR sbuf, INT16 buflen)
@@ -664,7 +664,7 @@ HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port,
 }
 
 /***********************************************************************
- *       WSAAsyncGetServByPort()        (WSOCK32.106)
+ *       WSAAsyncGetServByPort        (WS2_32.106)
  */
 HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port,
                                         LPCSTR proto, LPSTR sbuf, INT buflen)
@@ -676,7 +676,7 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port,
 }
 
 /***********************************************************************
- *       WSACancelAsyncRequest()	(WINSOCK.108)(WSOCK32.109)
+ *       WSACancelAsyncRequest	(WS2_32.108)
  */
 INT WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle)
 {
@@ -684,6 +684,9 @@ INT WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle)
     return 0;
 }
 
+/***********************************************************************
+ *       WSACancelAsyncRequest	(WINSOCK.108)
+ */
 INT16 WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle)
 {
     return (HANDLE16)WSACancelAsyncRequest((HANDLE)hAsyncTaskHandle);
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 0538e79e238..064a18b960d 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -315,7 +315,7 @@ static void WINSOCK_DeleteIData(void)
 }
 
 /***********************************************************************
- *		WSOCK32_LibMain (WSOCK32.init)
+ *		WSOCK32_LibMain (WS2_32.init)
  */
 BOOL WINAPI WSOCK32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
@@ -525,7 +525,7 @@ void __ws_memfree(void* ptr)
  */
 
 /***********************************************************************
- *      WSAStartup16()			(WINSOCK.115)
+ *      WSAStartup			(WINSOCK.115)
  *
  * Create socket control struct, attach it to the global list and
  * update a pointer in the task struct.
@@ -581,7 +581,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData)
 }
 
 /***********************************************************************
- *      WSAStartup()		(WS2_32.115)	
+ *      WSAStartup		(WS2_32.115)
  */
 INT WINAPI WSAStartup(UINT wVersionRequested, LPWSADATA lpWSAData)
 {
@@ -637,7 +637,7 @@ INT WINAPI WSAStartup(UINT wVersionRequested, LPWSADATA lpWSAData)
 
 
 /***********************************************************************
- *      WSACleanup()			(WINSOCK.116)
+ *      WSACleanup			(WINSOCK.116)
  */
 INT WINAPI WSACleanup(void)
 {
@@ -653,7 +653,8 @@ INT WINAPI WSACleanup(void)
 
 
 /***********************************************************************
- *      WSAGetLastError()		(WSOCK32.111)(WINSOCK.111)
+ *      WSAGetLastError		(WINSOCK.111)
+ *      WSAGetLastError		(WS2_32.111)
  */
 INT WINAPI WSAGetLastError(void)
 {
@@ -661,14 +662,14 @@ INT WINAPI WSAGetLastError(void)
 }
 
 /***********************************************************************
- *      WSASetLastError()		(WSOCK32.112)
+ *      WSASetLastError		(WS2_32.112)
  */
 void WINAPI WSASetLastError(INT iError) {
     SetLastError(iError);
 }
 
 /***********************************************************************
- *      WSASetLastError16()		(WINSOCK.112)
+ *      WSASetLastError		(WINSOCK.112)
  */
 void WINAPI WSASetLastError16(INT16 iError)
 {
@@ -727,7 +728,7 @@ static struct ws_protoent* check_buffer_pe(int size)
 /* ----------------------------------- i/o APIs */
 
 /***********************************************************************
- *		accept()		(WSOCK32.1)
+ *		accept		(WS2_32.1)
  */
 static void WSOCK32_async_accept(SOCKET s, SOCKET as)
 {
@@ -808,7 +809,7 @@ SOCKET WINAPI WSOCK32_accept(SOCKET s, struct sockaddr *addr,
 }
 
 /***********************************************************************
- *              accept()		(WINSOCK.1)
+ *              accept		(WINSOCK.1)
  */
 SOCKET16 WINAPI WINSOCK_accept16(SOCKET16 s, struct sockaddr* addr,
                                  INT16* addrlen16 )
@@ -820,7 +821,7 @@ SOCKET16 WINAPI WINSOCK_accept16(SOCKET16 s, struct sockaddr* addr,
 }
 
 /***********************************************************************
- *		bind()			(WSOCK32.2)
+ *		bind			(WS2_32.2)
  */
 INT WINAPI WSOCK32_bind(SOCKET s, struct sockaddr *name, INT namelen)
 {
@@ -893,7 +894,7 @@ INT WINAPI WSOCK32_bind(SOCKET s, struct sockaddr *name, INT namelen)
 }
 
 /***********************************************************************
- *              bind()			(WINSOCK.2)
+ *              bind			(WINSOCK.2)
  */
 INT16 WINAPI WINSOCK_bind16(SOCKET16 s, struct sockaddr *name, INT16 namelen)
 {
@@ -901,7 +902,7 @@ INT16 WINAPI WINSOCK_bind16(SOCKET16 s, struct sockaddr *name, INT16 namelen)
 }
 
 /***********************************************************************
- *		closesocket()		(WSOCK32.3)
+ *		closesocket		(WS2_32.3)
  */
 INT WINAPI WSOCK32_closesocket(SOCKET s)
 {
@@ -911,7 +912,7 @@ INT WINAPI WSOCK32_closesocket(SOCKET s)
 }
 
 /***********************************************************************
- *              closesocket()           (WINSOCK.3)
+ *              closesocket           (WINSOCK.3)
  */
 INT16 WINAPI WINSOCK_closesocket16(SOCKET16 s)
 {
@@ -919,7 +920,7 @@ INT16 WINAPI WINSOCK_closesocket16(SOCKET16 s)
 }
 
 /***********************************************************************
- *		connect()		(WSOCK32.4)
+ *		connect		(WS2_32.4)
  */
 INT WINAPI WSOCK32_connect(SOCKET s, struct sockaddr *name, INT namelen)
 {
@@ -1001,7 +1002,7 @@ connect_success:
 }
 
 /***********************************************************************
- *              connect()               (WINSOCK.4)
+ *              connect               (WINSOCK.4)
  */
 INT16 WINAPI WINSOCK_connect16(SOCKET16 s, struct sockaddr *name, INT16 namelen)
 {
@@ -1009,7 +1010,7 @@ INT16 WINAPI WINSOCK_connect16(SOCKET16 s, struct sockaddr *name, INT16 namelen)
 }
 
 /***********************************************************************
- *		getpeername()		(WSOCK32.5)
+ *		getpeername		(WS2_32.5)
  */
 INT WINAPI WSOCK32_getpeername(SOCKET s, struct sockaddr *name,
                                    INT *namelen)
@@ -1046,7 +1047,7 @@ INT WINAPI WSOCK32_getpeername(SOCKET s, struct sockaddr *name,
 }
 
 /***********************************************************************
- *              getpeername()		(WINSOCK.5)
+ *              getpeername		(WINSOCK.5)
  */
 INT16 WINAPI WINSOCK_getpeername16(SOCKET16 s, struct sockaddr *name,
                                    INT16 *namelen16)
@@ -1063,7 +1064,7 @@ INT16 WINAPI WINSOCK_getpeername16(SOCKET16 s, struct sockaddr *name,
 }
 
 /***********************************************************************
- *		getsockname()		(WSOCK32.6)
+ *		getsockname		(WS2_32.6)
  */
 INT WINAPI WSOCK32_getsockname(SOCKET s, struct sockaddr *name,
                                    INT *namelen)
@@ -1100,7 +1101,7 @@ INT WINAPI WSOCK32_getsockname(SOCKET s, struct sockaddr *name,
 }
 
 /***********************************************************************
- *              getsockname()		(WINSOCK.6)
+ *              getsockname		(WINSOCK.6)
  */
 INT16 WINAPI WINSOCK_getsockname16(SOCKET16 s, struct sockaddr *name,
                                    INT16 *namelen16)
@@ -1124,7 +1125,7 @@ INT16 WINAPI WINSOCK_getsockname16(SOCKET16 s, struct sockaddr *name,
 
 
 /***********************************************************************
- *		getsockopt()		(WSOCK32.7)
+ *		getsockopt		(WS2_32.7)
  */
 INT WINAPI WSOCK32_getsockopt(SOCKET s, INT level, 
                                   INT optname, char *optval, INT *optlen)
@@ -1150,7 +1151,7 @@ INT WINAPI WSOCK32_getsockopt(SOCKET s, INT level,
 }
 
 /***********************************************************************
- *              getsockopt()		(WINSOCK.7)
+ *              getsockopt		(WINSOCK.7)
  */
 INT16 WINAPI WINSOCK_getsockopt16(SOCKET16 s, INT16 level,
                                   INT16 optname, char *optval, INT16 *optlen)
@@ -1165,28 +1166,33 @@ INT16 WINAPI WINSOCK_getsockopt16(SOCKET16 s, INT16 level,
 }
 
 /***********************************************************************
- *		htonl()			(WINSOCK.8)(WSOCK32.8)
+ *		htonl			(WINSOCK.8)
+ *		htonl			(WS2_32.8)
  */
 u_long WINAPI WINSOCK_htonl(u_long hostlong)   { return( htonl(hostlong) ); }
 /***********************************************************************
- *		htons()			(WINSOCK.9)(WSOCK32.9)
+ *		htons			(WINSOCK.9)
+ *		htons			(WS2_32.9)
  */
 u_short WINAPI WINSOCK_htons(u_short hostshort) { return( htons(hostshort) ); }
 /***********************************************************************
- *		inet_addr()		(WINSOCK.10)(WSOCK32.10)
+ *		inet_addr		(WINSOCK.10)
+ *		inet_addr		(WS2_32.11)
  */
 u_long WINAPI WINSOCK_inet_addr(char *cp)      { return( inet_addr(cp) ); }
 /***********************************************************************
- *		ntohl()			(WINSOCK.14)(WSOCK32.14)
+ *		ntohl			(WINSOCK.14)
+ *		ntohl			(WS2_32.14)
  */
 u_long WINAPI WINSOCK_ntohl(u_long netlong)    { return( ntohl(netlong) ); }
 /***********************************************************************
- *		ntohs()			(WINSOCK.15)(WSOCK32.15)
+ *		ntohs			(WINSOCK.15)
+ *		ntohs			(WS2_32.15)
  */
 u_short WINAPI WINSOCK_ntohs(u_short netshort)  { return( ntohs(netshort) ); }
 
 /***********************************************************************
- *		inet_ntoa()		(WINSOCK.11)(WSOCK32.11)
+ *		inet_ntoa		(WS2_32.12)
  */
 char* WINAPI WSOCK32_inet_ntoa(struct in_addr in)
 {
@@ -1212,8 +1218,9 @@ char* WINAPI WSOCK32_inet_ntoa(struct in_addr in)
     return NULL;
 }
 
-/**********************************************************************/
-
+/***********************************************************************
+ *		inet_ntoa		(WINSOCK.11)
+ */
 SEGPTR WINAPI WINSOCK_inet_ntoa16(struct in_addr in)
 {
   char* retVal = WSOCK32_inet_ntoa(in);
@@ -1510,7 +1517,7 @@ int WSAIOCTL_GetInterfaceName(int intNumber, char *intName)
 
 
 /***********************************************************************
- *		ioctlsocket()		(WSOCK32.12)
+ *		ioctlsocket		(WS2_32.10)
  */
 INT WINAPI WSOCK32_ioctlsocket(SOCKET s, LONG cmd, ULONG *argp)
 {
@@ -1580,7 +1587,7 @@ INT WINAPI WSOCK32_ioctlsocket(SOCKET s, LONG cmd, ULONG *argp)
 }
 
 /***********************************************************************
- *              ioctlsocket()           (WINSOCK.12)
+ *              ioctlsocket           (WINSOCK.12)
  */
 INT16 WINAPI WINSOCK_ioctlsocket16(SOCKET16 s, LONG cmd, ULONG *argp)
 {
@@ -1589,7 +1596,7 @@ INT16 WINAPI WINSOCK_ioctlsocket16(SOCKET16 s, LONG cmd, ULONG *argp)
 
 
 /***********************************************************************
- *		listen()		(WSOCK32.13)
+ *		listen		(WS2_32.13)
  */
 INT WINAPI WSOCK32_listen(SOCKET s, INT backlog)
 {
@@ -1613,7 +1620,7 @@ INT WINAPI WSOCK32_listen(SOCKET s, INT backlog)
 }
 
 /***********************************************************************
- *              listen()		(WINSOCK.13)
+ *              listen		(WINSOCK.13)
  */
 INT16 WINAPI WINSOCK_listen16(SOCKET16 s, INT16 backlog)
 {
@@ -1622,7 +1629,7 @@ INT16 WINAPI WINSOCK_listen16(SOCKET16 s, INT16 backlog)
 
 
 /***********************************************************************
- *		recv()			(WSOCK32.16)
+ *		recv			(WS2_32.16)
  */
 INT WINAPI WSOCK32_recv(SOCKET s, char *buf, INT len, INT flags)
 {
@@ -1657,7 +1664,7 @@ INT WINAPI WSOCK32_recv(SOCKET s, char *buf, INT len, INT flags)
 }
 
 /***********************************************************************
- *              recv()			(WINSOCK.16)
+ *              recv			(WINSOCK.16)
  */
 INT16 WINAPI WINSOCK_recv16(SOCKET16 s, char *buf, INT16 len, INT16 flags)
 {
@@ -1666,7 +1673,7 @@ INT16 WINAPI WINSOCK_recv16(SOCKET16 s, char *buf, INT16 len, INT16 flags)
 
 
 /***********************************************************************
- *		recvfrom()		(WSOCK32.17)
+ *		recvfrom		(WS2_32.17)
  */
 INT WINAPI WSOCK32_recvfrom(SOCKET s, char *buf, INT len, INT flags, 
                                 struct sockaddr *from, INT *fromlen32)
@@ -1735,7 +1742,7 @@ INT WINAPI WSOCK32_recvfrom(SOCKET s, char *buf, INT len, INT flags,
 }
 
 /***********************************************************************
- *              recvfrom()		(WINSOCK.17)
+ *              recvfrom		(WINSOCK.17)
  */
 INT16 WINAPI WINSOCK_recvfrom16(SOCKET16 s, char *buf, INT16 len, INT16 flags,
                                 struct sockaddr *from, INT16 *fromlen16)
@@ -1751,7 +1758,7 @@ INT16 WINAPI WINSOCK_recvfrom16(SOCKET16 s, char *buf, INT16 len, INT16 flags,
 }
 
 /***********************************************************************
- *		select()		(WINSOCK.18)(WSOCK32.18)
+ *		__ws_select
  */
 static INT __ws_select( BOOL b32, void *ws_readfds, void *ws_writefds, void *ws_exceptfds,
 			  struct timeval *timeout )
@@ -1812,6 +1819,9 @@ static INT __ws_select( BOOL b32, void *ws_readfds, void *ws_writefds, void *ws_
     return SOCKET_ERROR;
 }
 
+/***********************************************************************
+ *		select			(WINSOCK.18)
+ */
 INT16 WINAPI WINSOCK_select16(INT16 nfds, ws_fd_set16 *ws_readfds,
                               ws_fd_set16 *ws_writefds, ws_fd_set16 *ws_exceptfds,
                               struct timeval *timeout)
@@ -1819,6 +1829,9 @@ INT16 WINAPI WINSOCK_select16(INT16 nfds, ws_fd_set16 *ws_readfds,
     return (INT16)__ws_select( FALSE, ws_readfds, ws_writefds, ws_exceptfds, timeout );
 }
 
+/***********************************************************************
+ *		select			(WINSOCK.18)
+ */
 INT WINAPI WSOCK32_select(INT nfds, ws_fd_set32 *ws_readfds,
                               ws_fd_set32 *ws_writefds, ws_fd_set32 *ws_exceptfds,
                               struct timeval *timeout)
@@ -1829,7 +1842,7 @@ INT WINAPI WSOCK32_select(INT nfds, ws_fd_set32 *ws_readfds,
 
 
 /***********************************************************************
- *		send()			(WSOCK32.19)
+ *		send			(WS2_32.19)
  */
 INT WINAPI WSOCK32_send(SOCKET s, char *buf, INT len, INT flags)
 {
@@ -1864,7 +1877,7 @@ INT WINAPI WSOCK32_send(SOCKET s, char *buf, INT len, INT flags)
 }
 
 /***********************************************************************
- *		WSASend			(WSOCK32.72)
+ *		WSASend			(WS2_32.72)
  */
 INT WINAPI WSASend( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
                     LPDWORD lpNumberOfBytesSent, DWORD dwFlags,
@@ -1911,7 +1924,7 @@ INT WINAPI WSASend( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
 }
 
 /***********************************************************************
- *              send()			(WINSOCK.19)
+ *              send			(WINSOCK.19)
  */
 INT16 WINAPI WINSOCK_send16(SOCKET16 s, char *buf, INT16 len, INT16 flags)
 {
@@ -1919,7 +1932,7 @@ INT16 WINAPI WINSOCK_send16(SOCKET16 s, char *buf, INT16 len, INT16 flags)
 }
 
 /***********************************************************************
- *		sendto()		(WSOCK32.20)
+ *		sendto		(WS2_32.20)
  */
 INT WINAPI WSOCK32_sendto(SOCKET s, char *buf, INT len, INT flags,
                               struct sockaddr *to, INT tolen)
@@ -1983,7 +1996,7 @@ INT WINAPI WSOCK32_sendto(SOCKET s, char *buf, INT len, INT flags,
 }
 
 /***********************************************************************
- *              sendto()		(WINSOCK.20)
+ *              sendto		(WINSOCK.20)
  */
 INT16 WINAPI WINSOCK_sendto16(SOCKET16 s, char *buf, INT16 len, INT16 flags,
                               struct sockaddr *to, INT16 tolen)
@@ -1992,7 +2005,7 @@ INT16 WINAPI WINSOCK_sendto16(SOCKET16 s, char *buf, INT16 len, INT16 flags,
 }
 
 /***********************************************************************
- *		setsockopt()		(WSOCK32.21)
+ *		setsockopt		(WS2_32.21)
  */
 INT WINAPI WSOCK32_setsockopt(SOCKET16 s, INT level, INT optname, 
                                   char *optval, INT optlen)
@@ -2059,7 +2072,7 @@ INT WINAPI WSOCK32_setsockopt(SOCKET16 s, INT level, INT optname,
 }
 
 /***********************************************************************
- *              setsockopt()		(WINSOCK.21)
+ *              setsockopt		(WINSOCK.21)
  */
 INT16 WINAPI WINSOCK_setsockopt16(SOCKET16 s, INT16 level, INT16 optname,
                                   char *optval, INT16 optlen)
@@ -2070,7 +2083,7 @@ INT16 WINAPI WINSOCK_setsockopt16(SOCKET16 s, INT16 level, INT16 optname,
 
 
 /***********************************************************************
- *		shutdown()		(WSOCK32.22)
+ *		shutdown		(WS2_32.22)
  */
 INT WINAPI WSOCK32_shutdown(SOCKET s, INT how)
 {
@@ -2121,7 +2134,7 @@ INT WINAPI WSOCK32_shutdown(SOCKET s, INT how)
 }
 
 /***********************************************************************
- *              shutdown()		(WINSOCK.22)
+ *              shutdown		(WINSOCK.22)
  */
 INT16 WINAPI WINSOCK_shutdown16(SOCKET16 s, INT16 how)
 {
@@ -2130,7 +2143,7 @@ INT16 WINAPI WINSOCK_shutdown16(SOCKET16 s, INT16 how)
 
 
 /***********************************************************************
- *		socket()		(WSOCK32.23)
+ *		socket		(WS2_32.23)
  */
 SOCKET WINAPI WSOCK32_socket(INT af, INT type, INT protocol)
 {
@@ -2205,7 +2218,7 @@ SOCKET WINAPI WSOCK32_socket(INT af, INT type, INT protocol)
 }
 
 /***********************************************************************
- *              socket()		(WINSOCK.23)
+ *              socket		(WINSOCK.23)
  */
 SOCKET16 WINAPI WINSOCK_socket16(INT16 af, INT16 type, INT16 protocol)
 {
@@ -2224,7 +2237,7 @@ SOCKET16 WINAPI WINSOCK_socket16(INT16 af, INT16 type, INT16 protocol)
 static char*	NULL_STRING = "NULL";
 
 /***********************************************************************
- *		gethostbyaddr()		(WINSOCK.51)(WSOCK32.51)
+ *		__ws_gethostbyaddr
  */
 static WIN_hostent* __ws_gethostbyaddr(const char *addr, int len, int type, int dup_flag)
 {
@@ -2266,6 +2279,9 @@ static WIN_hostent* __ws_gethostbyaddr(const char *addr, int len, int type, int
     return retval;
 }
 
+/***********************************************************************
+ *		gethostbyaddr		(WINSOCK.51)
+ */
 SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type)
 {
     WIN_hostent* retval;
@@ -2275,6 +2291,9 @@ SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type)
     return SEGPTR_GET(retval);
 }
 
+/***********************************************************************
+ *		gethostbyaddr		(WS2_32.51)
+ */
 WIN_hostent* WINAPI WSOCK32_gethostbyaddr(const char *addr, INT len,
                                                 INT type)
 {
@@ -2284,7 +2303,7 @@ WIN_hostent* WINAPI WSOCK32_gethostbyaddr(const char *addr, INT len,
 }
 
 /***********************************************************************
- *		gethostbyname()		(WINSOCK.52)(WSOCK32.52)
+ *		__ws_gethostbyname
  */
 static WIN_hostent * __ws_gethostbyname(const char *name, int dup_flag)
 {
@@ -2323,6 +2342,9 @@ static WIN_hostent * __ws_gethostbyname(const char *name, int dup_flag)
     return retval;
 }
 
+/***********************************************************************
+ *		gethostbyname		(WINSOCK.52)
+ */
 SEGPTR WINAPI WINSOCK_gethostbyname16(const char *name)
 {
     WIN_hostent* retval;
@@ -2331,6 +2353,9 @@ SEGPTR WINAPI WINSOCK_gethostbyname16(const char *name)
     return SEGPTR_GET(retval);
 }
 
+/***********************************************************************
+ *		gethostbyname		(WS2_32.52)
+ */
 WIN_hostent* WINAPI WSOCK32_gethostbyname(const char* name)
 {
     TRACE("%s\n", (name)?name:NULL_STRING);
@@ -2339,7 +2364,7 @@ WIN_hostent* WINAPI WSOCK32_gethostbyname(const char* name)
 
 
 /***********************************************************************
- *		getprotobyname()	(WINSOCK.53)(WSOCK32.53)
+ *		__ws_getprotobyname
  */
 static WIN_protoent* __ws_getprotobyname(const char *name, int dup_flag)
 {
@@ -2362,6 +2387,9 @@ static WIN_protoent* __ws_getprotobyname(const char *name, int dup_flag)
     return retval;
 }
 
+/***********************************************************************
+ *		getprotobyname		(WINSOCK.53)
+ */
 SEGPTR WINAPI WINSOCK_getprotobyname16(const char *name)
 {
     WIN_protoent* retval;
@@ -2370,6 +2398,9 @@ SEGPTR WINAPI WINSOCK_getprotobyname16(const char *name)
     return SEGPTR_GET(retval);
 }
 
+/***********************************************************************
+ *		getprotobyname		(WS2_32.53)
+ */
 WIN_protoent* WINAPI WSOCK32_getprotobyname(const char* name)
 {
     TRACE("%s\n", (name)?name:NULL_STRING);
@@ -2378,7 +2409,7 @@ WIN_protoent* WINAPI WSOCK32_getprotobyname(const char* name)
 
 
 /***********************************************************************
- *		getprotobynumber()	(WINSOCK.54)(WSOCK32.54)
+ *		__ws_getprotobynumber
  */
 static WIN_protoent* __ws_getprotobynumber(int number, int dup_flag)
 {
@@ -2400,6 +2431,9 @@ static WIN_protoent* __ws_getprotobynumber(int number, int dup_flag)
     return retval;
 }
 
+/***********************************************************************
+ *		getprotobynumber	(WINSOCK.54)
+ */
 SEGPTR WINAPI WINSOCK_getprotobynumber16(INT16 number)
 {
     WIN_protoent* retval;
@@ -2408,6 +2442,9 @@ SEGPTR WINAPI WINSOCK_getprotobynumber16(INT16 number)
     return SEGPTR_GET(retval);
 }
 
+/***********************************************************************
+ *		getprotobynumber	(WS2_32.54)
+ */
 WIN_protoent* WINAPI WSOCK32_getprotobynumber(INT number)
 {
     TRACE("%i\n", number);
@@ -2416,7 +2453,7 @@ WIN_protoent* WINAPI WSOCK32_getprotobynumber(INT number)
 
 
 /***********************************************************************
- *		getservbyname()		(WINSOCK.55)(WSOCK32.55)
+ *		__ws_getservbyname
  */
 static WIN_servent* __ws_getservbyname(const char *name, const char *proto, int dup_flag)
 {
@@ -2446,6 +2483,9 @@ static WIN_servent* __ws_getservbyname(const char *name, const char *proto, int
     return retval;
 }
 
+/***********************************************************************
+ *		getservbyname		(WINSOCK.55)
+ */
 SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto)
 {
     WIN_servent* retval;
@@ -2455,6 +2495,9 @@ SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto)
     return SEGPTR_GET(retval);
 }
 
+/***********************************************************************
+ *		getservbyname		(WS2_32.55)
+ */
 WIN_servent* WINAPI WSOCK32_getservbyname(const char *name, const char *proto)
 {
     TRACE("'%s', '%s'\n",
@@ -2464,7 +2507,7 @@ WIN_servent* WINAPI WSOCK32_getservbyname(const char *name, const char *proto)
 
 
 /***********************************************************************
- *		getservbyport()		(WINSOCK.56)(WSOCK32.56)
+ *		__ws_getservbyport
  */
 static WIN_servent* __ws_getservbyport(int port, const char* proto, int dup_flag)
 {
@@ -2489,6 +2532,9 @@ static WIN_servent* __ws_getservbyport(int port, const char* proto, int dup_flag
     return retval;
 }
 
+/***********************************************************************
+ *		getservbyport		(WINSOCK.56)
+ */
 SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto)
 {
     WIN_servent* retval;
@@ -2498,6 +2544,9 @@ SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto)
     return SEGPTR_GET(retval);
 }
 
+/***********************************************************************
+ *		getservbyport		(WS2_32.56)
+ */
 WIN_servent* WINAPI WSOCK32_getservbyport(INT port, const char *proto)
 {
     TRACE("%d (i.e. port %d), '%s'\n",
@@ -2507,7 +2556,7 @@ WIN_servent* WINAPI WSOCK32_getservbyport(INT port, const char *proto)
 
 
 /***********************************************************************
- *              gethostname()           (WSOCK32.57)
+ *              gethostname           (WS2_32.57)
  */
 INT WINAPI WSOCK32_gethostname(char *name, INT namelen)
 {
@@ -2524,7 +2573,7 @@ INT WINAPI WSOCK32_gethostname(char *name, INT namelen)
 }
 
 /***********************************************************************
- *              gethostname()           (WINSOCK.57)
+ *              gethostname           (WINSOCK.57)
  */
 INT16 WINAPI WINSOCK_gethostname16(char *name, INT16 namelen)
 {
@@ -2586,9 +2635,8 @@ int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent)
 }
 
 /***********************************************************************
- *      WSAAsyncSelect()		(WINSOCK.101)(WSOCK32.101)
+ *      WINSOCK_DoAsyncSelect
  */
-
 VOID CALLBACK WINSOCK_DoAsyncEvent( ULONG_PTR ptr )
 {
     ws_select_info *info = (ws_select_info*)ptr;
@@ -2647,8 +2695,9 @@ VOID CALLBACK WINSOCK_DoAsyncEvent( ULONG_PTR ptr )
     }
 }
 
-/**********************************************************************/
-
+/***********************************************************************
+ *      WSAAsyncSelect			(WS2_32.101)
+ */
 INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent)
 {
     int fd = _get_sock_fd(s);
@@ -2695,15 +2744,16 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent)
     return SOCKET_ERROR; 
 }
 
-/**********************************************************************/
-
+/***********************************************************************
+ *      WSAAsyncSelect		(WINSOCK.101)
+ */
 INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, LONG lEvent)
 {
     return (INT16)WSAAsyncSelect( s, hWnd, wMsg, lEvent );
 }
 
 /***********************************************************************
- *              WSARecvEx16()			(WINSOCK.1107)
+ *              WSARecvEx			(WINSOCK.1107)
  *
  * See description for WSARecvEx()
  */
@@ -2715,7 +2765,7 @@ INT16     WINAPI WSARecvEx16(SOCKET16 s, char *buf, INT16 len, INT16 *flags) {
 
 
 /***********************************************************************
- *      WSACreateEvent()          (WS2_32.???)
+ *      WSACreateEvent          (WS2_32.31)
  *
  */
 WSAEVENT WINAPI WSACreateEvent(void)
@@ -2727,7 +2777,7 @@ WSAEVENT WINAPI WSACreateEvent(void)
 }
 
 /***********************************************************************
- *      WSACloseEvent()          (WS2_32.???)
+ *      WSACloseEvent          (WS2_32.29)
  *
  */
 BOOL WINAPI WSACloseEvent(WSAEVENT event)
@@ -2738,7 +2788,7 @@ BOOL WINAPI WSACloseEvent(WSAEVENT event)
 }
 
 /***********************************************************************
- *      WSASocketA()          (WS2_32.???)
+ *      WSASocketA          (WS2_32.78)
  *
  */
 SOCKET WINAPI WSASocketA(int af, int type, int protocol,
@@ -2758,7 +2808,7 @@ SOCKET WINAPI WSASocketA(int af, int type, int protocol,
 
 
 /***********************************************************************
- *	__WSAFDIsSet()			(WINSOCK.151)
+ *	__WSAFDIsSet			(WINSOCK.151)
  */
 INT16 WINAPI __WSAFDIsSet16(SOCKET16 s, ws_fd_set16 *set)
 {
@@ -2772,7 +2822,7 @@ INT16 WINAPI __WSAFDIsSet16(SOCKET16 s, ws_fd_set16 *set)
 }                                                            
 
 /***********************************************************************
- *      __WSAFDIsSet()			(WSOCK32.151)
+ *      __WSAFDIsSet			(WS2_32.151)
  */
 INT WINAPI __WSAFDIsSet(SOCKET s, ws_fd_set32 *set)
 {
@@ -2786,7 +2836,8 @@ INT WINAPI __WSAFDIsSet(SOCKET s, ws_fd_set32 *set)
 }
 
 /***********************************************************************
- *      WSAIsBlocking()			(WINSOCK.114)(WSOCK32.114)
+ *      WSAIsBlocking			(WINSOCK.114)
+ *      WSAIsBlocking			(WS2_32.114)
  */
 BOOL WINAPI WSAIsBlocking(void)
 {
@@ -2803,7 +2854,8 @@ BOOL WINAPI WSAIsBlocking(void)
 }
 
 /***********************************************************************
- *      WSACancelBlockingCall()		(WINSOCK.113)(WSOCK32.113)
+ *      WSACancelBlockingCall		(WINSOCK.113)
+ *      WSACancelBlockingCall		(WS2_32.113)
  */
 INT WINAPI WSACancelBlockingCall(void)
 {
@@ -2813,7 +2865,7 @@ INT WINAPI WSACancelBlockingCall(void)
 
 
 /***********************************************************************
- *      WSASetBlockingHook16()		(WINSOCK.109)
+ *      WSASetBlockingHook		(WINSOCK.109)
  */
 FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc)
 {
@@ -2837,7 +2889,7 @@ FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc)
 
 
 /***********************************************************************
- *      WSAUnhookBlockingHook16()	(WINSOCK.110)
+ *      WSAUnhookBlockingHook	(WINSOCK.110)
  */
 INT16 WINAPI WSAUnhookBlockingHook16(void)
 {
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index 881a3500e6a..f97e46160b0 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -525,7 +525,8 @@ static void FREE_PRINTER_INFO_2W(HANDLE heap, LPPRINTER_INFO_2W piW)
 }
 
 /******************************************************************
- *              DeviceCapabilitiesA    [WINSPOOL.150 & WINSPOOL.151]
+ *              DeviceCapabilities     [WINSPOOL.@]
+ *              DeviceCapabilitiesA    [WINSPOOL.@]
  *
  */
 INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort, WORD cap,
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index f62b6412063..8a8346cd8ed 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -937,7 +937,7 @@ int WSCNTL_GetRouteTable(int numRoutes, wscntl_routeentry *routeTable)
 
 
 /***********************************************************************
- *		WSARecvEx()			(WSOCK32.1107)
+ *		WSARecvEx			(WSOCK32.1107)
  *
  * WSARecvEx is a Microsoft specific extension to winsock that is identical to recv
  * except that has an in/out argument call flags that has the value MSG_PARTIAL ored
@@ -954,7 +954,7 @@ INT WINAPI WSARecvEx(SOCKET s, char *buf, INT len, INT *flags)
 
 
 /***********************************************************************
- *       WS_s_perror         (WSOCK32.1108)
+ *       s_perror         (WSOCK32.1108)
  */
 void WINAPI WS_s_perror(LPCSTR message)
 {
diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c
index 6759a08698f..a313a0155ea 100644
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -1215,7 +1215,7 @@ void X11DRV_SetFocus( HWND hwnd )
 
 
 /**********************************************************************
- *		X11DRV_SetWindowIcon (X11DRV.@)
+ *		SetWindowIcon (X11DRV.@)
  *
  * hIcon or hIconSm has changed (or is being initialised for the
  * first time). Complete the X11 driver-specific initialisation
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index 7fb0520d9e3..70961ed6fd4 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -369,7 +369,7 @@ void X11DRV_Expose( HWND hwnd, XExposeEvent *event )
 
 
 /***********************************************************************
- *		X11DRV_GetDC (X11DRV.@)
+ *		GetDC (X11DRV.@)
  *
  * Set the drawable, origin and dimensions for the DC associated to
  * a given window.
@@ -1007,7 +1007,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect )
 
 
 /***********************************************************************
- *              X11DRV_ShowWindow   (X11DRV.@)
+ *              ShowWindow   (X11DRV.@)
  */
 BOOL X11DRV_ShowWindow( HWND hwnd, INT cmd )
 {
@@ -1647,7 +1647,7 @@ static LONG start_size_move( WND* wndPtr, WPARAM wParam, POINT *capturePoint )
 
 
 /***********************************************************************
- *           X11DRV_SysCommandSizeMove   (X11DRV.@)
+ *           SysCommandSizeMove   (X11DRV.@)
  *
  * Perform SC_MOVE and SC_SIZE commands.
  */
@@ -1942,7 +1942,7 @@ END:
 
 
 /***********************************************************************
- *		X11DRV_ForceWindowRaise   (X11DRV.@)
+ *		ForceWindowRaise   (X11DRV.@)
  *
  * Raise a window on top of the X stacking order, while preserving 
  * the correct Windows Z order.
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 307a450b942..02581eb0f0c 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -464,7 +464,7 @@ BOOL WINAPI X11DRV_Init( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 }
 
 /***********************************************************************
- *              X11DRV_GetScreenSaveActive (X11DRV.@)
+ *              GetScreenSaveActive (X11DRV.@)
  *
  * Returns the active status of the screen saver
  */
@@ -476,7 +476,7 @@ BOOL X11DRV_GetScreenSaveActive(void)
 }
 
 /***********************************************************************
- *              X11DRV_SetScreenSaveActive (X11DRV.@)
+ *              SetScreenSaveActive (X11DRV.@)
  *
  * Activate/Deactivate the screen saver
  */
@@ -489,7 +489,7 @@ void X11DRV_SetScreenSaveActive(BOOL bActivate)
 }
 
 /***********************************************************************
- *              X11DRV_GetScreenSaveTimeout (X11DRV.@)
+ *              GetScreenSaveTimeout (X11DRV.@)
  *
  * Return the screen saver timeout
  */
@@ -501,7 +501,7 @@ int X11DRV_GetScreenSaveTimeout(void)
 }
 
 /***********************************************************************
- *              X11DRV_SetScreenSaveTimeout (X11DRV.@)
+ *              SetScreenSaveTimeout (X11DRV.@)
  *
  * Set the screen saver timeout
  */
diff --git a/files/directory.c b/files/directory.c
index 60661449c5a..553f627f799 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -251,7 +251,7 @@ UINT WINAPI GetTempDrive( BYTE ignored )
 
 
 /***********************************************************************
- *           GetWindowsDirectory16   (KERNEL.134)
+ *           GetWindowsDirectory   (KERNEL.134)
  */
 UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count )
 {
@@ -303,7 +303,7 @@ UINT WINAPI GetSystemWindowsDirectoryW( LPWSTR path, UINT count )
 
 
 /***********************************************************************
- *           GetSystemDirectory16   (KERNEL.135)
+ *           GetSystemDirectory   (KERNEL.135)
  */
 UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count )
 {
@@ -337,7 +337,7 @@ UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count )
 
 
 /***********************************************************************
- *           CreateDirectory16   (KERNEL.144)
+ *           CreateDirectory   (KERNEL.144)
  */
 BOOL16 WINAPI CreateDirectory16( LPCSTR path, LPVOID dummy )
 {
@@ -418,7 +418,7 @@ BOOL WINAPI CreateDirectoryExW( LPCWSTR template, LPCWSTR path,
 
 
 /***********************************************************************
- *           RemoveDirectory16   (KERNEL)
+ *           RemoveDirectory   (KERNEL.145)
  */
 BOOL16 WINAPI RemoveDirectory16( LPCSTR path )
 {
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 54110fcff11..a467cbd25bd 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -2276,7 +2276,7 @@ BOOL WINAPI DefineDosDeviceA(DWORD flags,LPCSTR devname,LPCSTR targetpath) {
 */
 
 /*************************************************************************
- *           FindFirstFile16   (KERNEL.413)
+ *           FindFirstFile   (KERNEL.413)
  */
 HANDLE16 WINAPI FindFirstFile16( LPCSTR path, WIN32_FIND_DATAA *data )
 {
@@ -2314,7 +2314,7 @@ HANDLE16 WINAPI FindFirstFile16( LPCSTR path, WIN32_FIND_DATAA *data )
 }
 
 /*************************************************************************
- *           FindNextFile16   (KERNEL.414)
+ *           FindNextFile   (KERNEL.414)
  */
 BOOL16 WINAPI FindNextFile16( HANDLE16 handle, WIN32_FIND_DATAA *data )
 {
@@ -2344,7 +2344,7 @@ BOOL16 WINAPI FindNextFile16( HANDLE16 handle, WIN32_FIND_DATAA *data )
 }
 
 /*************************************************************************
- *           FindClose16   (KERNEL.415)
+ *           FindClose   (KERNEL.415)
  */
 BOOL16 WINAPI FindClose16( HANDLE16 handle )
 {
diff --git a/files/drive.c b/files/drive.c
index d4482b54b44..0c34655b7a5 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -951,7 +951,7 @@ char *DRIVE_BuildEnv(void)
 
 
 /***********************************************************************
- *           GetDiskFreeSpace16   (KERNEL.422)
+ *           GetDiskFreeSpace   (KERNEL.422)
  */
 BOOL16 WINAPI GetDiskFreeSpace16( LPCSTR root, LPDWORD cluster_sectors,
                                   LPDWORD sector_bytes, LPDWORD free_clusters,
@@ -1159,7 +1159,7 @@ BOOL WINAPI GetDiskFreeSpaceExW( LPCWSTR root, PULARGE_INTEGER avail,
 }
 
 /***********************************************************************
- *           GetDriveType16   (KERNEL.136)
+ *           GetDriveType   (KERNEL.136)
  * This function returns the type of a drive in Win16. 
  * Note that it returns DRIVE_REMOTE for CD-ROMs, since MSCDEX uses the
  * remote drive API. The return value DRIVE_REMOTE for CD-ROMs has been
@@ -1228,7 +1228,7 @@ UINT WINAPI GetDriveTypeW( LPCWSTR root )
 
 
 /***********************************************************************
- *           GetCurrentDirectory16   (KERNEL.411)
+ *           GetCurrentDirectory   (KERNEL.411)
  */
 UINT16 WINAPI GetCurrentDirectory16( UINT16 buflen, LPSTR buf )
 {
diff --git a/files/file.c b/files/file.c
index c1026c88a14..042374b2a9d 100644
--- a/files/file.c
+++ b/files/file.c
@@ -594,7 +594,7 @@ DWORD WINAPI GetFileInformationByHandle( HANDLE hFile,
 
 
 /**************************************************************************
- *           GetFileAttributes16   (KERNEL.420)
+ *           GetFileAttributes   (KERNEL.420)
  */
 DWORD WINAPI GetFileAttributes16( LPCSTR name )
 {
@@ -775,7 +775,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique,
 
 
 /***********************************************************************
- *           GetTempFileName16   (KERNEL.97)
+ *           GetTempFileName   (KERNEL.97)
  */
 UINT16 WINAPI GetTempFileName16( BYTE drive, LPCSTR prefix, UINT16 unique,
                                  LPSTR buffer )
@@ -980,7 +980,8 @@ error:  /* We get here if there was an error opening the file */
 
 
 /***********************************************************************
- *           OpenFile16   (KERNEL.360)
+ *           OpenFile   (KERNEL.74)
+ *           OpenFileEx (KERNEL.360)
  */
 HFILE16 WINAPI OpenFile16( LPCSTR name, OFSTRUCT *ofs, UINT16 mode )
 {
@@ -1121,7 +1122,7 @@ HFILE16 FILE_Dup2( HFILE16 hFile1, HFILE16 hFile2 )
 
 
 /***********************************************************************
- *           _lclose16   (KERNEL.81)
+ *           _lclose   (KERNEL.81)
  */
 HFILE16 WINAPI _lclose16( HFILE16 hFile )
 {
@@ -1597,7 +1598,7 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite,
 
   
 /***********************************************************************
- *           WIN16_hread
+ *           _hread (KERNEL.349)
  */
 LONG WINAPI WIN16_hread( HFILE16 hFile, SEGPTR buffer, LONG count )
 {
@@ -1614,7 +1615,7 @@ LONG WINAPI WIN16_hread( HFILE16 hFile, SEGPTR buffer, LONG count )
 
 
 /***********************************************************************
- *           WIN16_lread
+ *           _lread (KERNEL.82)
  */
 UINT16 WINAPI WIN16_lread( HFILE16 hFile, SEGPTR buffer, UINT16 count )
 {
@@ -1643,7 +1644,7 @@ UINT16 WINAPI _lread16( HFILE16 hFile, LPVOID buffer, UINT16 count )
 
 
 /***********************************************************************
- *           _lcreat16   (KERNEL.83)
+ *           _lcreat   (KERNEL.83)
  */
 HFILE16 WINAPI _lcreat16( LPCSTR path, INT16 attr )
 {
@@ -1696,7 +1697,7 @@ DWORD WINAPI SetFilePointer( HANDLE hFile, LONG distance, LONG *highword,
 
 
 /***********************************************************************
- *           _llseek16   (KERNEL.84)
+ *           _llseek   (KERNEL.84)
  *
  * FIXME:
  *   Seeking before the start of the file should be allowed for _llseek16,
@@ -1719,7 +1720,7 @@ LONG WINAPI _llseek( HFILE hFile, LONG lOffset, INT nOrigin )
 
 
 /***********************************************************************
- *           _lopen16   (KERNEL.85)
+ *           _lopen   (KERNEL.85)
  */
 HFILE16 WINAPI _lopen16( LPCSTR path, INT16 mode )
 {
@@ -1741,7 +1742,7 @@ HFILE WINAPI _lopen( LPCSTR path, INT mode )
 
 
 /***********************************************************************
- *           _lwrite16   (KERNEL.86)
+ *           _lwrite   (KERNEL.86)
  */
 UINT16 WINAPI _lwrite16( HFILE16 hFile, LPCSTR buffer, UINT16 count )
 {
@@ -1776,7 +1777,7 @@ LONG WINAPI _hread( HFILE hFile, LPVOID buffer, LONG count)
 
 
 /***********************************************************************
- *           _hwrite16   (KERNEL.350)
+ *           _hwrite   (KERNEL.350)
  */
 LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count )
 {
@@ -1813,7 +1814,7 @@ LONG WINAPI _hwrite( HFILE handle, LPCSTR buffer, LONG count )
 
 
 /***********************************************************************
- *           SetHandleCount16   (KERNEL.199)
+ *           SetHandleCount   (KERNEL.199)
  */
 UINT16 WINAPI SetHandleCount16( UINT16 count )
 {
@@ -1863,7 +1864,7 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile )
 
 
 /***********************************************************************
- *           DeleteFile16   (KERNEL.146)
+ *           DeleteFile   (KERNEL.146)
  */
 BOOL16 WINAPI DeleteFile16( LPCSTR path )
 {
diff --git a/files/profile.c b/files/profile.c
index 6d98967f2d2..7f918125415 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -1129,7 +1129,7 @@ char* PROFILE_GetStringItem( char* start )
 /********************* API functions **********************************/
 
 /***********************************************************************
- *           GetProfileInt16   (KERNEL.57)
+ *           GetProfileInt   (KERNEL.57)
  */
 UINT16 WINAPI GetProfileInt16( LPCSTR section, LPCSTR entry, INT16 def_val )
 {
@@ -1212,7 +1212,7 @@ static int PROFILE_GetPrivateProfileString( LPCSTR section, LPCSTR entry,
 }
 
 /***********************************************************************
- *           GetPrivateProfileString16   (KERNEL.128)
+ *           GetPrivateProfileString   (KERNEL.128)
  */
 INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry,
                                         LPCSTR def_val, LPSTR buffer,
@@ -1258,7 +1258,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
 }
 
 /***********************************************************************
- *           GetProfileString16   (KERNEL.58)
+ *           GetProfileString   (KERNEL.58)
  */
 INT16 WINAPI GetProfileString16( LPCSTR section, LPCSTR entry, LPCSTR def_val,
                                  LPSTR buffer, UINT16 len )
@@ -1288,7 +1288,7 @@ INT WINAPI GetProfileStringW( LPCWSTR section, LPCWSTR entry,
 }
 
 /***********************************************************************
- *           WriteProfileString16   (KERNEL.59)
+ *           WriteProfileString   (KERNEL.59)
  */
 BOOL16 WINAPI WriteProfileString16( LPCSTR section, LPCSTR entry,
                                     LPCSTR string )
@@ -1316,7 +1316,7 @@ BOOL WINAPI WriteProfileStringW( LPCWSTR section, LPCWSTR entry,
 
 
 /***********************************************************************
- *           GetPrivateProfileInt16   (KERNEL.127)
+ *           GetPrivateProfileInt   (KERNEL.127)
  */
 UINT16 WINAPI GetPrivateProfileInt16( LPCSTR section, LPCSTR entry,
                                       INT16 def_val, LPCSTR filename )
@@ -1364,7 +1364,7 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry,
 }
 
 /***********************************************************************
- *           GetPrivateProfileSection16   (KERNEL.418)
+ *           GetPrivateProfileSection   (KERNEL.418)
  */
 INT16 WINAPI GetPrivateProfileSection16( LPCSTR section, LPSTR buffer,
 				        UINT16 len, LPCSTR filename )
@@ -1412,7 +1412,7 @@ INT WINAPI GetPrivateProfileSectionW (LPCWSTR section, LPWSTR buffer,
 }
 
 /***********************************************************************
- *           GetProfileSection16   (KERNEL.419)
+ *           GetProfileSection   (KERNEL.419)
  */
 INT16 WINAPI GetProfileSection16( LPCSTR section, LPSTR buffer, UINT16 len )
 {
@@ -1437,7 +1437,7 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len )
 
 
 /***********************************************************************
- *           WritePrivateProfileString16   (KERNEL.129)
+ *           WritePrivateProfileString   (KERNEL.129)
  */
 BOOL16 WINAPI WritePrivateProfileString16( LPCSTR section, LPCSTR entry,
                                            LPCSTR string, LPCSTR filename )
@@ -1487,7 +1487,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
 }
 
 /***********************************************************************
- *           WritePrivateProfileSection16   (KERNEL.416)
+ *           WritePrivateProfileSection   (KERNEL.416)
  */
 BOOL16 WINAPI WritePrivateProfileSection16( LPCSTR section, 
 				 	    LPCSTR string, LPCSTR filename )
@@ -1550,7 +1550,7 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section,
 }
 
 /***********************************************************************
- *           WriteProfileSection16   (KERNEL.417)
+ *           WriteProfileSection   (KERNEL.417)
  */
 BOOL16 WINAPI WriteProfileSection16( LPCSTR section, LPCSTR keys_n_values)
 {
@@ -1575,7 +1575,7 @@ BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values)
 }
 
 /***********************************************************************
- *           GetPrivateProfileSectionNames16   (KERNEL.143)
+ *           GetPrivateProfileSectionNames   (KERNEL.143)
  */
 WORD WINAPI GetPrivateProfileSectionNames16( LPSTR buffer, WORD size,
                                              LPCSTR filename )
@@ -1594,7 +1594,7 @@ WORD WINAPI GetPrivateProfileSectionNames16( LPSTR buffer, WORD size,
 
 
 /***********************************************************************
- *           GetProfileSectionNames16   (KERNEL.142)
+ *           GetProfileSectionNames   (KERNEL.142)
  */
 WORD WINAPI GetProfileSectionNames16( LPSTR buffer, WORD size)
 
@@ -1634,7 +1634,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size,
 }
 
 /***********************************************************************
- *           GetPrivateProfileStruct16 (KERNEL.407)
+ *           GetPrivateProfileStruct (KERNEL.407)
  */
 BOOL16 WINAPI GetPrivateProfileStruct16(LPCSTR section, LPCSTR key, 
  				        LPVOID buf, UINT16 len, LPCSTR filename)
@@ -1743,7 +1743,7 @@ BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key,
 
 
 /***********************************************************************
- *           WritePrivateProfileStruct16 (KERNEL.406)
+ *           WritePrivateProfileStruct (KERNEL.406)
  */
 BOOL16 WINAPI WritePrivateProfileStruct16 (LPCSTR section, LPCSTR key, 
 	LPVOID buf, UINT16 bufsize, LPCSTR filename)
diff --git a/graphics/bitblt.c b/graphics/bitblt.c
index 38595f8156e..f8e2fd77f42 100644
--- a/graphics/bitblt.c
+++ b/graphics/bitblt.c
@@ -11,7 +11,7 @@ DEFAULT_DEBUG_CHANNEL(bitblt);
 
 
 /***********************************************************************
- *           PatBlt16    (GDI.29)
+ *           PatBlt    (GDI.29)
  */
 BOOL16 WINAPI PatBlt16( HDC16 hdc, INT16 left, INT16 top,
                         INT16 width, INT16 height, DWORD rop)
@@ -42,7 +42,7 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top,
 
 
 /***********************************************************************
- *           BitBlt16    (GDI.34)
+ *           BitBlt    (GDI.34)
  */
 BOOL16 WINAPI BitBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst, INT16 width,
                         INT16 height, HDC16 hdcSrc, INT16 xSrc, INT16 ySrc,
@@ -80,7 +80,7 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
 
 
 /***********************************************************************
- *           StretchBlt16    (GDI.35)
+ *           StretchBlt    (GDI.35)
  */
 BOOL16 WINAPI StretchBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst,
                             INT16 widthDst, INT16 heightDst,
diff --git a/graphics/escape.c b/graphics/escape.c
index 974c39059af..17eb5e8c897 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -14,7 +14,7 @@
 DEFAULT_DEBUG_CHANNEL(driver);
 
 /***********************************************************************
- *            Escape16  [GDI.38]
+ *            Escape  [GDI.38]
  */
 INT16 WINAPI Escape16( HDC16 hdc, INT16 nEscape, INT16 cbInput,
                        SEGPTR lpszInData, SEGPTR lpvOutData )
diff --git a/graphics/fontengine.c b/graphics/fontengine.c
index abf3346fa54..c4febbd8184 100644
--- a/graphics/fontengine.c
+++ b/graphics/fontengine.c
@@ -15,7 +15,7 @@
 DEFAULT_DEBUG_CHANNEL(font);
 
 /***********************************************************************
- *		EngineEnumerateFont16 (GDI.300)
+ *		EngineEnumerateFont (GDI.300)
  */
 WORD WINAPI 
 EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data )
@@ -25,7 +25,7 @@ EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data )
 }
 
 /***********************************************************************
- *		EngineDeleteFont16 (GDI.301)
+ *		EngineDeleteFont (GDI.301)
  */
 WORD WINAPI EngineDeleteFont16(LPFONTINFO16 lpFontInfo)
 {
@@ -51,7 +51,7 @@ WORD WINAPI EngineDeleteFont16(LPFONTINFO16 lpFontInfo)
 }
 
 /***********************************************************************
- *		EngineRealizeFont16 (GDI.302)
+ *		EngineRealizeFont (GDI.302)
  */
 WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform, LPFONTINFO16 lpfontInfo)
 {
@@ -61,7 +61,7 @@ WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform
 }
 
 /***********************************************************************
- *		EngineRealizeFontExt16 (GDI.315)
+ *		EngineRealizeFontExt (GDI.315)
  */
 WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4)
 {
@@ -71,7 +71,7 @@ WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4)
 }
 
 /***********************************************************************
- *		EngineGetCharWidth16 (GDI.303)
+ *		EngineGetCharWidth (GDI.303)
  */
 WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE lastChar, LPINT16 buffer)
 {
diff --git a/graphics/mapping.c b/graphics/mapping.c
index df674d2a512..e83deadc396 100644
--- a/graphics/mapping.c
+++ b/graphics/mapping.c
@@ -35,7 +35,7 @@ void MAPPING_FixIsotropic( DC * dc )
 
 
 /***********************************************************************
- *           DPtoLP16    (GDI.67)
+ *           DPtoLP    (GDI.67)
  */
 BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count )
 {
@@ -73,7 +73,7 @@ BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count )
 
 
 /***********************************************************************
- *           LPtoDP16    (GDI.99)
+ *           LPtoDP    (GDI.99)
  */
 BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count )
 {
@@ -110,7 +110,7 @@ BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count )
 
 
 /***********************************************************************
- *           SetMapMode16    (GDI.3)
+ *           SetMapMode    (GDI.3)
  */
 INT16 WINAPI SetMapMode16( HDC16 hdc, INT16 mode )
 {
@@ -206,7 +206,7 @@ DWORD WINAPI SetViewportExt16( HDC16 hdc, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           SetViewportExtEx16    (GDI.479)
+ *           SetViewportExtEx    (GDI.479)
  */
 BOOL16 WINAPI SetViewportExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size )
 {
@@ -264,7 +264,7 @@ DWORD WINAPI SetViewportOrg16( HDC16 hdc, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           SetViewportOrgEx16    (GDI.480)
+ *           SetViewportOrgEx    (GDI.480)
  */
 BOOL16 WINAPI SetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
@@ -313,7 +313,7 @@ DWORD WINAPI SetWindowExt16( HDC16 hdc, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           SetWindowExtEx16    (GDI.481)
+ *           SetWindowExtEx    (GDI.481)
  */
 BOOL16 WINAPI SetWindowExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size )
 {
@@ -371,7 +371,7 @@ DWORD WINAPI SetWindowOrg16( HDC16 hdc, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           SetWindowOrgEx16    (GDI.482)
+ *           SetWindowOrgEx    (GDI.482)
  */
 BOOL16 WINAPI SetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
@@ -419,7 +419,7 @@ DWORD WINAPI OffsetViewportOrg16( HDC16 hdc, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           OffsetViewportOrgEx16    (GDI.476)
+ *           OffsetViewportOrgEx    (GDI.476)
  */
 BOOL16 WINAPI OffsetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt)
 {
@@ -468,7 +468,7 @@ DWORD WINAPI OffsetWindowOrg16( HDC16 hdc, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           OffsetWindowOrgEx16    (GDI.477)
+ *           OffsetWindowOrgEx    (GDI.477)
  */
 BOOL16 WINAPI OffsetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
@@ -519,7 +519,7 @@ DWORD WINAPI ScaleViewportExt16( HDC16 hdc, INT16 xNum, INT16 xDenom,
 
 
 /***********************************************************************
- *           ScaleViewportExtEx16    (GDI.484)
+ *           ScaleViewportExtEx    (GDI.484)
  */
 BOOL16 WINAPI ScaleViewportExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom,
                                     INT16 yNum, INT16 yDenom, LPSIZE16 size )
@@ -584,7 +584,7 @@ DWORD WINAPI ScaleWindowExt16( HDC16 hdc, INT16 xNum, INT16 xDenom,
 
 
 /***********************************************************************
- *           ScaleWindowExtEx16    (GDI.485)
+ *           ScaleWindowExtEx    (GDI.485)
  */
 BOOL16 WINAPI ScaleWindowExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom,
                                   INT16 yNum, INT16 yDenom, LPSIZE16 size )
diff --git a/graphics/painting.c b/graphics/painting.c
index 682e376be81..a9a74baec0d 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -23,7 +23,7 @@ DEFAULT_DEBUG_CHANNEL(gdi);
 
 
 /***********************************************************************
- *           LineTo16    (GDI.19)
+ *           LineTo    (GDI.19)
  */
 BOOL16 WINAPI LineTo16( HDC16 hdc, INT16 x, INT16 y )
 {
@@ -55,7 +55,7 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y )
 
 
 /***********************************************************************
- *           MoveTo16    (GDI.20)
+ *           MoveTo    (GDI.20)
  */
 DWORD WINAPI MoveTo16( HDC16 hdc, INT16 x, INT16 y )
 {
@@ -67,7 +67,7 @@ DWORD WINAPI MoveTo16( HDC16 hdc, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           MoveToEx16    (GDI.483)
+ *           MoveToEx    (GDI.483)
  */
 BOOL16 WINAPI MoveToEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt )
 {
@@ -104,7 +104,7 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt )
 
 
 /***********************************************************************
- *           Arc16    (GDI.23)
+ *           Arc    (GDI.23)
  */
 BOOL16 WINAPI Arc16( HDC16 hdc, INT16 left, INT16 top, INT16 right,
                      INT16 bottom, INT16 xstart, INT16 ystart,
@@ -176,7 +176,7 @@ BOOL WINAPI ArcTo( HDC hdc,
 }
 
 /***********************************************************************
- *           Pie16    (GDI.26)
+ *           Pie    (GDI.26)
  */
 BOOL16 WINAPI Pie16( HDC16 hdc, INT16 left, INT16 top,
                      INT16 right, INT16 bottom, INT16 xstart, INT16 ystart,
@@ -210,7 +210,7 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top,
 
 
 /***********************************************************************
- *           Chord16    (GDI.348)
+ *           Chord    (GDI.348)
  */
 BOOL16 WINAPI Chord16( HDC16 hdc, INT16 left, INT16 top,
                        INT16 right, INT16 bottom, INT16 xstart, INT16 ystart,
@@ -242,7 +242,7 @@ BOOL WINAPI Chord( HDC hdc, INT left, INT top,
 
 
 /***********************************************************************
- *           Ellipse16    (GDI.24)
+ *           Ellipse    (GDI.24)
  */
 BOOL16 WINAPI Ellipse16( HDC16 hdc, INT16 left, INT16 top,
                          INT16 right, INT16 bottom )
@@ -272,7 +272,7 @@ BOOL WINAPI Ellipse( HDC hdc, INT left, INT top,
 
 
 /***********************************************************************
- *           Rectangle16    (GDI.27)
+ *           Rectangle    (GDI.27)
  */
 BOOL16 WINAPI Rectangle16( HDC16 hdc, INT16 left, INT16 top,
                            INT16 right, INT16 bottom )
@@ -302,7 +302,7 @@ BOOL WINAPI Rectangle( HDC hdc, INT left, INT top,
 
 
 /***********************************************************************
- *           RoundRect16    (GDI.28)
+ *           RoundRect    (GDI.28)
  */
 BOOL16 WINAPI RoundRect16( HDC16 hdc, INT16 left, INT16 top, INT16 right,
                            INT16 bottom, INT16 ell_width, INT16 ell_height )
@@ -332,7 +332,7 @@ BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right,
 }
 
 /***********************************************************************
- *           SetPixel16    (GDI.31)
+ *           SetPixel    (GDI.31)
  */
 COLORREF WINAPI SetPixel16( HDC16 hdc, INT16 x, INT16 y, COLORREF color )
 {
@@ -375,7 +375,7 @@ BOOL WINAPI SetPixelV( HDC hdc, INT x, INT y, COLORREF color )
 }
 
 /***********************************************************************
- *           GetPixel16    (GDI.83)
+ *           GetPixel    (GDI.83)
  */
 COLORREF WINAPI GetPixel16( HDC16 hdc, INT16 x, INT16 y )
 {
@@ -559,7 +559,7 @@ BOOL WINAPI SwapBuffers( HDC hdc )
 
 
 /***********************************************************************
- *           PaintRgn16    (GDI.43)
+ *           PaintRgn    (GDI.43)
  */
 BOOL16 WINAPI PaintRgn16( HDC16 hdc, HRGN16 hrgn )
 {
@@ -584,7 +584,7 @@ BOOL WINAPI PaintRgn( HDC hdc, HRGN hrgn )
 
 
 /***********************************************************************
- *           FillRgn16    (GDI.40)
+ *           FillRgn    (GDI.40)
  */
 BOOL16 WINAPI FillRgn16( HDC16 hdc, HRGN16 hrgn, HBRUSH16 hbrush )
 {
@@ -615,7 +615,7 @@ BOOL WINAPI FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush )
 
 
 /***********************************************************************
- *           FrameRgn16     (GDI.41)
+ *           FrameRgn     (GDI.41)
  */
 BOOL16 WINAPI FrameRgn16( HDC16 hdc, HRGN16 hrgn, HBRUSH16 hbrush,
                           INT16 nWidth, INT16 nHeight )
@@ -655,7 +655,7 @@ BOOL WINAPI FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush,
 
 
 /***********************************************************************
- *           InvertRgn16    (GDI.42)
+ *           InvertRgn    (GDI.42)
  */
 BOOL16 WINAPI InvertRgn16( HDC16 hdc, HRGN16 hrgn )
 {
@@ -689,7 +689,7 @@ BOOL WINAPI InvertRgn( HDC hdc, HRGN hrgn )
 }
 
 /**********************************************************************
- *          Polyline16  (GDI.37)
+ *          Polyline  (GDI.37)
  */
 BOOL16 WINAPI Polyline16( HDC16 hdc, const POINT16* pt, INT16 count )
 {
@@ -759,7 +759,7 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT* pt, DWORD cCount )
 }
 
 /**********************************************************************
- *          Polygon16  (GDI.36)
+ *          Polygon  (GDI.36)
  */
 BOOL16 WINAPI Polygon16( HDC16 hdc, const POINT16* pt, INT16 count )
 {
@@ -859,7 +859,7 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT* pt, const DWORD* counts,
 }
 
 /**********************************************************************
- *          ExtFloodFill16   (GDI.372)
+ *          ExtFloodFill   (GDI.372)
  */
 BOOL16 WINAPI ExtFloodFill16( HDC16 hdc, INT16 x, INT16 y, COLORREF color,
                               UINT16 fillType )
@@ -886,7 +886,7 @@ BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color,
 
 
 /**********************************************************************
- *          FloodFill16   (GDI.25)
+ *          FloodFill   (GDI.25)
  */
 BOOL16 WINAPI FloodFill16( HDC16 hdc, INT16 x, INT16 y, COLORREF color )
 {
@@ -904,7 +904,7 @@ BOOL WINAPI FloodFill( HDC hdc, INT x, INT y, COLORREF color )
 
 
 /******************************************************************************
- * PolyBezier16 [GDI.502]
+ * PolyBezier [GDI.502]
  */
 BOOL16 WINAPI PolyBezier16( HDC16 hDc, const POINT16* lppt, INT16 cPoints )
 {
@@ -920,7 +920,7 @@ BOOL16 WINAPI PolyBezier16( HDC16 hDc, const POINT16* lppt, INT16 cPoints )
 }
 
 /******************************************************************************
- * PolyBezierTo16 [GDI.503]
+ * PolyBezierTo [GDI.503]
  */
 BOOL16 WINAPI PolyBezierTo16( HDC16 hDc, const POINT16* lppt, INT16 cPoints )
 {
diff --git a/graphics/path.c b/graphics/path.c
index 37ebe720848..401e1e9d3b0 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -81,7 +81,7 @@ static BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, I
 
 
 /***********************************************************************
- *           BeginPath16    (GDI.512)
+ *           BeginPath    (GDI.512)
  */
 BOOL16 WINAPI BeginPath16(HDC16 hdc)
 {
@@ -120,7 +120,7 @@ BOOL WINAPI BeginPath(HDC hdc)
 
 
 /***********************************************************************
- *           EndPath16    (GDI.514)
+ *           EndPath    (GDI.514)
  */
 BOOL16 WINAPI EndPath16(HDC16 hdc)
 {
@@ -157,7 +157,7 @@ BOOL WINAPI EndPath(HDC hdc)
 
 
 /***********************************************************************
- *           AbortPath16    (GDI.511)
+ *           AbortPath    (GDI.511)
  */
 BOOL16 WINAPI AbortPath16(HDC16 hdc)
 {
@@ -194,7 +194,7 @@ BOOL WINAPI AbortPath( HDC hdc )
 
 
 /***********************************************************************
- *           CloseFigure16    (GDI.513)
+ *           CloseFigure    (GDI.513)
  */
 BOOL16 WINAPI CloseFigure16(HDC16 hdc)
 {
@@ -242,7 +242,7 @@ BOOL WINAPI CloseFigure(HDC hdc)
 
 
 /***********************************************************************
- *           GetPath16    (GDI.517)
+ *           GetPath    (GDI.517)
  */
 INT16 WINAPI GetPath16(HDC16 hdc, LPPOINT16 pPoints, LPBYTE pTypes,
    INT16 nSize)
@@ -301,7 +301,7 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes,
 }
 
 /***********************************************************************
- *           PathToRegion16    (GDI.518)
+ *           PathToRegion    (GDI.518)
  */
 HRGN16 WINAPI PathToRegion16(HDC16 hdc)
 {
@@ -412,7 +412,7 @@ static BOOL PATH_FillPath(DC *dc, GdiPath *pPath)
 }
 
 /***********************************************************************
- *           FillPath16    (GDI.515)
+ *           FillPath    (GDI.515)
  */
 BOOL16 WINAPI FillPath16(HDC16 hdc)
 {
@@ -449,7 +449,7 @@ BOOL WINAPI FillPath(HDC hdc)
 }
 
 /***********************************************************************
- *           SelectClipPath16    (GDI.519)
+ *           SelectClipPath    (GDI.519)
  */
 BOOL16 WINAPI SelectClipPath16(HDC16 hdc, INT16 iMode)
 {
@@ -1428,7 +1428,7 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[],
 }
 
 /*******************************************************************
- *      FlattenPath16 [GDI.516]
+ *      FlattenPath [GDI.516]
  *
  *
  */
@@ -1513,7 +1513,7 @@ static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath)
 
 
 /*******************************************************************
- *      StrokeAndFillPath16 [GDI.520]
+ *      StrokeAndFillPath [GDI.520]
  *
  *
  */
@@ -1547,7 +1547,7 @@ BOOL WINAPI StrokeAndFillPath(HDC hdc)
 }
 
 /*******************************************************************
- *      StrokePath16 [GDI.521]
+ *      StrokePath [GDI.521]
  *
  *
  */
@@ -1583,7 +1583,7 @@ BOOL WINAPI StrokePath(HDC hdc)
 }
 
 /*******************************************************************
- *      WidenPath16 [GDI.522]
+ *      WidenPath [GDI.522]
  *
  *
  */
diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c
index d4167178865..5b2c102d726 100644
--- a/graphics/win16drv/prtdrv.c
+++ b/graphics/win16drv/prtdrv.c
@@ -700,7 +700,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg,
 }
 
 /***********************************************************************
- *		dmEnumDFonts16 (GDI.206)
+ *		dmEnumDFonts (GDI.206)
  */
 int WINAPI dmEnumDFonts16(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCallbackFunc, LPVOID lpClientData)
 {
@@ -709,7 +709,7 @@ int WINAPI dmEnumDFonts16(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCal
 }
 
 /***********************************************************************
- *		dmRealizeObject16 (GDI.210)
+ *		dmRealizeObject (GDI.210)
  */
 int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPSTR lpOutObj, SEGPTR lpTextXForm)
 {
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index c924dfaec8a..17d76965d3d 100644
--- a/graphics/x11drv/oembitmap.c
+++ b/graphics/x11drv/oembitmap.c
@@ -330,7 +330,7 @@ static HBITMAP16 OBM_LoadBitmap( WORD id )
 
 
 /***********************************************************************
- *           X11DRV_LoadOEMResource (X11DRV.@)
+ *           LoadOEMResource (X11DRV.@)
  *
  */
 HANDLE X11DRV_LoadOEMResource(WORD resid, WORD type)
diff --git a/loader/main.c b/loader/main.c
index 891b683bfc8..2128df3f5f6 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -70,7 +70,7 @@ BOOL MAIN_MainInit(void)
 
 
 /***********************************************************************
- *           ExitKernel16 (KERNEL.2)
+ *           ExitKernel (KERNEL.2)
  *
  * Clean-up everything and exit the Wine process.
  *
diff --git a/loader/module.c b/loader/module.c
index b4136f85b26..64989b753b6 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -1466,7 +1466,8 @@ HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW)
 }
 
 /***********************************************************************
- *           LoadLibrary32_16   (KERNEL.482)
+ *           LoadLibrary32        (KERNEL.452)
+ *           LoadSystemLibrary32  (KERNEL.482)
  */
 HMODULE WINAPI LoadLibrary32_16( LPCSTR libname )
 {
@@ -1656,7 +1657,7 @@ void WINAPI PrivateFreeLibrary(HINSTANCE16 handle)
 
 
 /***********************************************************************
- *           WIN32_GetProcAddress16   (KERNEL32.37)
+ *           GetProcAddress16   (KERNEL32.37)
  * Get procaddress in 16bit module from win32... (kernel32 undoc. ordinal func)
  */
 FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE hModule, LPCSTR name )
@@ -1674,7 +1675,7 @@ FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE hModule, LPCSTR name )
 }
 
 /***********************************************************************
- *           GetProcAddress16   (KERNEL.50)
+ *           GetProcAddress   (KERNEL.50)
  */
 FARPROC16 WINAPI GetProcAddress16( HMODULE16 hModule, LPCSTR name )
 {
diff --git a/loader/ne/module.c b/loader/ne/module.c
index ad794b61037..ffff2eef935 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -1293,7 +1293,7 @@ static BOOL16 NE_FreeModule( HMODULE16 hModule, BOOL call_wep )
 
 
 /**********************************************************************
- *	    FreeModule16    (KERNEL.46)
+ *	    FreeModule    (KERNEL.46)
  */
 BOOL16 WINAPI FreeModule16( HMODULE16 hModule )
 {
@@ -1663,7 +1663,7 @@ BOOL16 WINAPI ModuleFindHandle16( MODULEENTRY *lpme, HMODULE16 hModule )
 
 
 /***************************************************************************
- *          IsRomModule16    (KERNEL.323)
+ *          IsRomModule    (KERNEL.323)
  */
 BOOL16 WINAPI IsRomModule16( HMODULE16 unused )
 {
@@ -1671,7 +1671,7 @@ BOOL16 WINAPI IsRomModule16( HMODULE16 unused )
 }
 
 /***************************************************************************
- *          IsRomFile16    (KERNEL.326)
+ *          IsRomFile    (KERNEL.326)
  */
 BOOL16 WINAPI IsRomFile16( HFILE16 unused )
 {
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index ebd9d39b206..7dbe398c7cd 100644
--- a/loader/ne/resource.c
+++ b/loader/ne/resource.c
@@ -178,7 +178,7 @@ NE_NAMEINFO *NE_FindResourceFromType( LPBYTE pResTab,
 
 
 /***********************************************************************
- *           NE_DefResourceHandler
+ *           DefResourceHandler (KERNEL.456)
  *
  * This is the default LoadProc() function. 
  */
@@ -403,7 +403,7 @@ HGLOBAL16 WINAPI DirectResAlloc16( HINSTANCE16 hInstance, WORD wType,
 
 
 /**********************************************************************
- *          AccessResource16 (KERNEL.64)
+ *          AccessResource (KERNEL.64)
  */
 INT16 WINAPI AccessResource16( HINSTANCE16 hModule, HRSRC16 hRsrc )
 {
diff --git a/loader/resource.c b/loader/resource.c
index aa832201bec..036348b8e71 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -376,7 +376,7 @@ HGLOBAL WINAPI LoadResource( HINSTANCE hModule, HRSRC hRsrc )
 }
 
 /**********************************************************************
- *          LockResource16   (KERNEL.62)
+ *          LockResource   (KERNEL.62)
  */
 SEGPTR WINAPI WIN16_LockResource16( HGLOBAL16 handle )
 {
diff --git a/loader/task.c b/loader/task.c
index c1fdf58d69e..82b66352682 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -682,7 +682,7 @@ void WINAPI OldYield16(void)
 }
 
 /***********************************************************************
- *           WIN32_OldYield16  (KERNEL.447)
+ *           WIN32_OldYield  (KERNEL.447)
  */
 void WINAPI WIN32_OldYield16(void)
 {
@@ -714,7 +714,7 @@ void WINAPI DirectedYield16( HTASK16 hTask )
 }
 
 /***********************************************************************
- *           Yield16  (KERNEL.29)
+ *           Yield  (KERNEL.29)
  */
 void WINAPI Yield16(void)
 {
@@ -737,7 +737,7 @@ HTASK16 WINAPI KERNEL_490( HTASK16 someTask )
 }
 
 /***********************************************************************
- *           MakeProcInstance16  (KERNEL.51)
+ *           MakeProcInstance  (KERNEL.51)
  */
 FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
 {
@@ -810,7 +810,7 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
 
 
 /***********************************************************************
- *           FreeProcInstance16  (KERNEL.52)
+ *           FreeProcInstance  (KERNEL.52)
  */
 void WINAPI FreeProcInstance16( FARPROC16 func )
 {
@@ -933,7 +933,7 @@ BOOL16 WINAPI GetCodeInfo16( FARPROC16 proc, SEGINFO *segInfo )
 
 
 /**********************************************************************
- *          DefineHandleTable16    (KERNEL.94)
+ *          DefineHandleTable    (KERNEL.94)
  */
 BOOL16 WINAPI DefineHandleTable16( WORD wOffset )
 {
@@ -1139,7 +1139,7 @@ void WINAPI SwitchStackBack16( CONTEXT86 *context )
 
 
 /***********************************************************************
- *           GetTaskQueueDS16  (KERNEL.118)
+ *           GetTaskQueueDS  (KERNEL.118)
  */
 void WINAPI GetTaskQueueDS16(void)
 {
@@ -1148,7 +1148,7 @@ void WINAPI GetTaskQueueDS16(void)
 
 
 /***********************************************************************
- *           GetTaskQueueES16  (KERNEL.119)
+ *           GetTaskQueueES  (KERNEL.119)
  */
 void WINAPI GetTaskQueueES16(void)
 {
@@ -1187,7 +1187,7 @@ DWORD WINAPI GetCurrentPDB16(void)
 
 
 /***********************************************************************
- *           GetCurPID16   (KERNEL.157)
+ *           GetCurPID   (KERNEL.157)
  */
 DWORD WINAPI GetCurPID16( DWORD unused )
 {
@@ -1221,7 +1221,7 @@ WORD WINAPI GetExeVersion16(void)
 
 
 /***********************************************************************
- *           SetErrorMode16   (KERNEL.107)
+ *           SetErrorMode   (KERNEL.107)
  */
 UINT16 WINAPI SetErrorMode16( UINT16 mode )
 {
@@ -1285,7 +1285,7 @@ BOOL16 WINAPI IsTask16( HTASK16 hTask )
 
 
 /***********************************************************************
- *           IsWinOldApTask16   (KERNEL.158)
+ *           IsWinOldApTask   (KERNEL.158)
  */
 BOOL16 WINAPI IsWinOldApTask16( HTASK16 hTask )
 {
@@ -1365,7 +1365,7 @@ VOID WINAPI GlobalNotify16( FARPROC16 proc )
 
 
 /***********************************************************************
- *           GetExePtr   (KERNEL.133)
+ *           GetExePtrHelper
  */
 static inline HMODULE16 GetExePtrHelper( HANDLE16 handle, HTASK16 *hTask )
 {
@@ -1412,8 +1412,9 @@ static inline HMODULE16 GetExePtrHelper( HANDLE16 handle, HTASK16 *hTask )
     return 0;
 }
 
-/**********************************************************************/
-
+/***********************************************************************
+ *           GetExePtr   (KERNEL.133)
+ */
 HMODULE16 WINAPI WIN16_GetExePtr( HANDLE16 handle )
 {
     HTASK16 hTask = 0;
@@ -1424,8 +1425,10 @@ HMODULE16 WINAPI WIN16_GetExePtr( HANDLE16 handle )
     return hModule;
 }
 
-/**********************************************************************/
 
+/***********************************************************************
+ *           K228   (KERNEL.228)
+ */
 HMODULE16 WINAPI GetExePtr( HANDLE16 handle )
 {
     HTASK16 hTask = 0;
@@ -1494,7 +1497,7 @@ BOOL16 WINAPI TaskFindHandle16( TASKENTRY *lpte, HTASK16 hTask )
 typedef INT (WINAPI *MessageBoxA_funcptr)(HWND hWnd, LPCSTR text, LPCSTR title, UINT type);
 
 /**************************************************************************
- *           FatalAppExit16   (KERNEL.137)
+ *           FatalAppExit   (KERNEL.137)
  */
 void WINAPI FatalAppExit16( UINT16 action, LPCSTR str )
 {
@@ -1520,7 +1523,7 @@ void WINAPI FatalAppExit16( UINT16 action, LPCSTR str )
 
 
 /***********************************************************************
- *           TerminateApp16   (TOOLHELP.77)
+ *           TerminateApp   (TOOLHELP.77)
  *
  * See "Undocumented Windows".
  */
@@ -1553,7 +1556,7 @@ void WINAPI TerminateApp16(HTASK16 hTask, WORD wFlags)
 
 
 /***********************************************************************
- *           GetAppCompatFlags16   (KERNEL.354)
+ *           GetAppCompatFlags   (KERNEL.354)
  */
 DWORD WINAPI GetAppCompatFlags16( HTASK16 hTask )
 {
diff --git a/memory/atom.c b/memory/atom.c
index 0e79a596980..736b6d3ba91 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -174,7 +174,7 @@ static inline ATOMENTRY *ATOM_MakePtr( HANDLE16 handle /* [in] Handle */ )
 
 
 /***********************************************************************
- *           InitAtomTable16   (KERNEL.68)
+ *           InitAtomTable   (KERNEL.68)
  */
 WORD WINAPI InitAtomTable16( WORD entries )
 {
@@ -220,7 +220,7 @@ HANDLE16 WINAPI GetAtomHandle16( ATOM atom )
 
 
 /***********************************************************************
- *           AddAtom16   (KERNEL.70)
+ *           AddAtom   (KERNEL.70)
  *
  * Windows DWORD aligns the atom entry size.
  * The remaining unused string space created by the alignment
@@ -286,7 +286,7 @@ ATOM WINAPI AddAtom16( LPCSTR str )
 
 
 /***********************************************************************
- *           DeleteAtom16   (KERNEL.71)
+ *           DeleteAtom   (KERNEL.71)
  */
 ATOM WINAPI DeleteAtom16( ATOM atom )
 {
@@ -325,7 +325,7 @@ ATOM WINAPI DeleteAtom16( ATOM atom )
 
 
 /***********************************************************************
- *           FindAtom16   (KERNEL.69)
+ *           FindAtom   (KERNEL.69)
  */
 ATOM WINAPI FindAtom16( LPCSTR str )
 {
@@ -360,7 +360,7 @@ ATOM WINAPI FindAtom16( LPCSTR str )
 
 
 /***********************************************************************
- *           GetAtomName16   (KERNEL.72)
+ *           GetAtomName   (KERNEL.72)
  */
 UINT16 WINAPI GetAtomName16( ATOM atom, LPSTR buffer, INT16 count )
 {
diff --git a/memory/global.c b/memory/global.c
index 42fdfe9a9ab..837a7e2f08a 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -389,7 +389,7 @@ HGLOBAL16 WINAPI GlobalFree16(
 
 
 /***********************************************************************
- *           WIN16_GlobalLock16   (KERNEL.18)
+ *           GlobalLock   (KERNEL.18)
  *
  * This is the GlobalLock16() function used by 16-bit code.
  */
@@ -505,7 +505,7 @@ DWORD WINAPI GlobalSize16(
 
 
 /***********************************************************************
- *           GlobalHandle16   (KERNEL.21)
+ *           GlobalHandle   (KERNEL.21)
  * NOTES
  *	Why is GlobalHandleToSel used here with the sel as input?
  *
@@ -566,7 +566,7 @@ UINT16 WINAPI GlobalFlags16(
 
 
 /***********************************************************************
- *           LockSegment16   (KERNEL.23)
+ *           LockSegment   (KERNEL.23)
  */
 HGLOBAL16 WINAPI LockSegment16( HGLOBAL16 handle )
 {
@@ -582,7 +582,7 @@ HGLOBAL16 WINAPI LockSegment16( HGLOBAL16 handle )
 
 
 /***********************************************************************
- *           UnlockSegment16   (KERNEL.24)
+ *           UnlockSegment   (KERNEL.24)
  */
 void WINAPI UnlockSegment16( HGLOBAL16 handle )
 {
@@ -598,7 +598,7 @@ void WINAPI UnlockSegment16( HGLOBAL16 handle )
 
 
 /***********************************************************************
- *           GlobalCompact16   (KERNEL.25)
+ *           GlobalCompact   (KERNEL.25)
  */
 DWORD WINAPI GlobalCompact16( DWORD desired )
 {
@@ -642,7 +642,7 @@ BOOL16 WINAPI GlobalUnWire16( HGLOBAL16 handle )
 
 
 /***********************************************************************
- *           SetSwapAreaSize16   (KERNEL.106)
+ *           SetSwapAreaSize   (KERNEL.106)
  */
 LONG WINAPI SetSwapAreaSize16( WORD size )
 {
@@ -674,7 +674,7 @@ HGLOBAL16 WINAPI GlobalLRUNewest16( HGLOBAL16 handle )
 
 
 /***********************************************************************
- *           GetFreeSpace16   (KERNEL.169)
+ *           GetFreeSpace   (KERNEL.169)
  */
 DWORD WINAPI GetFreeSpace16( UINT16 wFlags )
 {
@@ -1547,7 +1547,7 @@ VOID WINAPI GlobalMemoryStatus(
 }
 
 /***********************************************************************
- *           A20Proc16   (KERNEL.165)
+ *           A20Proc   (KERNEL.165)
  */
 void WINAPI A20Proc16( WORD unused )
 {
@@ -1555,7 +1555,7 @@ void WINAPI A20Proc16( WORD unused )
 }
 
 /***********************************************************************
- *           LimitEMSPages16   (KERNEL.156)
+ *           LimitEMSPages   (KERNEL.156)
  */
 DWORD WINAPI LimitEMSPages16( DWORD unused )
 {
diff --git a/memory/heap.c b/memory/heap.c
index 27c12802e20..2623b35849a 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -1700,7 +1700,7 @@ typedef struct _LOCAL32HEADER
 #define LOCAL32_MAGIC    ((DWORD)('L' | ('H'<<8) | ('3'<<16) | ('2'<<24)))
 
 /***********************************************************************
- *           Local32Init   (KERNEL.208)
+ *           K208   (KERNEL.208)
  */
 HANDLE WINAPI Local32Init16( WORD segment, DWORD tableSize,
                              DWORD heapSize, DWORD flags )
@@ -1901,7 +1901,7 @@ static VOID Local32_FromHandle( LOCAL32HEADER *header, INT16 type,
 }
 
 /***********************************************************************
- *           Local32Alloc   (KERNEL.209)
+ *           K209   (KERNEL.209)
  */
 DWORD WINAPI Local32Alloc16( HANDLE heap, DWORD size, INT16 type, DWORD flags )
 {
@@ -1979,7 +1979,7 @@ DWORD WINAPI Local32Alloc16( HANDLE heap, DWORD size, INT16 type, DWORD flags )
 }
 
 /***********************************************************************
- *           Local32ReAlloc   (KERNEL.210)
+ *           K210   (KERNEL.210)
  */
 DWORD WINAPI Local32ReAlloc16( HANDLE heap, DWORD addr, INT16 type,
                              DWORD size, DWORD flags )
@@ -2013,7 +2013,7 @@ DWORD WINAPI Local32ReAlloc16( HANDLE heap, DWORD addr, INT16 type,
 }
 
 /***********************************************************************
- *           Local32Free   (KERNEL.211)
+ *           K211   (KERNEL.211)
  */
 BOOL WINAPI Local32Free16( HANDLE heap, DWORD addr, INT16 type )
 {
@@ -2059,7 +2059,7 @@ BOOL WINAPI Local32Free16( HANDLE heap, DWORD addr, INT16 type )
 }
 
 /***********************************************************************
- *           Local32Translate   (KERNEL.213)
+ *           K213   (KERNEL.213)
  */
 DWORD WINAPI Local32Translate16( HANDLE heap, DWORD addr, INT16 type1, INT16 type2 )
 {
@@ -2075,7 +2075,7 @@ DWORD WINAPI Local32Translate16( HANDLE heap, DWORD addr, INT16 type1, INT16 typ
 }
 
 /***********************************************************************
- *           Local32Size   (KERNEL.214)
+ *           K214   (KERNEL.214)
  */
 DWORD WINAPI Local32Size16( HANDLE heap, DWORD addr, INT16 type )
 {
@@ -2090,7 +2090,7 @@ DWORD WINAPI Local32Size16( HANDLE heap, DWORD addr, INT16 type )
 }
 
 /***********************************************************************
- *           Local32ValidHandle   (KERNEL.215)
+ *           K215   (KERNEL.215)
  */
 BOOL WINAPI Local32ValidHandle16( HANDLE heap, WORD addr )
 {
@@ -2103,7 +2103,7 @@ BOOL WINAPI Local32ValidHandle16( HANDLE heap, WORD addr )
 }
 
 /***********************************************************************
- *           Local32GetSegment   (KERNEL.229)
+ *           K229   (KERNEL.229)
  */
 WORD WINAPI Local32GetSegment16( HANDLE heap )
 {
diff --git a/memory/local.c b/memory/local.c
index 277925f9e16..3999149114c 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -1562,7 +1562,7 @@ HLOCAL16 LOCAL_Handle( HANDLE16 ds, WORD addr )
 
 
 /***********************************************************************
- *           LocalAlloc16   (KERNEL.5)
+ *           LocalAlloc   (KERNEL.5)
  */
 HLOCAL16 WINAPI LocalAlloc16( UINT16 flags, WORD size )
 {
@@ -1573,7 +1573,7 @@ HLOCAL16 WINAPI LocalAlloc16( UINT16 flags, WORD size )
 
 
 /***********************************************************************
- *           LocalReAlloc16   (KERNEL.6)
+ *           LocalReAlloc   (KERNEL.6)
  */
 HLOCAL16 WINAPI LocalReAlloc16( HLOCAL16 handle, WORD size, UINT16 flags )
 {
@@ -1582,7 +1582,7 @@ HLOCAL16 WINAPI LocalReAlloc16( HLOCAL16 handle, WORD size, UINT16 flags )
 
 
 /***********************************************************************
- *           LocalFree16   (KERNEL.7)
+ *           LocalFree   (KERNEL.7)
  */
 HLOCAL16 WINAPI LocalFree16( HLOCAL16 handle )
 {
@@ -1591,7 +1591,7 @@ HLOCAL16 WINAPI LocalFree16( HLOCAL16 handle )
 
 
 /***********************************************************************
- *           LocalLock16   (KERNEL.8)
+ *           LocalLock   (KERNEL.8)
  *
  * Note: only the offset part of the pointer is returned by the relay code.
  */
@@ -1604,7 +1604,7 @@ SEGPTR WINAPI LocalLock16( HLOCAL16 handle )
 
 
 /***********************************************************************
- *           LocalUnlock16   (KERNEL.9)
+ *           LocalUnlock   (KERNEL.9)
  */
 BOOL16 WINAPI LocalUnlock16( HLOCAL16 handle )
 {
@@ -1613,7 +1613,7 @@ BOOL16 WINAPI LocalUnlock16( HLOCAL16 handle )
 
 
 /***********************************************************************
- *           LocalSize16   (KERNEL.10)
+ *           LocalSize   (KERNEL.10)
  */
 UINT16 WINAPI LocalSize16( HLOCAL16 handle )
 {
@@ -1622,7 +1622,7 @@ UINT16 WINAPI LocalSize16( HLOCAL16 handle )
 
 
 /***********************************************************************
- *           LocalHandle16   (KERNEL.11)
+ *           LocalHandle   (KERNEL.11)
  */
 HLOCAL16 WINAPI LocalHandle16( WORD addr )
 { 
@@ -1631,7 +1631,7 @@ HLOCAL16 WINAPI LocalHandle16( WORD addr )
 
 
 /***********************************************************************
- *           LocalFlags16   (KERNEL.12)
+ *           LocalFlags   (KERNEL.12)
  */
 UINT16 WINAPI LocalFlags16( HLOCAL16 handle )
 {
@@ -1640,7 +1640,7 @@ UINT16 WINAPI LocalFlags16( HLOCAL16 handle )
 
 
 /***********************************************************************
- *           LocalCompact16   (KERNEL.13)
+ *           LocalCompact   (KERNEL.13)
  */
 UINT16 WINAPI LocalCompact16( UINT16 minfree )
 {
@@ -1688,7 +1688,7 @@ FARPROC16 WINAPI LocalNotify16( FARPROC16 func )
 
 
 /***********************************************************************
- *           LocalShrink16   (KERNEL.121)
+ *           LocalShrink   (KERNEL.121)
  */
 UINT16 WINAPI LocalShrink16( HGLOBAL16 handle, UINT16 newsize )
 {
diff --git a/memory/selector.c b/memory/selector.c
index 13074bfda71..40d4c7fe8da 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -376,7 +376,7 @@ WORD WINAPI SelectorAccessRights16( WORD sel, WORD op, WORD val )
 
 
 /***********************************************************************
- *           IsBadCodePtr16   (KERNEL.336)
+ *           IsBadCodePtr   (KERNEL.336)
  */
 BOOL16 WINAPI IsBadCodePtr16( SEGPTR lpfn )
 {
@@ -395,7 +395,7 @@ BOOL16 WINAPI IsBadCodePtr16( SEGPTR lpfn )
 
 
 /***********************************************************************
- *           IsBadStringPtr16   (KERNEL.337)
+ *           IsBadStringPtr   (KERNEL.337)
  */
 BOOL16 WINAPI IsBadStringPtr16( SEGPTR ptr, UINT16 size )
 {
@@ -416,7 +416,7 @@ BOOL16 WINAPI IsBadStringPtr16( SEGPTR ptr, UINT16 size )
 
 
 /***********************************************************************
- *           IsBadHugeReadPtr16   (KERNEL.346)
+ *           IsBadHugeReadPtr   (KERNEL.346)
  */
 BOOL16 WINAPI IsBadHugeReadPtr16( SEGPTR ptr, DWORD size )
 {
@@ -436,7 +436,7 @@ BOOL16 WINAPI IsBadHugeReadPtr16( SEGPTR ptr, DWORD size )
 
 
 /***********************************************************************
- *           IsBadHugeWritePtr16   (KERNEL.347)
+ *           IsBadHugeWritePtr   (KERNEL.347)
  */
 BOOL16 WINAPI IsBadHugeWritePtr16( SEGPTR ptr, DWORD size )
 {
@@ -454,7 +454,7 @@ BOOL16 WINAPI IsBadHugeWritePtr16( SEGPTR ptr, DWORD size )
 }
 
 /***********************************************************************
- *           IsBadReadPtr16   (KERNEL.334)
+ *           IsBadReadPtr   (KERNEL.334)
  */
 BOOL16 WINAPI IsBadReadPtr16( SEGPTR ptr, UINT16 size )
 {
@@ -463,7 +463,7 @@ BOOL16 WINAPI IsBadReadPtr16( SEGPTR ptr, UINT16 size )
 
 
 /***********************************************************************
- *           IsBadWritePtr16   (KERNEL.335)
+ *           IsBadWritePtr   (KERNEL.335)
  */
 BOOL16 WINAPI IsBadWritePtr16( SEGPTR ptr, UINT16 size )
 {
@@ -472,7 +472,7 @@ BOOL16 WINAPI IsBadWritePtr16( SEGPTR ptr, UINT16 size )
 
 
 /***********************************************************************
- *           IsBadFlatReadWritePtr16   (KERNEL.627)
+ *           IsBadFlatReadWritePtr   (KERNEL.627)
  */
 BOOL16 WINAPI IsBadFlatReadWritePtr16( SEGPTR ptr, DWORD size, BOOL16 bWrite )
 {
diff --git a/memory/string.c b/memory/string.c
index 33d01a0462f..af3b614987d 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -29,7 +29,7 @@ static WINE_EXCEPTION_FILTER(page_fault)
 
 
 /***********************************************************************
- *           hmemcpy16   (KERNEL.348)
+ *           hmemcpy   (KERNEL.348)
  */
 void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count )
 {
@@ -38,7 +38,7 @@ void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count )
 
 
 /***********************************************************************
- *           lstrcat16   (KERNEL.89)
+ *           lstrcat   (KERNEL.89)
  */
 SEGPTR WINAPI lstrcat16( SEGPTR dst, LPCSTR src )
 {
@@ -87,7 +87,7 @@ LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src )
 
 
 /***********************************************************************
- *           lstrcatn16   (KERNEL.352)
+ *           lstrcatn   (KERNEL.352)
  */
 SEGPTR WINAPI lstrcatn16( SEGPTR dst, LPCSTR src, INT16 n )
 {
@@ -152,7 +152,7 @@ INT WINAPI lstrcmpiW( LPCWSTR str1, LPCWSTR str2 )
 
 
 /***********************************************************************
- *           lstrcpy16   (KERNEL.88)
+ *           lstrcpy   (KERNEL.88)
  */
 SEGPTR WINAPI lstrcpy16( SEGPTR dst, LPCSTR src )
 {
@@ -202,7 +202,7 @@ LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src )
 
 
 /***********************************************************************
- *           lstrcpyn16   (KERNEL.353)
+ *           lstrcpyn   (KERNEL.353)
  */
 SEGPTR WINAPI lstrcpyn16( SEGPTR dst, LPCSTR src, INT16 n )
 {
@@ -258,7 +258,7 @@ LPWSTR WINAPI lstrcpynW( LPWSTR dst, LPCWSTR src, INT n )
 
 
 /***********************************************************************
- *           lstrlen16   (KERNEL.90)
+ *           lstrlen   (KERNEL.90)
  */
 INT16 WINAPI lstrlen16( LPCSTR str )
 {
diff --git a/misc/error.c b/misc/error.c
index fba7762f520..2c243e4881a 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -158,7 +158,7 @@ void WINAPI LogParamError16(UINT16 uErr, FARPROC16 lpfn, LPVOID lpvParam)
 }
 
 /***********************************************************************
-*	HandleParamError (KERNEL.327)
+*	K327 (KERNEL.327)
 */
 void WINAPI HandleParamError( CONTEXT86 *context )
 {
diff --git a/misc/registry.c b/misc/registry.c
index 706771e9999..ff868dceaea 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -1668,8 +1668,8 @@ static inline void fix_win16_hkey( HKEY *hkey )
 }
 
 /******************************************************************************
- *           RegEnumKey16   [KERNEL.216]
- *           RegEnumKey16   [SHELL.7]
+ *           RegEnumKey   [KERNEL.216]
+ *           RegEnumKey   [SHELL.7]
  */
 DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 {
@@ -1678,8 +1678,8 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 }
 
 /******************************************************************************
- *           RegOpenKey16   [KERNEL.217]
- *           RegOpenKey16   [SHELL.1]
+ *           RegOpenKey   [KERNEL.217]
+ *           RegOpenKey   [SHELL.1]
  */
 DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -1688,8 +1688,8 @@ DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 }
 
 /******************************************************************************
- *           RegCreateKey16   [KERNEL.218]
- *           RegCreateKey16   [SHELL.2]
+ *           RegCreateKey   [KERNEL.218]
+ *           RegCreateKey   [SHELL.2]
  */
 DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -1698,8 +1698,8 @@ DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
 }
 
 /******************************************************************************
- *           RegDeleteKey16   [KERNEL.219]
- *           RegDeleteKey16   [SHELL.4]
+ *           RegDeleteKey   [KERNEL.219]
+ *           RegDeleteKey   [SHELL.4]
  */
 DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name )
 {
@@ -1708,8 +1708,8 @@ DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name )
 }
 
 /******************************************************************************
- *           RegCloseKey16   [KERNEL.220]
- *           RegCloseKey16   [SHELL.3]
+ *           RegCloseKey   [KERNEL.220]
+ *           RegCloseKey   [SHELL.3]
  */
 DWORD WINAPI RegCloseKey16( HKEY hkey )
 {
@@ -1718,8 +1718,8 @@ DWORD WINAPI RegCloseKey16( HKEY hkey )
 }
 
 /******************************************************************************
- *           RegSetValue16   [KERNEL.221]
- *           RegSetValue16   [SHELL.5]
+ *           RegSetValue   [KERNEL.221]
+ *           RegSetValue   [SHELL.5]
  */
 DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count )
 {
@@ -1728,7 +1728,7 @@ DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWO
 }
 
 /******************************************************************************
- *           RegDeleteValue16  [KERNEL.222]
+ *           RegDeleteValue  [KERNEL.222]
  */
 DWORD WINAPI RegDeleteValue16( HKEY hkey, LPSTR name )
 {
@@ -1737,7 +1737,7 @@ DWORD WINAPI RegDeleteValue16( HKEY hkey, LPSTR name )
 }
 
 /******************************************************************************
- *           RegEnumValue16   [KERNEL.223]
+ *           RegEnumValue   [KERNEL.223]
  */
 DWORD WINAPI RegEnumValue16( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_count,
                              LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count )
@@ -1747,8 +1747,8 @@ DWORD WINAPI RegEnumValue16( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_co
 }
 
 /******************************************************************************
- *           RegQueryValue16   [KERNEL.224]
- *           RegQueryValue16   [SHELL.6]
+ *           RegQueryValue   [KERNEL.224]
+ *           RegQueryValue   [SHELL.6]
  *
  * NOTES
  *    Is this HACK still applicable?
@@ -1766,7 +1766,7 @@ DWORD WINAPI RegQueryValue16( HKEY hkey, LPCSTR name, LPSTR data, LPDWORD count
 }
 
 /******************************************************************************
- *           RegQueryValueEx16   [KERNEL.225]
+ *           RegQueryValueEx   [KERNEL.225]
  */
 DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type,
                                 LPBYTE data, LPDWORD count )
@@ -1776,7 +1776,7 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWOR
 }
 
 /******************************************************************************
- *           RegSetValueEx16   [KERNEL.226]
+ *           RegSetValueEx   [KERNEL.226]
  */
 DWORD WINAPI RegSetValueEx16( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
                               CONST BYTE *data, DWORD count )
@@ -1787,7 +1787,7 @@ DWORD WINAPI RegSetValueEx16( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type
 }
 
 /******************************************************************************
- *           RegFlushKey16   [KERNEL.227]
+ *           RegFlushKey   [KERNEL.227]
  */
 DWORD WINAPI RegFlushKey16( HKEY hkey )
 {
diff --git a/misc/system.c b/misc/system.c
index c897371cf30..98b420dc06a 100644
--- a/misc/system.c
+++ b/misc/system.c
@@ -191,7 +191,7 @@ void WINAPI DisableSystemTimers16(void)
 
 
 /***********************************************************************
- *           Get80x87SaveSize16   (SYSTEM.7)
+ *           Get80x87SaveSize   (SYSTEM.7)
  */
 WORD WINAPI Get80x87SaveSize16(void)
 {
@@ -200,7 +200,7 @@ WORD WINAPI Get80x87SaveSize16(void)
 
 
 /***********************************************************************
- *           Save80x87State16   (SYSTEM.8)
+ *           Save80x87State   (SYSTEM.8)
  */
 void WINAPI Save80x87State16( char *ptr )
 {
@@ -211,7 +211,7 @@ void WINAPI Save80x87State16( char *ptr )
 
 
 /***********************************************************************
- *           Restore80x87State16   (SYSTEM.9)
+ *           Restore80x87State   (SYSTEM.9)
  */
 void WINAPI Restore80x87State16( const char *ptr )
 {
diff --git a/misc/version.c b/misc/version.c
index 6d081abc41f..9e77f62b661 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -371,7 +371,7 @@ static WINDOWS_VERSION VERSION_GetVersion(void)
 
 
 /***********************************************************************
- *         GetVersion16   (KERNEL.3)
+ *         GetVersion   (KERNEL.3)
  */
 LONG WINAPI GetVersion16(void)
 {
@@ -391,7 +391,7 @@ LONG WINAPI GetVersion(void)
 
 
 /***********************************************************************
- *         GetVersionEx16   (KERNEL.149)
+ *         GetVersionEx   (KERNEL.149)
  */
 BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16 *v)
 {
@@ -509,7 +509,7 @@ BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO *lpwdi)
 
 
 /***********************************************************************
- *           DebugFillBuffer                    (KERNEL.329)
+ *           K329                    (KERNEL.329)
  *
  * TODO:
  * Should fill lpBuffer only if DBO_BUFFERFILL has been set by SetWinDebugInfo()
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 6d341f37a27..93ee4ae64b7 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -78,7 +78,7 @@ HBITMAP16 WINAPI CreateUserDiscardableBitmap16( WORD dummy,
 
 /***********************************************************************
  *           CreateBitmap    (GDI.48)
- *           CreateBitmap16    (DISPLAY.48)
+ *           CreateBitmap    (DISPLAY.48)
  */
 HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes,
                                  UINT16 bpp, LPCVOID bits )
diff --git a/objects/dib.c b/objects/dib.c
index 679ec1cce41..459e943ff89 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -758,7 +758,7 @@ INT WINAPI GetDIBits(
 
 /***********************************************************************
  *           CreateDIBitmap    (GDI.442)
- *           CreateDIBitmap16    (DISPLAY.442)
+ *           CreateDIBitmap    (DISPLAY.442)
  */
 HBITMAP16 WINAPI CreateDIBitmap16( HDC16 hdc, const BITMAPINFOHEADER * header,
                             DWORD init, LPCVOID bits, const BITMAPINFO * data,
diff --git a/objects/font.c b/objects/font.c
index 8211e915893..f7910996e15 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -1268,7 +1268,6 @@ UINT16 WINAPI GetOutlineTextMetrics16(
 
 
 /***********************************************************************
- *		GetOutlineTextMetrics (GDI.308)
  *		GetOutlineTextMetricsA (GDI32.@)
  * Gets metrics for TrueType fonts.
  *
@@ -1353,7 +1352,7 @@ UINT WINAPI GetOutlineTextMetricsW(
 
 /***********************************************************************
  *           GetCharWidth    (GDI.350)
- *           GetCharWidth16    (DISPLAY.350)
+ *           GetCharWidth    (DISPLAY.350)
  */
 BOOL16 WINAPI GetCharWidth16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
                               LPINT16 buffer )
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index c8aa1feee50..1bd60ecaf33 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -576,7 +576,8 @@ void GDI_ReleaseObj( HGDIOBJ handle )
 
 
 /***********************************************************************
- *           DeleteObject    (GDI.605)
+ *           DeleteObject    (GDI.69)
+ *           SysDeleteObject (GDI.605)
  */
 BOOL16 WINAPI DeleteObject16( HGDIOBJ16 obj )
 {
@@ -1212,7 +1213,7 @@ DWORD WINAPI GdiSeeGdiDo16( WORD wReqType, WORD wParam1, WORD wParam2,
 }
 
 /***********************************************************************
- *           GdiSignalProc     (GDI.610)
+ *           GdiSignalProc32     (GDI.610)
  */
 WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
                            DWORD dwFlags, HMODULE16 hModule )
diff --git a/objects/palette.c b/objects/palette.c
index c05beb27fc9..f63bb6cb89a 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -819,7 +819,7 @@ BOOL WINAPI UpdateColors(
 
 /**********************************************************************
  *            UpdateColors   (DISPLAY.366)
- *            UpdateColors16   (GDI.366)
+ *            UpdateColors   (GDI.366)
  */
 INT16 WINAPI UpdateColors16( HDC16 hDC )
 {
diff --git a/objects/text.c b/objects/text.c
index cbeebb9a507..f95e70c8b6f 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -22,7 +22,7 @@ DEFAULT_DEBUG_CHANNEL(text);
 
 /***********************************************************************
  *           ExtTextOut    (DISPLAY.351)
- *           ExtTextOut16    (GDI.351)
+ *           ExtTextOut    (GDI.351)
  */
 BOOL16 WINAPI ExtTextOut16( HDC16 hdc, INT16 x, INT16 y, UINT16 flags,
                             const RECT16 *lprect, LPCSTR str, UINT16 count,
diff --git a/scheduler/synchro.c b/scheduler/synchro.c
index fdff105ad7a..f0e755d46b8 100644
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@@ -344,7 +344,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
 
 
 /***********************************************************************
- *           WaitForSingleObject16   (KERNEL.460)
+ *           WaitForSingleObject   (KERNEL.460)
  */
 DWORD WINAPI WaitForSingleObject16( HANDLE handle, DWORD timeout )
 {
@@ -357,7 +357,7 @@ DWORD WINAPI WaitForSingleObject16( HANDLE handle, DWORD timeout )
 }
 
 /***********************************************************************
- *           WaitForMultipleObjects16   (KERNEL.461)
+ *           WaitForMultipleObjects   (KERNEL.461)
  */
 DWORD WINAPI WaitForMultipleObjects16( DWORD count, const HANDLE *handles,
                                        BOOL wait_all, DWORD timeout )
@@ -371,7 +371,7 @@ DWORD WINAPI WaitForMultipleObjects16( DWORD count, const HANDLE *handles,
 }
 
 /***********************************************************************
- *           WaitForMultipleObjectsEx16   (KERNEL.495)
+ *           WaitForMultipleObjectsEx   (KERNEL.495)
  */
 DWORD WINAPI WaitForMultipleObjectsEx16( DWORD count, const HANDLE *handles,
                                          BOOL wait_all, DWORD timeout, BOOL alertable )
diff --git a/scheduler/syslevel.c b/scheduler/syslevel.c
index 7264a81a70a..f03d8dcd36e 100644
--- a/scheduler/syslevel.c
+++ b/scheduler/syslevel.c
@@ -120,7 +120,7 @@ VOID WINAPI _LeaveSysLevel(SYSLEVEL *lock)
 }
 
 /************************************************************************
- *		_KERNEL32_86 (KERNEL32.86)
+ *		@ (KERNEL32.86)
  */
 VOID WINAPI _KERNEL32_86(SYSLEVEL *lock)
 {
diff --git a/windows/dialog.c b/windows/dialog.c
index 3e4f76834b7..5a2db791327 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -1912,7 +1912,8 @@ BOOL WINAPI CheckRadioButton( HWND hwndDlg, UINT firstID,
 
 
 /***********************************************************************
- *		GetDialogBaseUnits (USER.243) (USER32.@)
+ *		GetDialogBaseUnits (USER.243)
+ *		GetDialogBaseUnits (USER32.@)
  */
 DWORD WINAPI GetDialogBaseUnits(void)
 {
diff --git a/windows/input.c b/windows/input.c
index 9810f8e86c7..6710cbf12ee 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -561,7 +561,8 @@ HWND WINAPI SetCapture( HWND hwnd )
 
 
 /**********************************************************************
- *		ReleaseCapture (USER.19) (USER32.@)
+ *		ReleaseCapture (USER.19)
+ *		ReleaseCapture (USER32.@)
  */
 BOOL WINAPI ReleaseCapture(void)
 {
@@ -627,7 +628,8 @@ SHORT WINAPI GetKeyState(INT vkey)
 }
 
 /**********************************************************************
- *		GetKeyboardState (USER.222) (USER32.@)
+ *		GetKeyboardState (USER.222)
+ *		GetKeyboardState (USER32.@)
  *
  * An application calls the GetKeyboardState function in response to a
  * keyboard-input message.  This function retrieves the state of the keyboard
@@ -647,7 +649,8 @@ BOOL WINAPI GetKeyboardState(LPBYTE lpKeyState)
 }
 
 /**********************************************************************
- *		SetKeyboardState (USER.223) (USER32.@)
+ *		SetKeyboardState (USER.223)
+ *		SetKeyboardState (USER32.@)
  */
 BOOL WINAPI SetKeyboardState(LPBYTE lpKeyState)
 {
diff --git a/windows/keyboard.c b/windows/keyboard.c
index dd331c0dd7e..0447c20a838 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -153,7 +153,8 @@ VOID WINAPI ScreenSwitchEnable16(WORD unused)
 }
 
 /**********************************************************************
- *		OemKeyScan (KEYBOARD.128) (USER32.@)
+ *		OemKeyScan (KEYBOARD.128)
+ *		OemKeyScan (USER32.@)
  */
 DWORD WINAPI OemKeyScan(WORD wOemChar)
 {
diff --git a/windows/message.c b/windows/message.c
index 93f6b4ca748..807aaaa889f 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -1865,7 +1865,8 @@ LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- *		WaitMessage (USER.112) (USER32.@) Suspend thread pending messages
+ *		WaitMessage (USER.112) Suspend thread pending messages
+ *		WaitMessage (USER32.@) Suspend thread pending messages
  *
  * WaitMessage() suspends a thread until events appear in the thread's
  * queue.
diff --git a/windows/queue.c b/windows/queue.c
index b9d7f3c634c..cafd93b3e97 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -632,7 +632,8 @@ BOOL WINAPI GetInputState(void)
 }
 
 /***********************************************************************
- *		GetMessagePos (USER.119) (USER32.@)
+ *		GetMessagePos (USER.119)
+ *		GetMessagePos (USER32.@)
  * 
  * The GetMessagePos() function returns a long value representing a
  * cursor position, in screen coordinates, when the last message
@@ -666,7 +667,8 @@ DWORD WINAPI GetMessagePos(void)
 
 
 /***********************************************************************
- *		GetMessageTime (USER.120) (USER32.@)
+ *		GetMessageTime (USER.120)
+ *		GetMessageTime (USER32.@)
  *
  * GetMessageTime() returns the message time for the last message
  * retrieved by the function. The time is measured in milliseconds with
@@ -698,7 +700,8 @@ LONG WINAPI GetMessageTime(void)
 
 
 /***********************************************************************
- *		GetMessageExtraInfo (USER.288) (USER32.@)
+ *		GetMessageExtraInfo (USER.288)
+ *		GetMessageExtraInfo (USER32.@)
  */
 LONG WINAPI GetMessageExtraInfo(void)
 {
-- 
GitLab