diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 243bb18ba..c0f7dbf7f 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-11  Manu B  <manubee@users.sourceforge.net>
+
+	* include/afxres.h: New file.
+
+	* include/richedit.h (ES_NOOLEDRAGDROP, ENM_DRAGDROPDONE,
+	ENM_IMECHANGE, ENM_LANGCHANGE, ENM_OBJECTPOSITIONS,
+	ENM_SCROLLEVENTS): Add constants.
+
+	* include/richedit.h (ES_SELECTIONBAR, ENM_LINK): Sort constants.
+
 2003-10-09  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/errorep.h: New file.
diff --git a/winsup/w32api/include/afxres.h b/winsup/w32api/include/afxres.h
new file mode 100644
index 000000000..8c3f01a9a
--- /dev/null
+++ b/winsup/w32api/include/afxres.h
@@ -0,0 +1,23 @@
+#ifndef _AFXRES_H
+#define _AFXRES_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _WINDOWS_H
+#include <windows.h>
+#endif
+
+/* IDC_STATIC is documented in winuser.h, but not defined. */
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/richedit.h b/winsup/w32api/include/richedit.h
index 7bc789845..580b51191 100644
--- a/winsup/w32api/include/richedit.h
+++ b/winsup/w32api/include/richedit.h
@@ -125,11 +125,12 @@ extern "C" {
 #define ES_DISABLENOSCROLL	8192
 #define ES_EX_NOCALLOLEINIT 16777216
 #define ES_NOIME 524288
+#define ES_NOOLEDRAGDROP 8
 #define ES_SAVESEL	32768
+#define ES_SELECTIONBAR 16777216
 #define ES_SELFIME 262144
 #define ES_SUNKEN 16384
 #define ES_VERTICAL 4194304
-#define ES_SELECTIONBAR 16777216
 #define EM_CANPASTE	(WM_USER+50)
 #define EM_DISPLAYBAND	(WM_USER+51)
 #define EM_EXGETSEL	(WM_USER+52)
@@ -218,15 +219,20 @@ extern "C" {
 #define ENM_NONE 0
 #define ENM_CHANGE 1
 #define ENM_CORRECTTEXT 4194304
+#define ENM_DRAGDROPDONE	16
 #define ENM_DROPFILES 1048576
+#define ENM_IMECHANGE 8388608
 #define ENM_KEYEVENTS 65536
+#define ENM_LANGCHANGE 16777216
+#define ENM_LINK 67108864
 #define ENM_MOUSEEVENTS 131072
+#define ENM_OBJECTPOSITIONS 33554432
 #define ENM_PROTECTED 2097152
 #define ENM_REQUESTRESIZE 262144
 #define ENM_SCROLL 4
+#define ENM_SCROLLEVENTS 8
 #define ENM_SELCHANGE 524288
 #define ENM_UPDATE 2
-#define ENM_LINK 67108864
 #define ECO_AUTOWORDSELECTION	1
 #define ECO_AUTOVSCROLL	64
 #define ECO_AUTOHSCROLL	128