diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index fc96bbcecf8..7ff00bef370 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -10,7 +10,8 @@
 
 DEFAULT_DEBUG_CHANNEL(setupapi);
 
-/*
+/***********************************************************************
+ *		DiGetClassDevs (SETUPX.304)
  * Return a list of installed system devices.
  * Uses HKLM\\ENUM to list devices.
  */
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index 6ddb0dededf..cdab986f804 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -575,7 +575,7 @@ void SETUPX_CreateStandardLDDs(void)
     if (hKey) RegCloseKey(hKey);
 }
 	
-/*
+/***********************************************************************
  * CtlDelLdd		(SETUPX.37)
  *
  * RETURN
@@ -616,13 +616,16 @@ RETERR16 SETUPX_DelLdd(LOGDISKID16 ldid)
     return OK;
 }
 
+/***********************************************************************
+ *		CtlDelLdd (SETUPX.37)
+ */
 RETERR16 WINAPI CtlDelLdd16(LOGDISKID16 ldid)
 {
     FIXME("(%d); - please report to a.mohr@mailto.de !!!\n", ldid);
     return SETUPX_DelLdd(ldid);
 }
 
-/*
+/***********************************************************************
  * CtlFindLdd		(SETUPX.35)
  *
  * doesn't check pldd ptr validity: crash (W98SE)
@@ -661,7 +664,7 @@ RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
     return 1; /* what is this ?? */
 }
 
-/*
+/***********************************************************************
  * CtlSetLdd			(SETUPX.33)
  *
  * Set an LDD entry.
@@ -733,7 +736,7 @@ RETERR16 WINAPI CtlSetLdd16(LPLOGDISKDESC pldd)
 }
 
 
-/*
+/***********************************************************************
  * CtlAddLdd		(SETUPX.36)
  *
  * doesn't check pldd ptr validity: crash (W98SE)
@@ -746,7 +749,7 @@ RETERR16 WINAPI CtlAddLdd16(LPLOGDISKDESC pldd)
     return CtlSetLdd16(pldd);
 }
 
-/*
+/***********************************************************************
  * CtlGetLdd		(SETUPX.34)
  *
  * doesn't check pldd ptr validity: crash (W98SE)
@@ -782,6 +785,8 @@ static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd)
     return OK;
 }
 
+/**********************************************************************/
+
 RETERR16 WINAPI CtlGetLdd16(LPLOGDISKDESC pldd)
 {
     FIXME("(%p); - please report to a.mohr@mailto.de !!!\n", pldd);
@@ -1054,7 +1059,7 @@ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef)
 }
 
 /***********************************************************************
- *		vcpClose
+ *		VcpClose
  *
  * Is fl related to VCPDISKINFO.fl ?
  */
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index c587981ceae..18113b5f239 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -910,6 +910,8 @@ static const CSIDL_DATA CSIDL_Data[] =
 #undef HKCU
 #undef HKLM
 
+/**********************************************************************/
+
 BOOL WINAPI SHGetSpecialFolderPathA (
 	HWND hwndOwner,
 	LPSTR szPath,
diff --git a/memory/environ.c b/memory/environ.c
index 508df1449c9..66301378414 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -485,7 +485,7 @@ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len )
 
 
 /***********************************************************************
- *           GetDOSEnvironment   (KERNEL.131)
+ *           GetDOSEnvironment16   (KERNEL.131)
  */
 SEGPTR WINAPI GetDOSEnvironment16(void)
 {