diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 2dd988253..0996bf02c 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,20 @@
+2003-09-30  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_INPUT,
+	RIM_INPUTSINK): Add constants, for use by WM_INPUT notification.
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIDEV_REMOVE,
+	RIDEV_EXCLUDE, RIDEV_PAGEONLY, RIDEV_NOLEGACY, RIDEV_INPUTSINK,
+	RIDEV_CAPTUREMOUSE, RIDEV_NOHOTKEYS, RIDEV_APPKEYS): Add constants,
+	for use in RAWINPUTDEVICE.
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0501]
+	(GetRawInputDeviceInfo[AW]): Ooops... there are
+	ANSI/Unicode versions of this function.
+
+	* lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there
+	are ANSI/Unicode versions of this function.
+
 2003-09-29  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE,
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 7c27ec46a..db5d7cd5d 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -2127,6 +2127,8 @@ extern "C" {
 #endif
 #if (_WIN32_WINNT >= 0x0501)
 #define PW_CLIENTONLY 0x00000001
+#define RIM_INPUT     0x00000000
+#define RIM_INPUTSINK 0x00000001
 #define RIM_TYPEMOUSE    0x00000000
 #define RIM_TYPEKEYBOARD 0x00000001
 #define RIM_TYPEHID      0x00000002
@@ -2163,6 +2165,14 @@ extern "C" {
 #define RIDI_PREPARSEDDATA 0x20000005
 #define RIDI_DEVICENAME    0x20000007
 #define RIDI_DEVICEINFO    0x2000000b
+#define RIDEV_REMOVE       0x00000001
+#define RIDEV_EXCLUDE      0x00000010
+#define RIDEV_PAGEONLY     0x00000020
+#define RIDEV_NOLEGACY     0x00000030
+#define RIDEV_INPUTSINK    0x00000100
+#define RIDEV_CAPTUREMOUSE 0x00000200
+#define RIDEV_NOHOTKEYS    0x00000200
+#define RIDEV_APPKEYS      0x00000400
 #endif
 
 #ifndef RC_INVOKED
@@ -3316,7 +3326,8 @@ HANDLE WINAPI GetPropW(HWND,LPCWSTR);
 #if (_WIN32_WINNT >= 0x0501)
 UINT WINAPI GetRawInputBuffer(PRAWINPUT,PUINT,UINT);
 UINT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT);
-UINT WINAPI GetRawInputDeviceInfo(HANDLE,UINT,LPVOID,PUINT);
+UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT);
+UINT WINAPI GetRawInputDeviceInfoW(HANDLE,UINT,LPVOID,PUINT);
 UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST,PUINT,UINT);
 UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE,PUINT,UINT);
 #endif
@@ -3777,6 +3788,7 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
 #define GetMessage GetMessageW
 #define GetMonitorInfo GetMonitorInfoW
 #define GetProp GetPropW
+#define GetRawInputDeviceInfo GetRawInputDeviceInfoW
 #define GetTabbedTextExtent GetTabbedTextExtentW
 #define GetUserObjectInformation GetUserObjectInformationW
 #define GetWindowLong GetWindowLongW
@@ -3940,6 +3952,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
 #define GetMessage GetMessageA
 #define GetMonitorInfo GetMonitorInfoA
 #define GetProp GetPropA
+#define GetRawInputDeviceInfo GetRawInputDeviceInfoA
 #define GetTabbedTextExtent GetTabbedTextExtentA
 #define GetUserObjectInformation GetUserObjectInformationA
 #define GetWindowLong GetWindowLongA
diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def
index 2fde4bdfd..837995dc0 100644
--- a/winsup/w32api/lib/user32.def
+++ b/winsup/w32api/lib/user32.def
@@ -311,7 +311,8 @@ GetPropA@8
 GetPropW@8
 GetRawInputBuffer@12
 GetRawInputData@20
-GetRawInputDeviceInfo@16
+GetRawInputDeviceInfoA@16
+GetRawInputDeviceInfoW@16
 GetRawInputDeviceList@12
 GetRegisteredRawInputDevices@12
 GetQueueStatus@4