Fixed some issues found by winapi_check.

diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index 40b89a9..8598202 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -62,7 +62,7 @@
 }
 
 /******************************************************************
- *                  StartDocA  [GDI32.347]
+ *                  StartDocA  [GDI32.@]
  *
  * StartDoc calls the STARTDOC Escape with the input data pointing to DocName
  * and the output data (which is used as a second input parameter).pointing at
@@ -89,7 +89,7 @@
 }
 
 /*************************************************************************
- *                  StartDocW [GDI32.348]
+ *                  StartDocW [GDI32.@]
  * 
  */
 INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc)
@@ -128,7 +128,7 @@
 }
 
 /******************************************************************
- *                  EndDoc  [GDI32.76]
+ *                  EndDoc  [GDI32.@]
  *
  */
 INT WINAPI EndDoc(HDC hdc)
@@ -155,7 +155,7 @@
 }
 
 /******************************************************************
- *                  StartPage  [GDI32.349]
+ *                  StartPage  [GDI32.@]
  *
  */
 INT WINAPI StartPage(HDC hdc)
@@ -182,7 +182,7 @@
 }
 
 /******************************************************************
- *                  EndPage  [GDI32.77]
+ *                  EndPage  [GDI32.@]
  *
  */
 INT WINAPI EndPage(HDC hdc)
@@ -213,7 +213,7 @@
 }
 
 /******************************************************************************
- *                 AbortDoc  [GDI32.105]
+ *                 AbortDoc  [GDI32.@]
  */
 INT WINAPI AbortDoc(HDC hdc)
 {
@@ -269,7 +269,7 @@
 }
 
 /**********************************************************************
- *           SetAbortProc   (GDI32.301)
+ *           SetAbortProc   (GDI32.@)
  *
  */
 INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc)
diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c
index 7e6eaed..560a84d 100644
--- a/dlls/glu32/glu.c
+++ b/dlls/glu32/glu.c
@@ -1,225 +1,360 @@
 #include "winbase.h"
 
+/***********************************************************************
+ *		gluLookAt (GLU32.@)
+ */
 extern int gluLookAt(double arg0,double arg1,double arg2,double arg3,double arg4,double arg5,double arg6,double arg7,double arg8);
 int WINAPI wine_gluLookAt(double arg0,double arg1,double arg2,double arg3,double arg4,double arg5,double arg6,double arg7,double arg8) {
 	return gluLookAt(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
 }
 
+/***********************************************************************
+ *		gluOrtho2D (GLU32.@)
+ */
 extern int gluOrtho2D(double arg0,double arg1,double arg2,double arg3);
 int WINAPI wine_gluOrtho2D(double arg0,double arg1,double arg2,double arg3) {
 	return gluOrtho2D(arg0,arg1,arg2,arg3);
 }
 
+/***********************************************************************
+ *		gluPerspective (GLU32.@)
+ */
 extern int gluPerspective(double arg0,double arg1,double arg2,double arg3);
 int WINAPI wine_gluPerspective(double arg0,double arg1,double arg2,double arg3) {
 	return gluPerspective(arg0,arg1,arg2,arg3);
 }
 
+/***********************************************************************
+ *		gluPickMatrix (GLU32.@)
+ */
 extern int gluPickMatrix(double arg0,double arg1,double arg2,double arg3,void *arg4);
 int WINAPI wine_gluPickMatrix(double arg0,double arg1,double arg2,double arg3,void *arg4) {
 	return gluPickMatrix(arg0,arg1,arg2,arg3,arg4);
 }
 
+/***********************************************************************
+ *		gluProject (GLU32.@)
+ */
 extern int gluProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8);
 int WINAPI wine_gluProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8) {
 	return gluProject(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
 }
 
+/***********************************************************************
+ *		gluUnProject (GLU32.@)
+ */
 extern int gluUnProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8);
 int WINAPI wine_gluUnProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8) {
 	return gluUnProject(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
 }
 
+/***********************************************************************
+ *		gluErrorString (GLU32.@)
+ */
 extern int gluErrorString(int arg0);
 int WINAPI wine_gluErrorString(int arg0) {
 	return gluErrorString(arg0);
 }
 
+/***********************************************************************
+ *		gluScaleImage (GLU32.@)
+ */
 extern int gluScaleImage(int arg0,int arg1,int arg2,int arg3,void *arg4,int arg5,int arg6,int arg7,void *arg8);
 int WINAPI wine_gluScaleImage(int arg0,int arg1,int arg2,int arg3,void *arg4,int arg5,int arg6,int arg7,void *arg8) {
 	return gluScaleImage(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
 }
 
+/***********************************************************************
+ *		gluBuild1DMipmaps (GLU32.@)
+ */
 extern int gluBuild1DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,void *arg5);
 int WINAPI wine_gluBuild1DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,void *arg5) {
 	return gluBuild1DMipmaps(arg0,arg1,arg2,arg3,arg4,arg5);
 }
 
