diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9ee1e0e49..948dd23b6 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-19  Elias Naur  <elias_naur@users.sourceforge.net>
+
+	* include/winuser.h (WM_INPUT): Add missing Raw	Input
+	notification define.
+	(RID_DEVICE_INFO_MOUSE, RID_DEVICE_INFO_KEYBOARD,
+	RID_DEVICE_INFO_HID, RID_DEVICE_INFO): Define Raw Input structs
+
 2006-07-19  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	[mingw-Bugs-1525021]
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index eae1f464f..af2b29132 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1398,6 +1398,9 @@ extern "C" {
 #define WM_INITDIALOG 272
 #define WM_INITMENU 278
 #define WM_INITMENUPOPUP 279
+#if (_WIN32_WINNT >= 0x0501)
+#define WM_INPUT 0x00FF
+#endif
 #define WM_INPUTLANGCHANGE 81
 #define WM_INPUTLANGCHANGEREQUEST 80
 #define WM_KEYDOWN 256
@@ -3275,6 +3278,36 @@ typedef struct tagRAWINPUTDEVICELIST {
 	HANDLE hDevice;
 	DWORD dwType;
 } RAWINPUTDEVICELIST,*PRAWINPUTDEVICELIST;
+typedef struct tagRID_DEVICE_INFO_MOUSE {
+	DWORD dwId;
+	DWORD dwNumberOfButtons;
+	DWORD dwSampleRate;
+	BOOL fHasHorizontalWheel;
+} RID_DEVICE_INFO_MOUSE, *PRID_DEVICE_INFO_MOUSE;
+typedef struct tagRID_DEVICE_INFO_KEYBOARD {
+	DWORD dwType;
+	DWORD dwSubType;
+	DWORD dwKeyboardMode;
+	DWORD dwNumberOfFunctionKeys;
+	DWORD dwNumberOfIndicators;
+	DWORD dwNumberOfKeysTotal;
+} RID_DEVICE_INFO_KEYBOARD, *PRID_DEVICE_INFO_KEYBOARD;
+typedef struct tagRID_DEVICE_INFO_HID {
+	DWORD dwVendorId;
+	DWORD dwProductId;
+	DWORD dwVersionNumber;
+	USHORT usUsagePage;
+	USHORT usUsage;
+} RID_DEVICE_INFO_HID, *PRID_DEVICE_INFO_HID;
+typedef struct tagRID_DEVICE_INFO { 
+	DWORD    cbSize; 
+	DWORD    dwType; 
+	_ANONYMOUS_UNION union { 
+		RID_DEVICE_INFO_MOUSE     mouse; 
+		RID_DEVICE_INFO_KEYBOARD  keyboard; 
+		RID_DEVICE_INFO_HID       hid; 
+	} DUMMYUNIONNAME;
+} RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO;
 #endif /* (_WIN32_WINNT >= 0x0501) */
 
 typedef struct {