diff --git a/include/commctrl.h b/include/commctrl.h
index a66da74..0522eaa 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -340,6 +340,11 @@
 #define UDM_GETBASE        (WM_USER+110)
 #define UDM_SETRANGE32     (WM_USER+111)
 #define UDM_GETRANGE32     (WM_USER+112)
+#define UDM_SETUNICODEFORMAT    CCM_SETUNICODEFORMAT
+#define UDM_GETUNICODEFORMAT    CCM_GETUNICODEFORMAT
+#define UDM_SETPOS32       (WM_USER+113)
+#define UDM_GETPOS32       (WM_USER+114)
+
 
 #define NMUPDOWN    NM_UPDOWN
 #define LPNMUPDOWN  LPNM_UPDOWN
@@ -2041,6 +2046,8 @@
 #define NM_TREEVIEW    WINELIB_NAME_AW(NMTREEVIEW)
 #define LPNMTREEVIEW   WINELIB_NAME_AW(LPNMTREEVIEW)
 
+#define LPNM_TREEVIEW           LPNMTREEVIEW
+
 typedef struct tagTVDISPINFOA {
 	NMHDR	hdr;
 	TVITEMA	item;
@@ -3442,6 +3449,10 @@
 #define DTN_FORMATW         (DTN_FIRST + 17)
 #define DTN_FORMATQUERYW    (DTN_FIRST + 18)
 
+#define DTN_USERSTRING      WINELIB_NAME_AW(DTN_USERSTRING)
+#define DTN_WMKEYDOWN       WINELIB_NAME_AW(DTN_WMKEYDOWN)
+#define DTN_FORMAT          WINELIB_NAME_AW(DTN_FORMAT)
+#define DTN_FORMATQUERY     WINELIB_NAME_AW(DTN_FORMATQUERY)
 
 #define DTS_SHORTDATEFORMAT 0x0000 
 #define DTS_UPDOWN          0x0001 
@@ -3474,6 +3485,8 @@
     DWORD      dwFlags;    
 } NMDATETIMESTRINGW, *LPNMDATETIMESTRINGW;
 
+DECL_WINELIB_TYPE_AW(NMDATETIMESTRING)
+DECL_WINELIB_TYPE_AW(LPNMDATETIMESTRING)
 
 typedef struct tagNMDATETIMEWMKEYDOWNA
 {
@@ -3491,7 +3504,8 @@
     SYSTEMTIME st;       
 } NMDATETIMEWMKEYDOWNW, *LPNMDATETIMEWMKEYDOWNW;
 
-
+DECL_WINELIB_TYPE_AW(NMDATETIMEWMKEYDOWN)
+DECL_WINELIB_TYPE_AW(LPNMDATETIMEWMKEYDOWN)
 
 typedef struct tagNMDATETIMEFORMATA
 {
@@ -3512,7 +3526,8 @@
     WCHAR szDisplay[64];
 } NMDATETIMEFORMATW, *LPNMDATETIMEFORMATW;
 
-
+DECL_WINELIB_TYPE_AW(NMDATETIMEFORMAT)
+DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMAT)
 
 typedef struct tagNMDATETIMEFORMATQUERYA
 {
@@ -3528,13 +3543,8 @@
     SIZE szMax;        
 } NMDATETIMEFORMATQUERYW, *LPNMDATETIMEFORMATQUERYW;
 
-
-#define NMDATETIMESTRING WINELIB_NAME_AW(NMDATETIMESTRING)
-#define NMDATETIMEWMKEYDOWN WINELIB_NAME_AW(NMDATETIMEWMKEYDOWN)
-#define NMDATETIMEFORMAT WINELIB_NAME_AW(NMDATETIMEFORMAT)
-#define NMDATETIMEFORMATQUERY WINELIB_NAME_AW(NMDATETIMEFORMATQUERY)
-
-
+DECL_WINELIB_TYPE_AW(NMDATETIMEFORMATQUERY)
+DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY)