diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 60ced975e5b..252fd40629d 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -4,11 +4,17 @@
  * Copyright 1998 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <string.h>
+
+#include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "wine/unicode.h"
+
 #include "wine/server.h"
+#include "wine/unicode.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win32);
diff --git a/dlls/msvideo/vfw16.h b/dlls/msvideo/vfw16.h
index 861ad41c2a7..ca4ca18831e 100644
--- a/dlls/msvideo/vfw16.h
+++ b/dlls/msvideo/vfw16.h
@@ -65,11 +65,6 @@ typedef struct {
 
 #include "poppack.h"
 
-
-LRESULT VFWAPI	ICSendMessage16(HIC16 hic, UINT16 msg, DWORD dw1, DWORD dw2);
-HIC16   VFWAPI	ICOpen16(DWORD fccType, DWORD fccHangler, UINT16 wMode);
-HIC16	VFWAPI	ICLocate16(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags);
-
 typedef struct {
 	DWORD dwFlags;
 	LPBITMAPINFOHEADER lpbiIn;
@@ -81,24 +76,28 @@ typedef struct {
 	HIC16 hicDecompressor;
 } ICDRAWSUGGEST16;
 
-DWORD	VFWAPIV	ICDrawBegin16(
-        HIC16			hic,
-        DWORD			dwFlags,/* flags */
-        HPALETTE16		hpal,	/* palette to draw with */
-        HWND16			hwnd,	/* window to draw to */
-        HDC16			hdc,	/* HDC to draw to */
-	INT16			xDst,	/* destination rectangle */
-        INT16			yDst,
-        INT16			dxDst,
-        INT16			dyDst,
-        LPBITMAPINFOHEADER	lpbi,	/* format of frame to draw */
-        INT16			xSrc,	/* source rectangle */
-        INT16			ySrc,
-        INT16			dxSrc,
-        INT16			dySrc,
-        DWORD			dwRate,	/* frames/second = (dwRate/dwScale) */
-        DWORD			dwScale
-);
+DWORD   VFWAPIV ICDraw16(HIC16,DWORD,LPVOID,LPVOID,DWORD,LONG);
+DWORD   VFWAPIV ICDrawBegin16(HIC16,DWORD,HPALETTE16,HWND16,HDC16,INT16,
+                              INT16,INT16,INT16,LPBITMAPINFOHEADER,
+                              INT16,INT16,INT16,INT16,DWORD,DWORD);
+LRESULT WINAPI  ICClose16(HIC16);
+DWORD   VFWAPIV ICCompress16(HIC16,DWORD,LPBITMAPINFOHEADER,LPVOID,
+                             LPBITMAPINFOHEADER,LPVOID,LPDWORD,
+                             LPDWORD,LONG,DWORD,DWORD,
+                             LPBITMAPINFOHEADER,LPVOID);
+DWORD   VFWAPIV ICDecompress16(HIC16,DWORD,LPBITMAPINFOHEADER,LPVOID,
+                               LPBITMAPINFOHEADER,LPVOID);
+HIC16   VFWAPI  ICGetDisplayFormat16(HIC16,LPBITMAPINFOHEADER,
+                                     LPBITMAPINFOHEADER,INT16,INT16,
+                                     INT16);
+LRESULT VFWAPI  ICGetInfo16(HIC16,ICINFO16 *,DWORD);
+BOOL16  VFWAPI  ICInfo16(DWORD,DWORD,ICINFO16 *);
+HIC16   VFWAPI  ICLocate16(DWORD,DWORD,LPBITMAPINFOHEADER,
+                           LPBITMAPINFOHEADER,WORD);
+LRESULT VFWAPIV ICMessage16(void);
+HIC16   VFWAPI  ICOpen16(DWORD,DWORD,UINT16);
+HIC16   VFWAPI  ICOpenFunction16(DWORD,DWORD,UINT16,FARPROC16);
+LRESULT VFWAPI  ICSendMessage16(HIC16,UINT16,DWORD,DWORD);
 
 #ifdef __cplusplus
 }
diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c
index 45d5cbddeaa..fcb636249ea 100644
--- a/dlls/ntdll/signal_sparc.c
+++ b/dlls/ntdll/signal_sparc.c
@@ -12,14 +12,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-
 #include <sys/ucontext.h>
 
-#include "wine/exception.h"
-#include "winnt.h"
+#include "ntddk.h"
 #include "winbase.h"
+#include "winnt.h"
+
+#include "wine/exception.h"
 #include "global.h"
 #include "stackframe.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(seh);
diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index e22057d5def..6dce952b197 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -12,6 +12,6 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize();
 HRESULT WINAPI RunningObjectTableImpl_UnInitialize();
 
 /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */
-int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** stringTable);
+int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable);
 
 #endif /* __WINE_OLE_COMPOBJ_H */
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index 7a619e5133b..1e201128eff 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -9,16 +9,19 @@
  */
 
 #include <string.h>
