diff --git a/reactos/include/psdk/commctrl.h b/reactos/include/psdk/commctrl.h
index 51b48a4b386..8de0bea567b 100644
--- a/reactos/include/psdk/commctrl.h
+++ b/reactos/include/psdk/commctrl.h
@@ -631,6 +631,15 @@ extern "C" {
 #define TB_MAPACCELERATORW	(WM_USER+90)
 #define TB_GETSTRINGW		(WM_USER+91)
 #define TB_GETSTRINGA		(WM_USER+92)
+
+/* undocumented messages in Toolbar */
+#define TB_UNKWN45D             (WM_USER+93)
+#define TB_UNKWN45E             (WM_USER+94)
+#define TB_UNKWN460             (WM_USER+96)
+#define TB_UNKWN462             (WM_USER+98)
+#define TB_UNKWN463             (WM_USER+99)
+#define TB_UNKWN464             (WM_USER+100)
+
 #define TB_SETCOLORSCHEME	CCM_SETCOLORSCHEME
 #define TB_GETCOLORSCHEME	CCM_GETCOLORSCHEME
 #define TB_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
@@ -655,6 +664,7 @@ extern "C" {
 #define TBN_DROPDOWN	(TBN_FIRST-10)
 #endif
 #if (_WIN32_IE >= 0x0400)
+#define TBN_GETOBJECT		(TBN_FIRST-12)
 #define TBN_HOTITEMCHANGE	(TBN_FIRST-13)
 #define TBN_DRAGOUT	(TBN_FIRST-14)
 #define TBN_DELETINGBUTTON	(TBN_FIRST-15)
@@ -1212,6 +1222,7 @@ extern "C" {
 #define LVN_SETDISPINFOA	(LVN_FIRST-51)
 #define LVN_SETDISPINFOW	(LVN_FIRST-78)
 #define LVN_KEYDOWN	(LVN_FIRST-55)
+#define LVN_MARQUEEBEGIN	(LVN_FIRST-56)
 #if (_WIN32_IE >= 0x0400)
 #define LVN_GETINFOTIPA	(LVN_FIRST-57)
 #define LVN_GETINFOTIPW	(LVN_FIRST-58)
@@ -1468,6 +1479,7 @@ extern "C" {
 #define TCN_KEYDOWN	TCN_FIRST
 #define TCN_SELCHANGE	(TCN_FIRST-1)
 #define TCN_SELCHANGING	(TCN_FIRST-2)
+#define TCN_GETOBJECT	(TCN_FIRST-3)
 #define NM_OUTOFMEMORY (NM_FIRST-1)
 #define NM_CLICK (NM_FIRST-2)
 #define NM_DBLCLK (NM_FIRST-3)
@@ -1681,6 +1693,7 @@ extern "C" {
 #define LVN_ODFINDITEMW (LVN_FIRST-79)
 #define LVN_ITEMACTIVATE (LVN_FIRST-14)
 #define LVN_ODSTATECHANGED (LVN_FIRST-15)
+#define LVN_HOTTRACK    (LVN_FIRST-21)
 #ifdef UNICODE
 #define LVN_ODFINDITEM LVN_ODFINDITEMW
 #else
@@ -1995,12 +2008,32 @@ typedef struct {
 	char szText[CBEMAXSTRLEN];
 	int iWhy;
 } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA;
+typedef struct tagNMOBJECTNOTIFY
+{
+	NMHDR   hdr;
+	int     iItem;
+#ifdef __IID_DEFINED__
+	const IID *piid;
+#else
+	const void *piid;
+#endif
+	void    *pObject;
+	HRESULT hResult;
+	DWORD   dwFlags;
+} NMOBJECTNOTIFY, *LPNMOBJECTNOTIFY;
 typedef struct tagNMKEY
 {
 	NMHDR hdr;
 	UINT nVKey;
 	UINT uFlags;
 } NMKEY, *LPNMKEY;
+typedef struct tagNMCHAR
+{
+	NMHDR   hdr;
+	UINT    ch;
+	DWORD   dwItemPrev;           /* Item previously selected */
+	DWORD   dwItemNext;           /* Item to be selected */
+} NMCHAR, *LPNMCHAR;
 typedef struct _COLORMAP {
 	COLORREF from;
 	COLORREF to;
@@ -2572,6 +2605,19 @@ typedef struct tagNMLVCACHEHINT {
 	int iTo;
 } NMLVCACHEHINT, *PNMLVCACHEHINT;
 #define NM_CACHEHINT NMLVCACHEHINT
+typedef struct tagNMLVFINDITEMA
+{
+	NMHDR hdr;
+	int iStart;
+	LVFINDINFOA lvfi;
+} NMLVFINDITEMA, *LPNMLVFINDITEMA;
+typedef struct tagNMLVFINDITEMW
+{
+	NMHDR hdr;
+	int iStart;
+	LVFINDINFOW lvfi;
+} NMLVFINDITEMW, *LPNMLVFINDITEMW;
+
 typedef struct _TREEITEM *HTREEITEM;
 typedef struct tagTVITEMA {
 	UINT mask;
@@ -2726,11 +2772,16 @@ typedef struct tagNMTVGETINFOTIPW {
 	LPARAM lParam;
 } NMTVGETINFOTIPW, *LPNMTVGETINFOTIPW;
 #endif
-typedef struct _TV_KEYDOWN {
+#include <pshpack1.h>
+typedef struct tagTVKEYDOWN
+{
 	NMHDR hdr;
 	WORD wVKey;
 	UINT flags;
-} TV_KEYDOWN;
+} NMTVKEYDOWN, *LPNMTVKEYDOWN;
+#include <poppack.h>
+#define TV_KEYDOWN NMTVKEYDOWN
+
 typedef struct _TC_ITEMHEADERA {
 	UINT mask;
 	UINT lpReserved1;
diff --git a/reactos/include/psdk/prsht.h b/reactos/include/psdk/prsht.h
index b1e6949f91c..286cde57380 100644
--- a/reactos/include/psdk/prsht.h
+++ b/reactos/include/psdk/prsht.h
@@ -106,6 +106,9 @@ extern "C" {
 #define PSN_HELP	(-205)
 #define PSN_KILLACTIVE	(-201)
 #define PSN_QUERYCANCEL	(-209)
+#define PSN_GETOBJECT   (PSN_FIRST-10)
+#define PSN_TRANSLATEACCELERATOR (PSN_FIRST-12)
+#define PSN_QUERYINITIALFOCUS    (PSN_FIRST-13)
 #define PSN_RESET	(-203)
 #define PSN_SETACTIVE	(-200)
 #define PSN_WIZBACK	(-206)
@@ -306,6 +309,17 @@ int WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
 #define PropSheet_UnChanged(d,w) SendMessage(d,PSM_UNCHANGED,(WPARAM)w,0)
 #endif
 
+#define WC_PROPSHEETA      "SysPropertySheet"
+#if defined(__GNUC__)
+# define WC_PROPSHEETW (const WCHAR []){ 'S','y','s', \
+  'P','r','o','p','e','r','t','y','S','h','e','e','t',0 }
+#elif defined(_MSC_VER)
+# define WC_PROPSHEETW     L"SysPropertySheet"
+#else
+static const WCHAR WC_PROPSHEETW[] = { 'S','y','s',
+  'P','r','o','p','e','r','t','y','S','h','e','e','t',0 };
+#endif
+
 #ifdef UNICODE
 #define LPFNPSPCALLBACK	LPFNPSPCALLBACKW
 #define PROPSHEETPAGE	PROPSHEETPAGEW
diff --git a/reactos/include/psdk/richedit.h b/reactos/include/psdk/richedit.h
index c8ca83f67f0..f859b0b6d25 100644
--- a/reactos/include/psdk/richedit.h
+++ b/reactos/include/psdk/richedit.h
@@ -11,8 +11,10 @@ extern "C" {
 
 #ifdef UNICODE
 #define RICHEDIT_CLASS L"RichEdit20W"
+#define RICHEDIT_CLASS20W L"RichEdit20W"
 #else
 #define RICHEDIT_CLASS "RichEdit20A"
+#define RICHEDIT_CLASS20A "RichEdit20A"
 #endif
 #define RICHEDIT_CLASS10A    "RICHEDIT"
 #define CF_RTF TEXT("Rich Text Format")
@@ -222,6 +224,7 @@ extern "C" {
 #define EM_GETIMECOLOR	(WM_USER + 105)
 #define EM_SETIMEOPTIONS	(WM_USER + 106)
 #define EM_GETIMEOPTIONS	(WM_USER + 107)
+#define EM_CONVPOSITION		(WM_USER + 108)
 #define EM_SETLANGOPTIONS	(WM_USER+120)
 #define EM_GETLANGOPTIONS	(WM_USER+121)
 #define EM_GETIMECOMPMODE	(WM_USER+122)
@@ -236,6 +239,7 @@ extern "C" {
 #define EM_GETTYPOGRAPHYOPTIONS	(WM_USER+203)
 #define EM_SETEDITSTYLE	(WM_USER + 204)
 #define EM_GETEDITSTYLE	(WM_USER + 205)
+#define EM_OUTLINE      (WM_USER + 220)
 #define EM_GETSCROLLPOS	(WM_USER+221)
 #define EM_SETSCROLLPOS	(WM_USER+222)
 #define EM_SETFONTSIZE	(WM_USER+223)