diff --git a/debugger/dbg.y b/debugger/dbg.y
index 516c5058a8a..f4c38992422 100644
--- a/debugger/dbg.y
+++ b/debugger/dbg.y
@@ -15,9 +15,10 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include "wine/exception.h"
 #include "debugger.h"
 #include "expr.h"
-#include "wine/exception.h"
+#include "task.h"
 
 extern FILE * yyin;
 int curr_frame = 0;
diff --git a/debugger/memory.c b/debugger/memory.c
index 3a75dd39d4f..19466e5df7a 100644
--- a/debugger/memory.c
+++ b/debugger/memory.c
@@ -10,7 +10,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "debugger.h"
+#include "miscemu.h"
 #include "winbase.h"
 
 #ifdef __i386__
@@ -71,7 +73,7 @@ DWORD DEBUG_ToLinear( const DBG_ADDR *addr )
    LDT_ENTRY	le;
    
    if (IS_SELECTOR_V86(addr->seg))
-      return DOSMEM_MemoryBase(DBG_V86_MODULE(addr->seg)) + (((addr->seg)&0xFFFF)<<4) + addr->off;
+      return (DWORD) DOSMEM_MemoryBase(DBG_V86_MODULE(addr->seg)) + (((addr->seg)&0xFFFF)<<4) + addr->off;
    if (DEBUG_IsSelectorSystem(addr->seg))
       return addr->off;
    
diff --git a/dlls/crtdll/wcstring.c b/dlls/crtdll/wcstring.c
index b98a2c969f9..0b677c9fdd2 100644
--- a/dlls/crtdll/wcstring.c
+++ b/dlls/crtdll/wcstring.c
@@ -412,7 +412,7 @@ INT __cdecl CRTDLL_wctomb( LPSTR dst, WCHAR ch )
 /*********************************************************************
  *           CRTDLL_iswalnum    (CRTDLL.405)
  */