-#include "debugtools.h"
+
 #include "windef.h"
-#include "heap.h"
+#include "oleauto.h"
 #include "winerror.h"
-#include "thread.h"
-#include "debugtools.h"
+
 #include "wine/obj_base.h"
 #include "wine/obj_oleaut.h"
 #include "wine/obj_errorinfo.h"
 #include "wine/unicode.h"
+#include "heap.h"
+#include "thread.h"
+
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
 
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 53a3e6691d1..a248cbe0e30 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -84,7 +84,7 @@ static HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
 /* Local function used by filemoniker implementation */
 HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName);
 HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* iface);
-int     WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** tabStr);
+int     WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** tabStr);
 
 
 /********************************************************************************/
@@ -1068,7 +1068,7 @@ HRESULT WINAPI FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOth
 /******************************************************************************
  *        DecomposePath (local function)
  ******************************************************************************/
-int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** stringTable)
+int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable)
 {
     WCHAR bSlash[] = {'\\',0};
     WCHAR word[MAX_PATH];
diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c
index 9d68ecbb33a..7041ca23796 100644
--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
@@ -6,16 +6,21 @@
  *
  * Copyright 1999 Francis Beaudet
  */
+
+#include "config.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "windef.h"
+#include "objbase.h"
+#include "ole2.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "debugtools.h"
 
-#include "objbase.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(storage);
 
diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c
index 97e781f5ae7..0d28dbceefd 100644
--- a/dlls/ole32/memlockbytes.c
+++ b/dlls/ole32/memlockbytes.c
@@ -6,10 +6,15 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
+
+#include "windef.h"
+#include "objbase.h"
+#include "ole2.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "objbase.h"
 
 #include "debugtools.h"
 
diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c
index 20acaffcf26..c309d1e8c1a 100644
--- a/dlls/ole32/ole2nls.c
+++ b/dlls/ole32/ole2nls.c
@@ -5,6 +5,9 @@
  *      Copyright 1998  David Lee Lambert
  *      Copyright 2000  Julio César Gázquez
  */
+
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -13,14 +16,16 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winerror.h"
 #include "wingdi.h"
-#include "winuser.h"
-#include "wine/windef16.h"
-#include "heap.h"
-#include "winver.h"
 #include "winnls.h"
 #include "winreg.h"
-#include "winerror.h"
+#include "winuser.h"
+#include "winver.h"
+
+#include "wine/winbase16.h"
+#include "heap.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index 86d08fc46f0..a15c5f4701a 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -8,16 +8,23 @@
  * TODO: Type coercion is implemented in variant.c but not called yet.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
+
+#include "windef.h"
+#include "ole.h"
+#include "oleauto.h"
 #include "winerror.h"
 #include "winreg.h"         /* for HKEY_LOCAL_MACHINE */
 #include "winnls.h"         /* for PRIMARYLANGID */
-#include "ole.h"
-#include "heap.h"
+
 #include "wine/obj_oleaut.h"
+#include "heap.h"
+
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 66d7e3efbb2..20669072838 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -3,22 +3,28 @@
  *
  *  1998 Marcus Meissner
  */
+
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
-#include "windef.h"
-#include "wingdi.h"
-#include "wine/winuser16.h"
-#include "wine/winbase16.h"
-#include "wine/shell16.h"
-#include "winerror.h"
+
 #include "dlgs.h"
 #include "shellapi.h"
 #include "shlobj.h"
-#include "debugtools.h"
-#include "winreg.h"
 #include "shlwapi.h"
+#include "windef.h"
+#include "winerror.h"
+#include "winreg.h"
+
+#include "wine/shell16.h"
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
+#include "shell32_main.h"
+
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 DECLARE_DEBUG_CHANNEL(exec);
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 56f339af0d1..f2d32fbd4fe 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -4,28 +4,31 @@
  *  1998 Marcus Meissner
  *  1998 Juergen Schmied (jsch)  *  <juergen.schmied@metronet.de>
  */
+
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
-#include "windef.h"
-#include "wingdi.h"
-#include "wine/winuser16.h"
-#include "winerror.h"
-#include "heap.h"
 #include "dlgs.h"
-#include "debugtools.h"
-#include "winreg.h"
-#include "authors.h"
-
 #include "shellapi.h"
-#include "pidl.h"
-
-#include "shell32_main.h"
-#include "wine/undocshell.h"
 #include "shlobj.h"
 #include "shlguid.h"
 #include "shlwapi.h"
+#include "windef.h"
+#include "winerror.h"
+#include "winreg.h"
+
+#include "wine/shell16.h"
+#include "wine/undocshell.h"
+#include "wine/winuser16.h"
+#include "authors.h"
+#include "heap.h"
+#include "pidl.h"
+#include "shell32_main.h"
+
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 2eb3e3403f3..132ce38d648 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -6,22 +6,26 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "shlobj.h"
 #include "shellapi.h"
+#include "shlobj.h"
 #include "shlguid.h"
 #include "winreg.h"
-#include "wine/unicode.h"
 #include "winerror.h"
-#include "debugtools.h"
 
+#include "wine/undocshell.h"
+#include "wine/unicode.h"
 #include "shell32_main.h"
 
+#include "debugtools.h"
+
 DEFAULT_DEBUG_CHANNEL(shell);
 
-DWORD WINAPI SHCLSIDFromStringA (LPSTR clsid, CLSID *id);
+DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id);
 extern IShellFolder * IShellFolder_Constructor(
 	IShellFolder * psf,
 	LPITEMIDLIST pidl);