+/***********************************************************************
+ *		gluBuild2DMipmaps (GLU32.@)
+ */
 extern int gluBuild2DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,int arg5,void *arg6);
 int WINAPI wine_gluBuild2DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,int arg5,void *arg6) {
 	return gluBuild2DMipmaps(arg0,arg1,arg2,arg3,arg4,arg5,arg6);
 }
 
+/***********************************************************************
+ *		gluNewQuadric (GLU32.@)
+ */
 extern int gluNewQuadric();
 int WINAPI wine_gluNewQuadric() {
 	return gluNewQuadric();
 }
 
+/***********************************************************************
+ *		gluDeleteQuadric (GLU32.@)
+ */
 extern int gluDeleteQuadric(void *arg0);
 int WINAPI wine_gluDeleteQuadric(void *arg0) {
 	return gluDeleteQuadric(arg0);
 }
 
+/***********************************************************************
+ *		gluQuadricDrawStyle (GLU32.@)
+ */
 extern int gluQuadricDrawStyle(void *arg0,int arg1);
 int WINAPI wine_gluQuadricDrawStyle(void *arg0,int arg1) {
 	return gluQuadricDrawStyle(arg0,arg1);
 }
 
+/***********************************************************************
+ *		gluQuadricOrientation (GLU32.@)
+ */
 extern int gluQuadricOrientation(void *arg0,int arg1);
 int WINAPI wine_gluQuadricOrientation(void *arg0,int arg1) {
 	return gluQuadricOrientation(arg0,arg1);
 }
 
+/***********************************************************************
+ *		gluQuadricNormals (GLU32.@)
+ */
 extern int gluQuadricNormals(void *arg0,int arg1);
 int WINAPI wine_gluQuadricNormals(void *arg0,int arg1) {
 	return gluQuadricNormals(arg0,arg1);
 }
 
+/***********************************************************************
+ *		gluQuadricTexture (GLU32.@)
+ */
 extern int gluQuadricTexture(void *arg0,int arg1);
 int WINAPI wine_gluQuadricTexture(void *arg0,int arg1) {
 	return gluQuadricTexture(arg0,arg1);
 }
 
+/***********************************************************************
+ *		gluQuadricCallback (GLU32.@)
+ */
 extern int gluQuadricCallback(void *arg0,int arg1,void *arg2);
 int WINAPI wine_gluQuadricCallback(void *arg0,int arg1,void *arg2) {
 	return gluQuadricCallback(arg0,arg1,arg2);
 }
 
+/***********************************************************************
+ *		gluCylinder (GLU32.@)
+ */
 extern int gluCylinder(void *arg0,double arg1,double arg2,double arg3,int arg4,int arg5);
 int WINAPI wine_gluCylinder(void *arg0,double arg1,double arg2,double arg3,int arg4,int arg5) {
 	return gluCylinder(arg0,arg1,arg2,arg3,arg4,arg5);
 }
 
+/***********************************************************************
+ *		gluSphere (GLU32.@)
+ */
 extern int gluSphere(void *arg0,double arg1,int arg2,int arg3);
 int WINAPI wine_gluSphere(void *arg0,double arg1,int arg2,int arg3) {
 	return gluSphere(arg0,arg1,arg2,arg3);
 }
 