-int CRTDLL_iswalnum( WCHAR wc )
+INT __cdecl CRTDLL_iswalnum( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswalnum
@@ -425,7 +425,7 @@ int CRTDLL_iswalnum( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswalpha    (CRTDLL.406)
  */
-int CRTDLL_iswalpha( WCHAR wc )
+INT __cdecl CRTDLL_iswalpha( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswalpha
@@ -438,7 +438,7 @@ int CRTDLL_iswalpha( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswcntrl    (CRTDLL.408)
  */
-int CRTDLL_iswcntrl( WCHAR wc )
+INT __cdecl CRTDLL_iswcntrl( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswcntrl
@@ -451,7 +451,7 @@ int CRTDLL_iswcntrl( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswdigit    (CRTDLL.410)
  */
-int CRTDLL_iswdigit( WCHAR wc )
+INT __cdecl CRTDLL_iswdigit( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswdigit
@@ -464,7 +464,7 @@ int CRTDLL_iswdigit( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswgraph    (CRTDLL.411)
  */
-int CRTDLL_iswgraph( WCHAR wc )
+INT __cdecl CRTDLL_iswgraph( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswgraph
@@ -477,7 +477,7 @@ int CRTDLL_iswgraph( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswlower    (CRTDLL.412)
  */
-int CRTDLL_iswlower( WCHAR wc )
+INT __cdecl CRTDLL_iswlower( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswlower
@@ -490,7 +490,7 @@ int CRTDLL_iswlower( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswprint    (CRTDLL.413)
  */
-int CRTDLL_iswprint( WCHAR wc )
+INT __cdecl CRTDLL_iswprint( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswprint
@@ -503,7 +503,7 @@ int CRTDLL_iswprint( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswpunct    (CRTDLL.414)
  */
-int CRTDLL_iswpunct( WCHAR wc )
+INT __cdecl CRTDLL_iswpunct( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswpunct
@@ -516,7 +516,7 @@ int CRTDLL_iswpunct( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswspace    (CRTDLL.415)
  */
-int CRTDLL_iswspace( WCHAR wc )
+INT __cdecl CRTDLL_iswspace( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswspace
@@ -529,7 +529,7 @@ int CRTDLL_iswspace( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswupper    (CRTDLL.416)
  */
-int CRTDLL_iswupper( WCHAR wc )
+INT __cdecl CRTDLL_iswupper( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswupper
@@ -542,7 +542,7 @@ int CRTDLL_iswupper( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswxdigit    (CRTDLL.417)
  */
-int CRTDLL_iswxdigit( WCHAR wc )
+INT __cdecl CRTDLL_iswxdigit( WCHAR wc )
 {
 #ifdef HAVE_WCTYPE_H
 #undef iswxdigit
@@ -555,9 +555,9 @@ int CRTDLL_iswxdigit( WCHAR wc )
 /*********************************************************************
  *           CRTDLL_iswctype    (CRTDLL.409)
  */
-int CRTDLL_iswctype( WCHAR wc, WCHAR wct )
+INT __cdecl CRTDLL_iswctype( WCHAR wc, WCHAR wct )
 {
-    int res = 0;
+    INT res = 0;
 
     if (wct & 0x0001) res |= CRTDLL_iswupper(wc);
     if (wct & 0x0002) res |= CRTDLL_iswlower(wc);
diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index c4269ee64d1..99d50e314ec 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -45,6 +45,7 @@
  */
 
 #include <assert.h>
+
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
@@ -54,6 +55,8 @@
 #include "debugtools.h"
 #include "olestd.h"
 
+#include "storage32.h"
+
 #define HANDLE_ERROR(err) { hr = err; TRACE("(HRESULT=%lx)\n", (HRESULT)err); goto CLEANUP; }
 
 /* For CoGetMalloc (MEMCTX_TASK is currently ignored) */
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index a4fe7a9cfa4..6fd1eb72561 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -168,6 +168,13 @@ void           BIGBLOCKFILE_ReleaseBigBlock(LPBIGBLOCKFILE This, void *pBlock);
 void           BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize);
 ULARGE_INTEGER BIGBLOCKFILE_GetSize(LPBIGBLOCKFILE This);
 
+/*************************************************************************
+ * Ole Convert support
+ */
+
+void OLECONVERT_CreateOleStream(LPSTORAGE pStorage);
+HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName);
+
 /****************************************************************************
  * Storage32BaseImpl definitions.
  *
diff --git a/graphics/win16drv/init.c b/graphics/win16drv/init.c
index 3b1cdfbe913..412d535460f 100644
--- a/graphics/win16drv/init.c
+++ b/graphics/win16drv/init.c
@@ -5,8 +5,10 @@
  *           1998 Huw Davies
  */
 
-#include <string.h>
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "win16drv.h"
 #include "gdi.h"
 #include "bitmap.h"
diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c
index bb1cc0599b8..ffa0368209b 100644
--- a/graphics/x11drv/dib.c
+++ b/graphics/x11drv/dib.c
@@ -1701,7 +1701,7 @@ static void X11DRV_DIB_SetImageBits_24( int lines, const BYTE *srcbits,
 		if (bmpImage->bits_per_pixel == 24) {
 			int tocopy = linebytes;
 			BYTE *dstpixel;
-			BYTE *ptr = srcbits+left*3;
+			BYTE *ptr = (BYTE *)(srcbits+left*3);
 
 			if (tocopy < 0 ) tocopy = -tocopy;
 			dstpixel = bmpImage->data + lines*tocopy + left*3;
diff --git a/scheduler/sysdeps.c b/scheduler/sysdeps.c
index 559e4a9c633..a1aa3307381 100644
--- a/scheduler/sysdeps.c
+++ b/scheduler/sysdeps.c
@@ -210,6 +210,11 @@ void SYSDEPS_ExitThread( int status )
     _lwp_exit();
 #endif
     _exit( status );
+    /*
+     * It is of course impossible to come here,
+     * but it eliminates a compiler warning.
+     */
+    exit( status );
 }