diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 73db66ada72..e0c4c07814f 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -77,9 +77,8 @@ static DWORD SH_get_instance(REFCLSID clsid,LPSTR dllname,LPVOID unknownouter,RE
 	}
 
 	hres = (*dllgetclassob)(clsid,(REFIID)&IID_IClassFactory,&classfac);
-	if (hres<0 || (hres>=0x80000000))
-	{ return hres;
-	}
+	if ((hres<0) || (hres>=0x80000000))
+	    return hres;
 	if (!classfac)
 	{ FIXME(shell,"no classfactory, but hres is 0x%ld!\n",hres);
 	  return E_FAIL;
@@ -137,7 +136,7 @@ LRESULT WINAPI SHCoCreateInstance(LPSTR aclsid,CLSID *clsid,LPUNKNOWN unknownout
 	TRACE(shell, "Threading model is %s\n",tmodel);
 
 	hres=SH_get_instance(clsid,path,unknownouter,refiid,inst);
-	if (hres<0)
+	if (hres<0 || (hres>0x80000000))
 	{ hres=SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst);
 	}
 	RegCloseKey(inprockey);
diff --git a/include/callback.h b/include/callback.h
index e03d86a7084..e065ee13816 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -10,7 +10,7 @@
 #include "wintypes.h"
 #include "winnt.h"
 
-extern int (*IF1632_CallLargeStack)( int (*func)(), void *arg );
+extern int (*IF1632_CallLargeStack)( int (*func)(void), void *arg );
 
 #define CALL_LARGE_STACK(func,arg) \
     (IF1632_CallLargeStack ? \
diff --git a/include/interfaces.h b/include/interfaces.h
index 32c84354fa6..3ee23bda8cf 100644
--- a/include/interfaces.h
+++ b/include/interfaces.h
@@ -103,9 +103,9 @@ struct IMalloc16 {
 
 /* private prototypes for the constructors */
 #ifdef __WINE__
-LPUNKNOWN	IUnknown_Constructor();
-LPMALLOC16	IMalloc16_Constructor();
-LPMALLOC32	IMalloc32_Constructor();
+LPUNKNOWN	IUnknown_Constructor(void);
+LPMALLOC16	IMalloc16_Constructor(void);
+LPMALLOC32	IMalloc32_Constructor(void);
 #endif
 
 HRESULT WINAPI CoGetMalloc32(DWORD, LPMALLOC32*);
diff --git a/include/shell.h b/include/shell.h
index f4fd676d8c2..f11cc87e75e 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -15,9 +15,9 @@
 /****************************************************************************
 * shell 16
 */
-extern void SHELL_LoadRegistry();
-extern void SHELL_SaveRegistry();
-extern void SHELL_Init();
+extern void SHELL_LoadRegistry(void);
+extern void SHELL_SaveRegistry(void);
+extern void SHELL_Init(void);
 
 /* global functions used from shell32 */
 extern HINSTANCE32 SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);
diff --git a/include/winreg.h b/include/winreg.h
index b594c4a03d6..7f894b8bdda 100644
--- a/include/winreg.h
+++ b/include/winreg.h
@@ -88,7 +88,7 @@
 				 KEY_CREATE_LINK	\
 				)
 
-void SHELL_Init();
-void SHELL_SaveRegistry();
-void SHELL_LoadRegistry();
+void SHELL_Init(void);
+void SHELL_SaveRegistry(void);
+void SHELL_LoadRegistry(void);
 #endif  /* __WINE_WINREG_H */
diff --git a/relay32/user32.spec b/relay32/user32.spec
index 9e8788b539b..b8de44d88f1 100644
--- a/relay32/user32.spec
+++ b/relay32/user32.spec
@@ -612,5 +612,5 @@ type	win32
 608 stdcall GetMonitorInfoW(long ptr) GetMonitorInfo32W
 609 stdcall MonitorFromWindow(long long) MonitorFromPoint
 610 stdcall MonitorFromRect(ptr long) MonitorFromRect
-611 stdcall MonitorFromPoint(ptr long) MonitorFromPoint
+611 stdcall MonitorFromPoint(long long long) MonitorFromPoint
 612 stdcall EnumDisplayMonitors(long ptr ptr long) EnumDisplayMonitors
diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c
index 9337127ded1..8f88c07b260 100644
--- a/tools/fnt2bdf.c
+++ b/tools/fnt2bdf.c
@@ -46,7 +46,7 @@ static char*    errorEmpty = "No fonts found.\n";
 
 /* info */
 
-void usage()
+void usage(void)
 {
     printf("Usage: fnt2bdf [-t] [-c charset] [-o basename] [input file]\n");
     printf("  -c charset\tcharset name for OEM_CHARSET fonts\n");