@@ -37,9 +41,9 @@ extern HRESULT IFSFolder_Constructor(
  *     exported by ordinal
  */
 LRESULT WINAPI SHCoCreateInstance(
-	LPSTR aclsid,
+	LPCSTR aclsid,
 	REFCLSID clsid,
-	IUnknown * unknownouter,
+	LPUNKNOWN unknownouter,
 	REFIID refiid,
 	LPVOID *ppv)
 {
@@ -114,7 +118,7 @@ HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv
  * NOTES
  *     exported by ordinal
  */
-DWORD WINAPI SHCLSIDFromStringA (LPSTR clsid, CLSID *id)
+DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id)
 {
     WCHAR buffer[40];
     TRACE("(%p(%s) %p)\n", clsid, clsid, id);
@@ -489,7 +493,7 @@ HRESULT WINAPI SHCreateDefClassObject(
 	REFIID	riid,				
 	LPVOID*	ppv,	
 	LPFNCREATEINSTANCE lpfnCI,	/* [in] create instance callback entry */
-	PLONG	pcRefDll,		/* [in/out] ref count of the dll */
+	LPDWORD	pcRefDll,		/* [in/out] ref count of the dll */
 	REFIID	riidInst)		/* [in] optional interface to the instance */
 {
 	TRACE("\n\tIID:\t%s %p %p %p \n\tIIDIns:\t%s\n",
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index a1e46f3cdc9..2252cfc00d6 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -1,17 +1,23 @@
 /*
 	Shell Registry Access
 */
+
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
-#include "winerror.h"
-#include "winreg.h"
-#include "debugtools.h"
-#include "winnls.h"
 
 #include "shellapi.h"
 #include "shlobj.h"
-#include "shell32_main.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "winnls.h"
+
 #include "wine/undocshell.h"
+#include "wine/winbase16.h"
+#include "shell32_main.h"
+
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c
index 547bfaabd28..dde90794bd6 100644
--- a/dlls/shell32/shpolicy.c
+++ b/dlls/shell32/shpolicy.c
@@ -17,12 +17,14 @@
 #include <string.h>
 
 #include "windef.h"
-#include "wingdi.h"
 #include "winerror.h"
 #include "winreg.h"
-#include "debugtools.h"
+
+#include "wine/undocshell.h"
 #include "wine/winuser16.h"
 
+#include "debugtools.h"
+
 DEFAULT_DEBUG_CHANNEL(shell);
 
 #define SHELL_MAX_POLICIES 57
diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h
index 8d548d6eaa2..6b879312aa8 100644
--- a/dlls/winmm/winemm.h
+++ b/dlls/winmm/winemm.h
@@ -188,7 +188,6 @@ extern LRESULT			MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD dwParam2, BOOL bIs3
 extern DWORD			MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32);
 extern DWORD 			MCI_SendCommandFrom32(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
 extern DWORD 			MCI_SendCommandFrom16(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
-extern DWORD 			MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2, UINT size);
 
 void		CALLBACK	WINE_mmThreadEntryPoint(DWORD _pmt);
 
diff --git a/include/wine/shell16.h b/include/wine/shell16.h
index e28193b08ad..340612c09f5 100644
--- a/include/wine/shell16.h
+++ b/include/wine/shell16.h
@@ -1,7 +1,7 @@
 #ifndef __WINE_WINE_SHELL16_H
 #define __WINE_WINE_SHELL16_H
 
-#include "windef.h"
+#include "wine/windef16.h"
 
 BOOL16      WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
 BOOL      WINAPI AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
diff --git a/memory/atom.c b/memory/atom.c
index 2ee16f60c58..0917c0f8402 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -11,20 +11,24 @@
  * have to be changed.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
 #include "windef.h"
-#include "winnls.h"
-#include "wine/winbase16.h"
-#include "wine/unicode.h"
 #include "winerror.h"
+
+#include "wine/server.h"
+#include "wine/unicode.h"
+#include "wine/winbase16.h"
+#include "global.h"
 #include "instance.h"
 #include "stackframe.h"
+
 #include "debugtools.h"
-#include "wine/server.h"
 
 DEFAULT_DEBUG_CHANNEL(atom);