diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 616a4ec02..8670bbb2f 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,18 @@
+2003-11-13 Martin Fuchs  <martin-fuchs@gmx.net>
+
+	* include/shlobj.h (ILAppendID, ILClone, ILCloneFirst, ILCombine,
+	ILFindChild, ILFindLastID, ILFree, ILGetNext, ILGetSize, ILIsEqual,
+	ILIsParent, ILLoadFromStream, ILRemoveLastID, ILSaveToStream):
+	Add prototypes.
+	* lib/shell32.def: Add stubs.
+
+	* include/commctrl.h (ListView_FindItem): Add type cast to avoid
+	compiler warnings.
+
+2003-11-13  Hans Leidekker <hans@it.vu.nl>
+
+	* include/winbase.h (WIN32_STREAM_ID): Correct typedef.
+
 2003-10-13  Andre Auzi  <aauzi@users.sourceforge.net>
 
 	* include/windows.h (CopyCursor): Define as macro.
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index e6e7de0f5..d58cd7675 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -2938,7 +2938,7 @@ int WINAPI LBItemFromPt(HWND,POINT,BOOL);
 #define ListView_GetCallbackMask(w) (BOOL)SNDMSG((w),LVM_GETCALLBACKMASK,0,0)
 #define ListView_SetCallbackMask(w,m) (BOOL)SNDMSG((w),LVM_SETCALLBACKMASK,m,0)
 #define ListView_GetNextItem(w,i,f) (int)SNDMSG((w),LVM_GETNEXTITEM,i,MAKELPARAM((f),0))
-#define ListView_FindItem(w,i,p) (int)SNDMSG((w), LVM_FINDITEM,i,(LPARAM)(const LV_FINDINFO*)(p))
+#define ListView_FindItem(w,i,p) (int)SNDMSG((w), LVM_FINDITEM,(WPARAM)i,(LPARAM)(const LV_FINDINFO*)(p))
 #define ListView_GetItemRect(w,i,p,c) (BOOL)SNDMSG((w),LVM_GETITEMRECT,i,((p)?(((LPRECT)(p))->left=(c),(LPARAM)(LPRECT)(p)):0))
 #define ListView_SetItemPosition(w,i,x,y) (BOOL)SNDMSG((w),LVM_SETITEMPOSITION,i,MAKELPARAM(x,y))
 #define ListView_GetItemPosition(w,i,p) (BOOL)SNDMSG((w),LVM_GETITEMPOSITION,i,(LPARAM)p)
diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h
index b37525bc0..446a22918 100644
--- a/winsup/w32api/include/shlobj.h
+++ b/winsup/w32api/include/shlobj.h
@@ -910,6 +910,23 @@ void WINAPI SHGetSettings(LPSHELLFLAGSTATE,DWORD);
 void WINAPI SHGetSetSettings(LPSHELLSTATE,DWORD,BOOL);
 #endif
 
+#if (_WIN32_WINNT >= 0x0500) /* W2K */
+BOOL WINAPI ILIsEqual(LPCITEMIDLIST, LPCITEMIDLIST);
+BOOL WINAPI ILIsParent(LPCITEMIDLIST, LPCITEMIDLIST, BOOL);
+BOOL WINAPI ILRemoveLastID(LPITEMIDLIST);
+HRESULT WINAPI ILLoadFromStream(IStream*, LPITEMIDLIST*);
+HRESULT WINAPI ILSaveToStream(IStream*, LPCITEMIDLIST);
+LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST, LPCSHITEMID, BOOL);
+LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST);
+LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST);
+LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST, LPCITEMIDLIST);
+LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST, LPCITEMIDLIST);
+LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST);
+LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST);
+UINT WINAPI ILGetSize(LPCITEMIDLIST);
+void WINAPI ILFree(LPITEMIDLIST);
+#endif
+
 #ifdef UNICODE
 typedef IShellExecuteHookW IShellExecuteHook;
 typedef IShellLinkW IShellLink;
@@ -941,7 +958,6 @@ typedef BROWSEINFOA BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
 #endif
 #endif /* UNICODE */
 
-
 #pragma pack(pop)
 #ifdef __cplusplus
 }
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 9b3aec169..c953afa9f 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -811,7 +811,7 @@ typedef struct _WIN32_STREAM_ID {
 	LARGE_INTEGER Size;
 	DWORD dwStreamNameSize;
 	WCHAR cStreamName[ANYSIZE_ARRAY];
-} WIN32_STREAM_ID;
+} WIN32_STREAM_ID, *LPWIN32_STREAM_ID;
 typedef enum _FINDEX_INFO_LEVELS {
 	FindExInfoStandard,
 	FindExInfoMaxInfoLevel
diff --git a/winsup/w32api/lib/shell32.def b/winsup/w32api/lib/shell32.def
index fa8b8b8d9..6684f7a5a 100644
--- a/winsup/w32api/lib/shell32.def
+++ b/winsup/w32api/lib/shell32.def
@@ -166,3 +166,17 @@ Control_FillCache_RunDLL@16
 CommandLineToArgvW@8
 CheckEscapesW@8
 CheckEscapesA@8
+ILAppendID@12
+ILClone@4
+ILCloneFirst@4
+ILCombine@8
+ILFindChild@8
+ILFindLastID@4
+ILFree@4
+ILGetNext@4
+ILGetSize@4
+ILIsEqual@8
+ILIsParent@12
+ILLoadFromStream@8
+ILRemoveLastID@4
+ILSaveToStream@8