With this patch, we can get rid of the stdarg.h include from winbase.h if it weren't for the FormatMessage() functions: DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*); DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*); Alexandre, how do we handle this one? ChangeLog Do not depend on stdarg.h being included from winbase.h. Index: include/shlwapi.h =================================================================== RCS file: /var/cvs/wine/include/shlwapi.h,v retrieving revision 1.38 diff -u -r1.38 shlwapi.h --- include/shlwapi.h 28 Aug 2003 21:43:35 -0000 1.38 +++ include/shlwapi.h 3 Sep 2003 04:23:11 -0000 @@ -21,6 +21,7 @@ #ifndef __WINE_SHLWAPI_H #define __WINE_SHLWAPI_H +#include <stdarg.h> #include <objbase.h> #ifdef __cplusplus Index: include/wine/library.h =================================================================== RCS file: /var/cvs/wine/include/wine/library.h,v retrieving revision 1.22 diff -u -r1.22 library.h --- include/wine/library.h 29 Aug 2003 22:23:42 -0000 1.22 +++ include/wine/library.h 3 Sep 2003 03:42:06 -0000 @@ -21,6 +21,7 @@ #ifndef __WINE_WINE_LIBRARY_H #define __WINE_WINE_LIBRARY_H +#include <stdarg.h> #include <sys/types.h> #include <winbase.h> -- Dimi.