+/***********************************************************************
+ *		gluDisk (GLU32.@)
+ */
 extern int gluDisk(void *arg0,double arg1,double arg2,int arg3,int arg4);
 int WINAPI wine_gluDisk(void *arg0,double arg1,double arg2,int arg3,int arg4) {
 	return gluDisk(arg0,arg1,arg2,arg3,arg4);
 }
 
+/***********************************************************************
+ *		gluPartialDisk (GLU32.@)
+ */
 extern int gluPartialDisk(void *arg0,double arg1,double arg2,int arg3,int arg4,double arg5,double arg6);
 int WINAPI wine_gluPartialDisk(void *arg0,double arg1,double arg2,int arg3,int arg4,double arg5,double arg6) {
 	return gluPartialDisk(arg0,arg1,arg2,arg3,arg4,arg5,arg6);
 }
 
+/***********************************************************************
+ *		gluNewNurbsRenderer (GLU32.@)
+ */
 extern int gluNewNurbsRenderer();
 int WINAPI wine_gluNewNurbsRenderer() {
 	return gluNewNurbsRenderer();
 }
 
+/***********************************************************************
+ *		gluDeleteNurbsRenderer (GLU32.@)
+ */
 extern int gluDeleteNurbsRenderer(void *arg0);
 int WINAPI wine_gluDeleteNurbsRenderer(void *arg0) {
 	return gluDeleteNurbsRenderer(arg0);
 }
 
+/***********************************************************************
+ *		gluLoadSamplingMatrices (GLU32.@)
+ */
 extern int gluLoadSamplingMatrices(void *arg0,void *arg1,void *arg2,void *arg3);
 int WINAPI wine_gluLoadSamplingMatrices(void *arg0,void *arg1,void *arg2,void *arg3) {
 	return gluLoadSamplingMatrices(arg0,arg1,arg2,arg3);
 }
 
+/***********************************************************************
+ *		gluNurbsProperty (GLU32.@)
+ */
 extern int gluNurbsProperty(void *arg0,int arg1,int arg2);
 int WINAPI wine_gluNurbsProperty(void *arg0,int arg1,int arg2) {
 	return gluNurbsProperty(arg0,arg1,arg2);
 }
 
+/***********************************************************************
+ *		gluGetNurbsProperty (GLU32.@)
+ */
 extern int gluGetNurbsProperty(void *arg0,int arg1,void *arg2);
 int WINAPI wine_gluGetNurbsProperty(void *arg0,int arg1,void *arg2) {
 	return gluGetNurbsProperty(arg0,arg1,arg2);
 }
 
+/***********************************************************************
+ *		gluBeginCurve (GLU32.@)
+ */
 extern int gluBeginCurve(void *arg0);
 int WINAPI wine_gluBeginCurve(void *arg0) {
 	return gluBeginCurve(arg0);
 }
 
+/***********************************************************************
+ *		gluEndCurve (GLU32.@)
+ */
 extern int gluEndCurve(void *arg0);
 int WINAPI wine_gluEndCurve(void *arg0) {
 	return gluEndCurve(arg0);
 }
 
+/***********************************************************************
+ *		gluNurbsCurve (GLU32.@)
+ */
 extern int gluNurbsCurve(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6);
 int WINAPI wine_gluNurbsCurve(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6) {
 	return gluNurbsCurve(arg0,arg1,arg2,arg3,arg4,arg5,arg6);
 }
 
+/***********************************************************************
+ *		gluBeginSurface (GLU32.@)
+ */
 extern int gluBeginSurface(void *arg0);
 int WINAPI wine_gluBeginSurface(void *arg0) {
 	return gluBeginSurface(arg0);
 }
 
+/***********************************************************************
+ *		gluEndSurface (GLU32.@)
+ */
 extern int gluEndSurface(void *arg0);
 int WINAPI wine_gluEndSurface(void *arg0) {
 	return gluEndSurface(arg0);
 }
 
