diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 21d1aaef2..d6fb47080 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/uxtheme.h (PROPERTYORIGIN): the documentation of
+	PROPERTYORIGIN suggests it's `PROPERTYORIGIN' but experimentation
+	suggests it's actually `enum PROPERTYORIGIN'. Keep both.
+
+	* include/uxtheme.h (THEME_SIZE, THEMESIZE): MSDN suggests
+	it's either `THEME_SIZE' or `THEMESIZE' but experimentation
+	suggests it's actually `enum THEMESIZE'. Keep `THEME_SIZE'
+	and `enum THEMESIZE'.
+
 2003-09-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/uxtheme.h: New file.
diff --git a/winsup/w32api/include/uxtheme.h b/winsup/w32api/include/uxtheme.h
index e9fb8a53c..0d32d820c 100644
--- a/winsup/w32api/include/uxtheme.h
+++ b/winsup/w32api/include/uxtheme.h
@@ -34,14 +34,14 @@ extern "C" {
 #define HTTB_SIZINGTEMPLATE 0x0100
 #define HTTB_SYSTEMSIZINGMARGINS 0x0200
 
-typedef enum {
+typedef enum PROPERTYORIGIN {
 	PO_STATE = 0,
 	PO_PART = 1,
 	PO_CLASS = 2,
 	PO_GLOBAL = 3,
 	PO_NOTFOUND = 4
 } PROPERTYORIGIN;
-typedef enum {
+typedef enum THEMESIZE {
 	TS_MIN,
 	TS_TRUE,
 	TS_DRAW