diff --git a/dlls/gdi/gdi16.c b/dlls/gdi/gdi16.c
index dfa980b8dbfacc743203cd1d8c895068ed640ad5..ac658b043800ae90198f6d3130fe5c80175673d6 100644
--- a/dlls/gdi/gdi16.c
+++ b/dlls/gdi/gdi16.c
@@ -1254,7 +1254,6 @@ void WINAPI Resurrection16(HDC16 hdc,
 
 /**********************************************************************
  *	     CreateMetaFile     (GDI.125)
- *	     CreateMetaFile16   (GDI32.@)
  */
 HDC16 WINAPI CreateMetaFile16( LPCSTR filename )
 {
@@ -1596,7 +1595,6 @@ HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette )
 
 /***********************************************************************
  *           GDISelectPalette   (GDI.361)
- *           GDISelectPalette16 (GDI32.@)
  */
 HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg )
 {
@@ -1606,7 +1604,6 @@ HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg
 
 /***********************************************************************
  *           GDIRealizePalette   (GDI.362)
- *           GDIRealizePalette16 (GDI32.@)
  */
 UINT16 WINAPI GDIRealizePalette16( HDC16 hdc )
 {
diff --git a/dlls/gdi/mfdrv/init.c b/dlls/gdi/mfdrv/init.c
index dd4d1dc50ad0c5e0becb552bffc364089bc81228..7eca98927a27ce8acfb4dd730a2a8ed630c1b3a9 100644
--- a/dlls/gdi/mfdrv/init.c
+++ b/dlls/gdi/mfdrv/init.c
@@ -317,7 +317,6 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
 
 /******************************************************************
  *	     CloseMetaFile     (GDI.126)
- *	     CloseMetaFile16   (GDI32.@)
  */
 HMETAFILE16 WINAPI CloseMetaFile16(
 				   HDC16 hdc /* [in] Metafile DC to close */
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index 0f9e2488d554836ac490377e072e5c5222c9e2e8..dd79c94b68e330e4c592310d4e22dfe2dcc8b797 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -520,7 +520,6 @@ static int FreePrintJob(HANDLE16 hJob)
 
 /**********************************************************************
  *           OpenJob   (GDI.240)
- *           OpenJob16 (GDI32.@)
  *
  */
 HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC)
@@ -567,7 +566,6 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC)
 
 /**********************************************************************
  *           CloseJob   (GDI.243)
- *           CloseJob16 (GDI32.@)
  *
  */
 INT16 WINAPI CloseJob16(HPJOB16 hJob)
@@ -590,7 +588,6 @@ INT16 WINAPI CloseJob16(HPJOB16 hJob)
 
 /**********************************************************************
  *           WriteSpool   (GDI.241)
- *           WriteSpool16 (GDI32.@)
  *
  */
 INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch)
@@ -739,7 +736,6 @@ LPBYTE lpPrinterData, int cbData, int what)
 
 /******************************************************************
  *                DrvGetPrinterData     (GDI.282)
- *                DrvGetPrinterData16   (GDI32.@)
  *
  */
 DWORD WINAPI DrvGetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
@@ -834,7 +830,6 @@ failed:
 
 /******************************************************************
  *                 DrvSetPrinterData     (GDI.281)
- *                 DrvSetPrinterData16   (GDI32.@)
  *
  */
 DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c
index f7580340b49c2ab38883c2460797f4cf88b28a05..6ac79957ddeefc85f01a8f8f0ffa971e14d594a7 100644
--- a/dlls/netapi32/access.c
+++ b/dlls/netapi32/access.c
@@ -18,12 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <winbase.h>
-#include <winerror.h>
-#include <lmcons.h>
-#include <lmaccess.h>
-#include <lmapibuf.h>
-#include <lmerr.h>
+#include "winbase.h"
+#include "winerror.h"
+#include "lmcons.h"
+#include "lmaccess.h"
+#include "lmapibuf.h"
+#include "lmerr.h"
 #include "netapi32_misc.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c