+/***********************************************************************
+ *		gluNurbsSurface (GLU32.@)
+ */
 extern int gluNurbsSurface(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6,void *arg7,int arg8,int arg9,int arg10);
 int WINAPI wine_gluNurbsSurface(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6,void *arg7,int arg8,int arg9,int arg10) {
 	return gluNurbsSurface(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
 }
 
+/***********************************************************************
+ *		gluBeginTrim (GLU32.@)
+ */
 extern int gluBeginTrim(void *arg0);
 int WINAPI wine_gluBeginTrim(void *arg0) {
 	return gluBeginTrim(arg0);
 }
 
+/***********************************************************************
+ *		gluEndTrim (GLU32.@)
+ */
 extern int gluEndTrim(void *arg0);
 int WINAPI wine_gluEndTrim(void *arg0) {
 	return gluEndTrim(arg0);
 }
 
+/***********************************************************************
+ *		gluPwlCurve (GLU32.@)
+ */
 extern int gluPwlCurve(void *arg0,int arg1,void *arg2,int arg3,int arg4);
 int WINAPI wine_gluPwlCurve(void *arg0,int arg1,void *arg2,int arg3,int arg4) {
 	return gluPwlCurve(arg0,arg1,arg2,arg3,arg4);
 }
 
+/***********************************************************************
+ *		gluNurbsCallback (GLU32.@)
+ */
 extern int gluNurbsCallback(void *arg0,int arg1,void *arg2);
 int WINAPI wine_gluNurbsCallback(void *arg0,int arg1,void *arg2) {
 	return gluNurbsCallback(arg0,arg1,arg2);
 }
 
+/***********************************************************************
+ *		gluNewTess (GLU32.@)
+ */
 extern int gluNewTess();
 int WINAPI wine_gluNewTess() {
 	return gluNewTess();
 }
 
+/***********************************************************************
+ *		gluDeleteTess (GLU32.@)
+ */
 extern int gluDeleteTess(void *arg0);
 int WINAPI wine_gluDeleteTess(void *arg0) {
 	return gluDeleteTess(arg0);
 }
 
+/***********************************************************************
+ *		gluTessVertex (GLU32.@)
+ */
 extern int gluTessVertex(void *arg0,void *arg1,void *arg2);
 int WINAPI wine_gluTessVertex(void *arg0,void *arg1,void *arg2) {
 	return gluTessVertex(arg0,arg1,arg2);
 }
 
+/***********************************************************************
+ *		gluTessCallback (GLU32.@)
+ */
 extern int gluTessCallback(void *arg0,int arg1,void *arg2);
 int WINAPI wine_gluTessCallback(void *arg0,int arg1,void *arg2) {
 	return gluTessCallback(arg0,arg1,arg2);
 }
 
+/***********************************************************************
+ *		gluBeginPolygon (GLU32.@)
+ */
 extern int gluBeginPolygon(void *arg0);
 int WINAPI wine_gluBeginPolygon(void *arg0) {
 	return gluBeginPolygon(arg0);
 }
 
+/***********************************************************************
+ *		gluEndPolygon (GLU32.@)
+ */
 extern int gluEndPolygon(void *arg0);
 int WINAPI wine_gluEndPolygon(void *arg0) {
 	return gluEndPolygon(arg0);
 }
 
+/***********************************************************************
+ *		gluNextContour (GLU32.@)
+ */
 extern int gluNextContour(void *arg0,int arg1);
 int WINAPI wine_gluNextContour(void *arg0,int arg1) {
 	return gluNextContour(arg0,arg1);
 }
 
+/***********************************************************************
+ *		gluGetString (GLU32.@)
+ */
 extern int gluGetString(int arg0);
 int WINAPI wine_gluGetString(int arg0) {
 	return gluGetString(arg0);
 }
 
+/***********************************************************************
+ *		gluCheckExtension (GLU32.@)
+ */
 int WINAPI
 wine_gluCheckExtension( const char *extName, void *extString ) {
     return 0;
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index ce6f427..4a2663f 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -442,9 +442,9 @@
 @ varargs _snprintf(str long str) snprintf
 @ forward -noimport _snwprintf ntdll._snwprintf
 @ cdecl _sopen(str long long) MSVCRT__sopen
-@ varargs _spawnl(str str) _spawnl
+@ varargs _spawnl(long str str) _spawnl
 @ stub _spawnle #(str str) varargs
-@ varargs _spawnlp(str str) _spawnlp
+@ varargs _spawnlp(long str str) _spawnlp
 @ stub _spawnlpe #(str str) varargs
 @ cdecl _spawnv(long str ptr) _spawnv
 @ cdecl _spawnve(long str ptr ptr) _spawnve
diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index 2861d57..33ea111 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -34,7 +34,7 @@
 LRESULT MSVIDEO_SendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2, BOOL bFrom32);
 
 /***********************************************************************
- *		VideoForWindowsVersion		[MSVFW.2][MSVIDEO.2]
+ *		VideoForWindowsVersion		[MSVFW32.2][MSVIDEO.2]
  * Returns the version in major.minor form.
  * In Windows95 this returns 0x040003b6 (4.950)
  */
@@ -115,7 +115,7 @@
 /* system.ini: [drivers] */
 
 /***********************************************************************
- *		ICInfo				[MSVFW.33]
+ *		ICInfo				[MSVFW32.33]
  * Get information about an installable compressor. Return TRUE if there
  * is one.
  */
@@ -170,7 +170,7 @@
 }
 
 /***********************************************************************
- *		ICOpen				[MSVFW.37]
+ *		ICOpen				[MSVFW32.37]
  * Opens an installable compressor. Return special handle.
  */
 HIC VFWAPI ICOpen(DWORD fccType,DWORD fccHandler,UINT wMode) {
@@ -264,7 +264,7 @@
 }
 
 /***********************************************************************
- *		ICOpenFunction			[MSVFW.38]
+ *		ICOpenFunction			[MSVFW32.38]
  */
 HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler) {
 	return MSVIDEO_OpenFunc(fccType,fccHandler,wMode,lpfnHandler,TRUE);
@@ -286,7 +286,7 @@
 }
 
 /***********************************************************************
- *		ICGetInfo			[MSVFW.30]
+ *		ICGetInfo			[MSVFW32.30]
  */
 LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) {
 	LRESULT		ret;
@@ -310,7 +310,7 @@
 }
 
 /***********************************************************************
- *		ICLocate			[MSVFW.35]
+ *		ICLocate			[MSVFW32.35]
  */
 HIC VFWAPI ICLocate(
 	DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn,
@@ -400,7 +400,7 @@
 }
 
 /***********************************************************************
- *		ICGetDisplayFormat			[MSVFW.29]
+ *		ICGetDisplayFormat			[MSVFW32.29]
  */
 HIC VFWAPI ICGetDisplayFormat(
 	HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut,
@@ -462,7 +462,7 @@
 }
 
 /***********************************************************************
- *		ICCompress			[MSVFW.23]
+ *		ICCompress			[MSVFW32.23]
  */
 DWORD VFWAPIV
 ICCompress(
@@ -525,7 +525,7 @@
 }
 
 /***********************************************************************
- *		ICDecompress			[MSVFW.26]
+ *		ICDecompress			[MSVFW32.26]
  */
 DWORD VFWAPIV  ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,
 				LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits)
