diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c3d11a7cf..9d7eebabd 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-05  Hosaka Yuji  <hos@tamanegi.org>
+
+	* include/winuser.h (MonitorFromPoint, MonitorFromRect,
+	MonitorFromWindow): Add prototypes.
+	* lib/user32.def (MonitorFromPoint, MonitorFromRect,
+	MonitorFromWindowMonitorFromWindow): Add stubs.
+	* include/shellapi.h (DuplicateIcon): Add prototype.
+
 2004-09-05   Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/winuser.h (WINUSERAPI): New define.
diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index dba3874bb..8dbd7b1bb 100644
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -254,6 +254,7 @@ void WINAPI DragFinish(HDROP);
 UINT WINAPI DragQueryFileA(HDROP,UINT,LPSTR,UINT);
 UINT WINAPI DragQueryFileW(HDROP,UINT,LPWSTR,UINT);
 BOOL WINAPI DragQueryPoint(HDROP,LPPOINT);
+HICON WINAPI DuplicateIcon(HINSTANCE,HICON);
 HICON WINAPI ExtractAssociatedIconA(HINSTANCE,LPCSTR,PWORD);
 HICON WINAPI ExtractAssociatedIconW(HINSTANCE,LPCWSTR,PWORD);
 HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 6962643b2..a5aaf6892 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -3649,6 +3649,11 @@ WINUSERAPI int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
 WINUSERAPI int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
 WINUSERAPI BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
 WINUSERAPI BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
+#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
+WINUSERAPI HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);
+WINUSERAPI HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD);
+WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);
+#endif
 WINUSERAPI void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
 WINUSERAPI BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
 WINUSERAPI DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def
index 2c6f5702d..23dea29e4 100644
--- a/winsup/w32api/lib/user32.def
+++ b/winsup/w32api/lib/user32.def
@@ -439,6 +439,9 @@ MessageBoxIndirectW@4
 MessageBoxW@16
 ModifyMenuA@20
 ModifyMenuW@20
+MonitorFromPoint@8
+MonitorFromRect@8
+MonitorFromWindow@8
 MoveWindow@24
 MsgWaitForMultipleObjects@20
 MsgWaitForMultipleObjectsEx@20