index d969c4577ace4c174f6e820910e4e4713a024a11..f8dcdff17511e45335f9a657b117f66e04398f30 100644
--- a/dlls/netapi32/browsr.c
+++ b/dlls/netapi32/browsr.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <winbase.h>
-#include <winerror.h>
-#include <lmcons.h>
-#include <lmbrowsr.h>
+#include "winbase.h"
+#include "winerror.h"
+#include "lmcons.h"
+#include "lmbrowsr.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c
index ffac3e276a882262cd280b614157e3c0ae612efc..a7193d2c4e6ccf55aa4aaa102b8e385a56b611d1 100644
--- a/dlls/netapi32/wksta.c
+++ b/dlls/netapi32/wksta.c
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <winbase.h>
-#include <nb30.h>
-#include <lmcons.h>
-#include <lmapibuf.h>
-#include <lmerr.h>
-#include <lmwksta.h>
-#include <winerror.h>
-#include <winternl.h>
-#include <ntsecapi.h>
+#include "winbase.h"
+#include "nb30.h"
+#include "lmcons.h"
+#include "lmapibuf.h"
+#include "lmerr.h"
+#include "lmwksta.h"
+#include "winerror.h"
+#include "winternl.h"
+#include "ntsecapi.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c
index 83bf72f91a878bd1d2639eb006a56382001aad0c..71763afbaf054c693b499df771a6bacacafea97f 100644
--- a/dlls/user/msg16.c
+++ b/dlls/user/msg16.c
@@ -112,7 +112,6 @@ BOOL16 WINAPI PostMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM
 
 /***********************************************************************
  *		PostAppMessage (USER.116)
- *		PostAppMessage16 (USER32.@)
  */
 BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 msg, WPARAM16 wparam, LPARAM lparam )
 {
diff --git a/loader/module.c b/loader/module.c
index 41119f52c10adc02e3e7677f8f69878cf1620c47..56081c5c9fdee4dc53ae6d40fae8d8739a9f4b29 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -808,7 +808,6 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType )
 
 /***********************************************************************
  *           WinExec     (KERNEL.166)
- *           WinExec16   (KERNEL32.@)
  */
 HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow )
 {
diff --git a/loader/ne/convert.c b/loader/ne/convert.c
index cc5c16fb2ff9c372f976981d427e3dceef4d9070..fbe9fe57dc63e87bbe7048eab2da15fdf87fdd7b 100644
--- a/loader/ne/convert.c
+++ b/loader/ne/convert.c
@@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 /**********************************************************************
  *	    ConvertDialog32To16   (KERNEL.615)
- *	    ConvertDialog32To16   (KERNEL32.@)
  */
 VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
 {
@@ -454,4 +453,3 @@ HGLOBAL16 NE_LoadPEResource( NE_MODULE *pModule, WORD type, LPVOID bits, DWORD s
 
     return handle;
 }
-
diff --git a/loader/ne/module.c b/loader/ne/module.c
index c1b2c6dcbabc6fa0b483508af1a88961bb150bbb..e21454701034d2f21209395818fcc5ee0c2f56b7 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -1051,7 +1051,6 @@ static HINSTANCE16 NE_CreateThread( NE_MODULE *pModule, WORD cmdShow, LPCSTR cmd
 
 /**********************************************************************
  *          LoadModule      (KERNEL.45)
- *          LoadModule16    (KERNEL32.@)
  */
 HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock )
 {
@@ -1420,7 +1419,6 @@ WORD WINAPI GetExpWinVer16( HMODULE16 hModule )
 
 /**********************************************************************
  *	    GetModuleFileName      (KERNEL.49)
- *	    GetModuleFileName16    (KERNEL32.@)
  *
  * Comment: see GetModuleFileNameA
  *
diff --git a/loader/resource.c b/loader/resource.c
index 20c47c8be1b08351ff801a55dedb334c716b7526..f7e001ccfff3f9743ef55ad1d5a3377299396da9 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -336,7 +336,6 @@ static HGLOBAL RES_LoadResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
 
 /**********************************************************************
  *          FindResource     (KERNEL.60)
- *          FindResource16   (KERNEL32.@)
  */
 HRSRC16 WINAPI FindResource16( HMODULE16 hModule, LPCSTR name, LPCSTR type )
 {
@@ -384,7 +383,6 @@ HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type)
 
 /**********************************************************************
  *          LoadResource     (KERNEL.61)
- *          LoadResource16   (KERNEL32.@)
  */
 HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc )
 {
@@ -436,7 +434,6 @@ typedef WORD (WINAPI *pDestroyIcon32Proc)( HGLOBAL16 handle, UINT16 flags );
 
 /**********************************************************************
  *          FreeResource     (KERNEL.63)
- *          FreeResource16   (KERNEL32.@)
  */
 BOOL16 WINAPI FreeResource16( HGLOBAL16 handle )
 {
@@ -476,7 +473,6 @@ BOOL WINAPI FreeResource( HGLOBAL handle )
 
 /**********************************************************************
  *          SizeofResource   (KERNEL.65)
- *          SizeofResource16 (KERNEL32.@)
  */
 DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc )
 {
diff --git a/loader/task.c b/loader/task.c
index ce673e2eec7452c185beae1139fb8bda8bf7ec1f..b56692f2b83fb044d06e3552a74e84ccf311095c 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -1292,7 +1292,6 @@ WORD WINAPI GetDummyModuleHandleDS16(void)
 
 /***********************************************************************
  *           IsTask   (KERNEL.320)
- *           IsTask16 (KERNEL32.@)
  */
 BOOL16 WINAPI IsTask16( HTASK16 hTask )
 {
diff --git a/memory/environ.c b/memory/environ.c
index 343051081879eb91d6996f564d2608b40ce0a2e8..99dc6577349045cd8caba91d1b0cbed8b06080d2 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -750,7 +750,6 @@ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len )
 
 /***********************************************************************
  *           GetDOSEnvironment     (KERNEL.131)
- *           GetDOSEnvironment16   (KERNEL32.@)
  */
 SEGPTR WINAPI GetDOSEnvironment16(void)
 {
diff --git a/memory/global.c b/memory/global.c
index 4c20603a0ecd44156178975ca913c3bb37dd99fc..231746b42ff3cb8f818ad21fd932447548019814 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -277,7 +277,6 @@ HGLOBAL16 WINAPI GlobalAlloc16(
 
 /***********************************************************************
  *           GlobalReAlloc     (KERNEL.16)
- *           GlobalReAlloc16   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -578,7 +577,7 @@ DWORD WINAPI GlobalHandleNoRIP16( WORD sel )
 
 /***********************************************************************
  *           GlobalFlags     (KERNEL.22)
- *           GlobalFlags16   (KERNEL32.@)
+ *
  * NOTES
  *	Should this return GMEM_INVALID_HANDLE instead of 0 on invalid
  *	handle?
diff --git a/memory/selector.c b/memory/selector.c
index 38792528436cc1897b3093f5d5391b68624986c4..342bc664125962dc959780f6145f7822e61275f0 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -328,6 +328,10 @@ DWORD WINAPI WIN16_GetSelectorBase( WORD sel )
     DWORD base = GetSelectorBase( sel );
     return W32S_WINE2APP( base );
 }
+
+/***********************************************************************
+ *		GetSelectorBase
+ */
 DWORD WINAPI GetSelectorBase( WORD sel )
 {
     void *base = wine_ldt_copy.base[sel >> __AHSHIFT];
@@ -353,6 +357,10 @@ DWORD WINAPI WIN16_SetSelectorBase( WORD sel, DWORD base )
     SetSelectorBase( sel, W32S_APP2WINE( base ) );
     return sel;
 }
+
+/***********************************************************************
+ *		SetSelectorBase
+ */
 WORD WINAPI SetSelectorBase( WORD sel, DWORD base )
 {
     LDT_ENTRY entry;
diff --git a/objects/clipping.c b/objects/clipping.c
index bf88d3ace74bb81746d15b963fec5bc2ac953bb5..2513bbf69818b52c8359a643f1cf8846ef2d70db 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -118,7 +118,6 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
 
 /***********************************************************************
  *           SelectVisRgn   (GDI.105)
- *           SelectVisRgn16 (GDI32.@)
  */
 INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn )
 {
@@ -267,7 +266,6 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom
 
 /***********************************************************************
  *           ExcludeVisRect   (GDI.73)
- *           ExcludeVisRect16 (GDI32.@)
  */
 INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top,
                              INT16 right, INT16 bottom )
@@ -300,7 +298,6 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top,
 
 /***********************************************************************
  *           IntersectVisRect   (GDI.98)
- *           IntersectVisRect16 (GDI32.@)
  */
 INT16 WINAPI IntersectVisRect16( HDC16 hdc, INT16 left, INT16 top,
                                INT16 right, INT16 bottom )
@@ -414,7 +411,6 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn )
 
 /***********************************************************************
  *           SaveVisRgn   (GDI.129)
- *           SaveVisRgn16 (GDI32.@)
  */
 HRGN16 WINAPI SaveVisRgn16( HDC16 hdc )
 {
@@ -455,7 +451,6 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc )
 
 /***********************************************************************
  *           RestoreVisRgn   (GDI.130)
- *           RestoreVisRgn16 (GDI32.@)
  */
 INT16 WINAPI RestoreVisRgn16( HDC16 hdc )
 {
diff --git a/objects/dc.c b/objects/dc.c
index 213d4cb62b7766750d6bb899b56bcb14855519af..a67a026f622b200fe102005becfbdeef4e6e844b 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -268,7 +268,6 @@ void DC_UpdateXforms( DC *dc )
 
 /***********************************************************************
  *           GetDCState   (GDI.179)
- *           GetDCState16 (GDI32.@)
  */
 HDC16 WINAPI GetDCState16( HDC16 hdc )
 {
@@ -358,7 +357,6 @@ HDC16 WINAPI GetDCState16( HDC16 hdc )
 
 /***********************************************************************
  *           SetDCState   (GDI.180)
- *           SetDCState16 (GDI32.@)
  */
 void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs )
 {
@@ -901,7 +899,6 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp )
 
 /***********************************************************************
  *           SetDCOrg   (GDI.117)
- *           SetDCOrg16 (GDI32.@)
  */
 DWORD WINAPI SetDCOrg16( HDC16 hdc, INT16 x, INT16 y )
 {
@@ -1169,7 +1166,6 @@ DWORD WINAPI GetDCHook16( HDC16 hdc, FARPROC16 *phookProc )
 
 /***********************************************************************
  *           SetHookFlags   (GDI.192)
- *           SetHookFlags16 (GDI32.@)
  */
 WORD WINAPI SetHookFlags16(HDC16 hDC, WORD flags)
 {
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index eed2d2755f00dfaa728e5720490a7fdabcaefe92..be31f4c64889ee0692b80c7af9439fbbe85cd430 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -399,7 +399,6 @@ BOOL WINAPI GetWindowOrgEx( HDC hdc, LPPOINT pt )
 
 /***********************************************************************
  *		InquireVisRgn   (GDI.131)
- *              InquireVisRgn16 (GDI32.@)
  */
 HRGN16 WINAPI InquireVisRgn16( HDC16 hdc )
 {
diff --git a/objects/metafile.c b/objects/metafile.c
index 0abf40c7ed84ad6055022f947beaeb7947048d10..d8b8ea034ff11993a73327872029e578b82ce436 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -182,7 +182,6 @@ static BOOL16 MF_ReleaseMetaHeader16( HMETAFILE16 hmf )
 
 /******************************************************************
  *	     DeleteMetaFile   (GDI.127)
- *           DeleteMetaFile16 (GDI32.@)
  */
 BOOL16 WINAPI DeleteMetaFile16(  HMETAFILE16 hmf )
 {
diff --git a/objects/palette.c b/objects/palette.c
index 37ee6033ce25668d992e66a5044e639231e30673..238e7ad03248064a9e94fd7d957ff3f70e7bf533 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -732,7 +732,6 @@ UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc )
 
 /***********************************************************************
  *           IsDCCurrentPalette   (GDI.412)
- *           IsDCCurrentPalette16 (GDI32.@)
  */
 BOOL16 WINAPI IsDCCurrentPalette16(HDC16 hDC)
 {
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index e43af865575485c6046bb3b52e82a7c15bf05c70..b581de686f1cb50320d7321f51b1664b726e1dd5 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -1235,7 +1235,6 @@ HCURSOR16 WINAPI CopyCursor16( HINSTANCE16 hInstance, HCURSOR16 hCursor )
 
 /**********************************************************************
  *		DestroyIcon32 (USER.610)
- *		DestroyIcon32 (USER32.@)
  *
  * This routine is actually exported from Win95 USER under the name
  * DestroyIcon32 ...  The behaviour implemented here should mimic
diff --git a/windows/dialog.c b/windows/dialog.c
index 21a71a857121591c2515f0884287228c3ea88270..58bb38e70c3b48b4819cc3a124ac52b684ca307c 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -966,7 +966,6 @@ HWND16 WINAPI CreateDialogIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
 
 /***********************************************************************
  *		CreateDialogIndirectParam (USER.242)
- *		CreateDialogIndirectParam16 (USER32.@)
  */
 HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst,
                                            LPCVOID dlgTemplate,
@@ -1137,7 +1136,6 @@ INT16 WINAPI DialogBoxIndirect16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
 
 /***********************************************************************
  *		DialogBoxIndirectParam (USER.240)
- *		DialogBoxIndirectParam16 (USER32.@)
  */
 INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
                                        HWND16 owner16, DLGPROC16 dlgProc,
diff --git a/windows/driver.c b/windows/driver.c
index ff30f293b327b504f3a76c0487928ba5e9c265c7..6b572407533324b2e84e88d34682c038e70900fa 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -127,7 +127,6 @@ static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
 
 /**************************************************************************
  *		SendDriverMessage (USER.251)
- *		SendDriverMessage16 (USER32.@)
  */
 LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
                                    LPARAM lParam2)
@@ -267,7 +266,6 @@ static	LPWINE_DRIVER	DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam2)
 
 /**************************************************************************
  *		OpenDriver (USER.252)
- *		OpenDriver16 (USER32.@)
  */
 HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2)
 {
@@ -301,7 +299,6 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
 
 /**************************************************************************
  *		CloseDriver (USER.253)
- *		CloseDriver16 (USER32.@)
  */
 LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
 {
@@ -323,7 +320,6 @@ LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
 
 /**************************************************************************
  *		GetDriverModuleHandle (USER.254)
- *		GetDriverModuleHandle16 (USER32.@)
  */
 HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 {
@@ -341,7 +337,6 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 
 /**************************************************************************
  *		DefDriverProc (USER.255)
- *		DefDriverProc16 (USER32.@)
  */
 LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
                                LPARAM lParam1, LPARAM lParam2)
@@ -431,4 +426,3 @@ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
     TRACE("return %04x !\n", hRetDrv);
     return hRetDrv;
 }
-
diff --git a/windows/hook.c b/windows/hook.c
index cbce648217c3f078fd1a432f1dc4059f9627bddb..bc7bd0bfa646064e755a2f94a79c27b6e0283ce1 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -926,7 +926,6 @@ HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc )
 
 /***********************************************************************
  *		SetWindowsHookEx (USER.291)
- *		SetWindowsHookEx16 (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst,
                                  HTASK16 hTask )
@@ -1005,7 +1004,6 @@ BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
 
 /***********************************************************************
  *		CallNextHookEx (USER.293)
- *		CallNextHookEx16 (USER32.@)
  *
  * I wouldn't have separated this into 16 and 32 bit versions, but I
  * need a way to figure out if I need to do a mapping or not.
diff --git a/windows/message.c b/windows/message.c
index bcf022844f53c8178b88a402f86cc9e4515e2f0f..c1431dde5ca50caf32903513f72b03dee3bce3a5 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -798,7 +798,6 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut )
 
 /***********************************************************************
  *		UserYield (USER.332)
- *		UserYield16 (USER32.@)
  */
 void WINAPI UserYield16(void)
 {
diff --git a/windows/queue.c b/windows/queue.c
index cd320a0c0a684c1d6884f1aa5a170709db20fe34..83c2d3e459e9e9b13f04e204547abe08fe63dac2 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -457,7 +457,6 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
 
 /***********************************************************************
  *		InitThreadInput   (USER.409)
- *              InitThreadInput16 (USER32.@)
  */
 HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags )
 {
diff --git a/windows/winproc.c b/windows/winproc.c
index 4b8f8c3f238c672fad5040d6c157eda23a13801a..e841c0b6508d1c9029dd6496f4d213a3a520a71e 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -2707,7 +2707,6 @@ static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
 
 /**********************************************************************
  *		CallWindowProc (USER.122)
- *		CallWindowProc16 (USER32.@)
  */
 LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
                                  WPARAM16 wParam, LPARAM lParam )