@@ -972,7 +972,7 @@
 }
 
 /***********************************************************************
- *		ICSendMessage			[MSVFW.40]
+ *		ICSendMessage			[MSVFW32.40]
  */
 LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2) {
 	return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,TRUE);
@@ -1019,7 +1019,7 @@
 }
 
 /***********************************************************************
- *		ICDrawBegin		[MSVFW.28]
+ *		ICDrawBegin		[MSVFW32.28]
  */
 DWORD VFWAPIV ICDrawBegin(
 	HIC                hic,     /* [in] */
@@ -1114,7 +1114,7 @@
 }
 
 /***********************************************************************
- *		ICDraw			[MSVFW.27]
+ *		ICDraw			[MSVFW32.27]
  */
 DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWORD cbData, LONG lTime) {
 	ICDRAW	icd;
@@ -1154,7 +1154,7 @@
 }
 
 /***********************************************************************
- *		ICClose			[MSVFW.22]
+ *		ICClose			[MSVFW32.22]
  */
 LRESULT WINAPI ICClose(HIC hic) {
 	WINE_HIC *whic = GlobalLock16(hic);
@@ -1180,7 +1180,7 @@
 }
 
 /***********************************************************************
- *		MCIWndCreateA		[MSVFW.44 & MSVFW.45]
+ *		MCIWndCreateA		[MSVFW32.44][MSVFW32.45]
  */
 HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance,
                       DWORD dwStyle,LPCSTR szFile)
