diff --git a/include/commctrl.h b/include/commctrl.h
index 587caae88b3..e3c166b305b 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1032,7 +1032,51 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 };
 #define BCN_FIRST               (0U-1250U)
 #define BCN_LAST                (0U-1350U)
 
-#define BCN_HOTITEMCHANGE       (BCN_FIRST + 0x0001)
+#define BCN_HOTITEMCHANGE       (BCN_FIRST + 1)
+#define BCN_DROPDOWN            (BCN_FIRST + 2)
+
+#define BCM_FIRST               0x1600
+#define BCM_GETIDEALSIZE        (BCM_FIRST + 1)
+#define BCM_SETIMAGELIST        (BCM_FIRST + 2)
+#define BCM_GETIMAGELIST        (BCM_FIRST + 3)
+#define BCM_SETTEXTMARGIN       (BCM_FIRST + 4)
+#define BCM_GETTEXTMARGIN       (BCM_FIRST + 5)
+#define BCM_SETDROPDOWNSTATE    (BCM_FIRST + 6)
+#define BCM_SETSPLITINFO        (BCM_FIRST + 7)
+#define BCM_GETSPLITINFO        (BCM_FIRST + 8)
+#define BCM_SETNOTE             (BCM_FIRST + 9)
+#define BCM_GETNOTE             (BCM_FIRST + 10)
+#define BCM_GETNOTELENGTH       (BCM_FIRST + 11)
+#define BCM_SETSHIELD           (BCM_FIRST + 12)
+
+#define BUTTON_IMAGELIST_ALIGN_LEFT      0
+#define BUTTON_IMAGELIST_ALIGN_RIGHT     1
+#define BUTTON_IMAGELIST_ALIGN_TOP       2
+#define BUTTON_IMAGELIST_ALIGN_BOTTOM    3
+#define BUTTON_IMAGELIST_ALIGN_CENTER    4
+
+#define BCCL_NOGLYPH    (HIMAGELIST)(-1)
+
+typedef struct
+{
+    HIMAGELIST himl;
+    RECT margin;
+    UINT uAlign;
+} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST;
+
+typedef struct tagBUTTON_SPLITINFO
+{
+    UINT mask;
+    HIMAGELIST himlGlyph;
+    UINT uSplitStyle;
+    SIZE size;
+} BUTTON_SPLITINFO, *PBUTTON_SPLITINFO;
+
+typedef struct tagNMBCDROPDOWN
+{
+    NMHDR hdr;
+    RECT rcButton;
+} NMBCDROPDOWN;
 
 typedef struct tagNMBCHOTITEM
 {
@@ -1041,6 +1085,7 @@ typedef struct tagNMBCHOTITEM
 } NMBCHOTITEM, *LPNMBCHOTITEM;
 
 #define BST_HOT                 0x0200
+#define BST_DROPDOWNPUSHED      0x0400
 
 /* Button control styles for _WIN32_WINNT >= 0x600 */
 #define BS_SPLITBUTTON          0x0000000C
@@ -5147,6 +5192,12 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 };
 #endif
 #define WC_COMBOBOX               WINELIB_NAME_AW(WC_COMBOBOX)
 
+#define CBM_FIRST                 0x1700
+#define CB_SETMINVISIBLE          (CBM_FIRST + 1)
+#define CB_GETMINVISIBLE          (CBM_FIRST + 2)
+#define CB_SETCUEBANNER           (CBM_FIRST + 3)
+#define CB_GETCUEBANNER           (CBM_FIRST + 4)
+
 /**************************************************************************
  * Edit control
  */
@@ -5161,6 +5212,24 @@ static const WCHAR WC_EDITW[] = { 'E','d','i','t',0 };
 #endif
 #define WC_EDIT                   WINELIB_NAME_AW(WC_EDIT)
 
+typedef struct _tagEDITBALLOONTIP
+{
+    DWORD cbStruct;
+    LPCWSTR pszTitle;
+    LPCWSTR pszText;
+    INT ttiIcon;
+} EDITBALLOONTIP, *PEDITBALLOONTIP;
+
+#define ECM_FIRSP                 0x1500
+#define EM_SETCUEBANNER           (ECM_FIRST + 1)
+#define EM_GETCUEBANNER           (ECM_FIRST + 2)
+#define EM_SHOWBALLOONTIP         (ECM_FIRST + 3)
+#define EM_HIDEBALLOONTIP         (ECM_FIRST + 4)
+#define EM_SETHILITE              (ECM_FIRST + 5)
+#define EM_GETHILITE              (ECM_FIRST + 6)
+#define EM_NOSETFOCUS             (ECM_FIRST + 7)
+#define EM_TAKEFOCUS              (ECM_FIRST + 8)
+
 /**************************************************************************
  * Listbox control
  */