@@ -1190,7 +1190,7 @@
 }
 
 /***********************************************************************
- *		MCIWndCreateW		[MSVFW.46]
+ *		MCIWndCreateW		[MSVFW32.46]
  */
 HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
                       DWORD dwStyle,LPCWSTR szFile)
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 2a696b4..065385a 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -619,7 +619,7 @@
 }
 
 /******************************************************************************
- *        CreateAntiMoniker	[OLE.55]
+ *        CreateAntiMoniker	[OLE32.55]
  ******************************************************************************/
 HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk)
 {
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index a7cdfe7..c4ac82b 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -1719,7 +1719,7 @@
     return S_OK;
 }
 /***********************************************************************
- *           CoSetState [COM32.42]
+ *           CoSetState [OLE32.42]
  */
 HRESULT WINAPI CoSetState(LPDWORD state)
 {
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index 47f9e6b..b7dd697 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -1644,7 +1644,7 @@
 }
 
 /******************************************************************************
- *        CreateGenericComposite	[OLE.55]
+ *        CreateGenericComposite	[OLE32.55]
  ******************************************************************************/
 HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite)
 {
@@ -1693,7 +1693,7 @@
 }
 
 /******************************************************************************
- *        MonikerCommonPrefixWith	[OLE.55]
+ *        MonikerCommonPrefixWith	[OLE32.55]
  ******************************************************************************/
 HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon)
 {
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index f091b7a..04f2d80 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -951,7 +951,7 @@
 }
 
 /******************************************************************************
- *        CreateItemMoniker	[OLE.55]
+ *        CreateItemMoniker	[OLE32.55]
  ******************************************************************************/
 HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim,LPCOLESTR  lpszItem, LPMONIKER * ppmk)
 {
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index dd46da5..ba163b0 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -457,8 +457,8 @@
  */
 HRESULT WINAPI SHLWAPI_219 (
 	LPVOID w, /* [???] NOTE: returned by LocalAlloc, 0x450 bytes, iface */
-	LPVOID x,
-	REFIID riid, /* e.g. IWebBrowser2 */
+	LPVOID x, /* [???] */
+	REFIID riid, /* [???] e.g. IWebBrowser2 */
 	LPWSTR z) /* [???] NOTE: OUT: path */
 {
 	FIXME("(%p %s %s %p)stub\n",w,debugstr_a(x),debugstr_guid(riid),z);
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c
index dac041a..081aef5 100644
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -438,7 +438,7 @@
 }
 
 /*************************************************************************
- * PathStripPathA	[SHELLWAPI.@]
+ * PathStripPathA	[SHLWAPI.@]
  * 
  * NOTES
  *  removes the path from the beginning of a filename
@@ -454,7 +454,7 @@
 }
 
 /*************************************************************************
- * PathStripPathW	[SHELLWAPI.@]
+ * PathStripPathW	[SHLWAPI.@]
  */
 void WINAPI PathStripPathW(LPWSTR lpszPath)
 {
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 2d3ccc4..8ee2e26 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -115,7 +115,7 @@
 }
 
 /*************************************************************************
- *      SHRegQueryUSValueA	[SHLWAPI]
+ *      SHRegQueryUSValueA	[SHLWAPI.@]
  */
 LONG WINAPI SHRegQueryUSValueA(
 	HKEY hUSKey,             /* [in] FIXME: HUSKEY */
@@ -132,7 +132,7 @@
 }
 
 /*************************************************************************
- *      SHRegQueryUSValueA	[SHLWAPI]
+ *      SHRegQueryUSValueW	[SHLWAPI.@]
  */
 LONG WINAPI SHRegQueryUSValueW(
 	HKEY hUSKey,             /* [in] FIXME: HUSKEY */
diff --git a/dlls/wineps/afm.c b/dlls/wineps/afm.c
index fbe6a39..1b4d6e3 100644
--- a/dlls/wineps/afm.c
+++ b/dlls/wineps/afm.c
@@ -6,12 +6,16 @@
  * 
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h> 	/* qsort() & bsearch() */
 #include <stdio.h>
 #include <dirent.h>
 #include <limits.h> 	/* INT_MIN */
-#include <float.h>  	/* FLT_MAX */
+#ifdef HAVE_FLOAT_H
+# include <float.h>  	/* FLT_MAX */
+#endif
 #include "winnt.h"  	/* HEAP_ZERO_MEMORY */
 #include "psdrv.h"
 #include "options.h"
diff --git a/dlls/wineps/init.c b/dlls/wineps/init.c
index 00cdbad..6310472 100644
--- a/dlls/wineps/init.c
+++ b/dlls/wineps/init.c
@@ -6,6 +6,8 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <unistd.h>
 
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index fd986f2..f9c9b35 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -1419,7 +1419,7 @@
 }
 
 /**************************************************************************
- * 				auxGetVolume		[WINM.23]
+ * 				auxGetVolume		[WINMM.23]
  */
 UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume)
 {
@@ -2117,7 +2117,7 @@
 }
 
 /**************************************************************************
- * 				midiOutOpen    		[WINM.84]
+ * 				midiOutOpen    		[WINMM.84]
  */
 UINT WINAPI midiOutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID,
 			DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
@@ -2324,7 +2324,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetVolume	[WINM.81]
+ * 				midiOutGetVolume	[WINMM.81]
  */
 UINT WINAPI midiOutGetVolume(UINT uDeviceID, DWORD* lpdwVolume)
 {
diff --git a/graphics/driver.c b/graphics/driver.c
index 8d58616..3ace2b9 100644
--- a/graphics/driver.c
+++ b/graphics/driver.c
@@ -129,7 +129,7 @@
 }
     
 /*****************************************************************************
- *      GDI_CallDevInstall16   [GDI32.100]
+ *      @ [GDI32.100]
  *
  * This should thunk to 16-bit and simply call the proc with the given args.
  */
@@ -142,7 +142,7 @@
 }
 
 /*****************************************************************************
- *      GDI_CallExtDeviceModePropSheet16   [GDI32.101]
+ *      @ [GDI32.101]
  *
  * This should load the correct driver for lpszDevice and calls this driver's
  * ExtDeviceModePropSheet proc. 
@@ -167,7 +167,7 @@
 }
 
 /*****************************************************************************
- *      GDI_CallExtDeviceMode16   [GDI32.102]
+ *      @ [GDI32.102]
  *
  * This should load the correct driver for lpszDevice and calls this driver's
  * ExtDeviceMode proc.
@@ -192,7 +192,7 @@
 }
 
 /****************************************************************************
- *      GDI_CallAdvancedSetupDialog16     [GDI32.103]
+ *      @ [GDI32.103]
  *
  * This should load the correct driver for lpszDevice and calls this driver's
  * AdvancedSetupDialog proc.
@@ -206,7 +206,7 @@
 }
 
 /*****************************************************************************
- *      GDI_CallDeviceCapabilities16      [GDI32.104]
+ *      @ [GDI32.104]
  *
  * This should load the correct driver for lpszDevice and calls this driver's
  * DeviceCapabilities proc.
diff --git a/misc/cpu.c b/misc/cpu.c
index 6063a2c..227f7f4 100644
--- a/misc/cpu.c
+++ b/misc/cpu.c
@@ -21,7 +21,7 @@
 static BYTE PF[64] = {0,};
 
 /***********************************************************************
- * 			GetSystemInfo            	[KERNELL32.404]
+ * 			GetSystemInfo            	[KERNEL32.404]
  *
  * Gets the current system information.
  *
@@ -220,7 +220,7 @@
 
 
 /***********************************************************************
- * 			IsProcessorFeaturePresent	[KERNELL32.880]
+ * 			IsProcessorFeaturePresent	[KERNEL32.880]
  * RETURNS:
  *	TRUE if processorfeature present
  *	FALSE otherwise