diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 2a06f2950..ebb628820 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/wingdi.h (CAPTUREBLT,NOMIRRORBITMAP): Define.
+	* include/commctrl.h (WC_LINK{AW},LIF_*,LIM_*,LM_*,
+	MAX_LINKID_TEXT,L_MAX_URL_LENGTH): Define.
+	(LITEM,LHITTESTINFO,NMLINK): Add structures.
+	Thanks to:    Brandon Sneed <brandon at redf dot net>
+
 2006-04-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/w32api.h (IE*): Define for recent versions of IE.
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 7cdc332e1..46368e010 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -74,6 +74,8 @@ extern "C" {
 #define WC_COMBOBOXW	L"ComboBox"
 #define WC_SCROLLBARA	"ScrollBar"
 #define WC_SCROLLBARW	L"ScrollBar"
+#define WC_LINKA	"SysLink"
+#define WC_LINKW	L"SysLink"
 
 #ifdef UNICODE
 #define HOTKEY_CLASS HOTKEY_CLASSW
@@ -101,6 +103,7 @@ extern "C" {
 #define WC_LISTBOX WC_LISTBOXW
 #define WC_COMBOBOX WC_COMBOBOXW
 #define WC_SCROLLBAR WC_SCROLLBARW
+#define WC_LINK WC_LINKW
 #else
 #define ANIMATE_CLASS ANIMATE_CLASSA
 #define HOTKEY_CLASS HOTKEY_CLASSA
@@ -127,6 +130,7 @@ extern "C" {
 #define WC_LISTBOX WC_LISTBOXA
 #define WC_COMBOBOX WC_COMBOBOXA
 #define WC_SCROLLBAR WC_SCROLLBARA
+#define WC_LINK WC_LINKA
 #endif
 
 #if (_WIN32_IE >= 0x0500)
@@ -1725,7 +1729,6 @@ extern "C" {
 #define PGM_GETBUTTONSIZE (PGM_FIRST+11)
 #define PGM_GETBUTTONSTATE (PGM_FIRST+12)
 #define PGM_GETDROPTARGET CCM_GETDROPTARGET
-
 #define RBS_REGISTERDROP 4096
 #define RBS_AUTOSIZE 8192
 #define RBS_VERTICALGRIPPER 16384
@@ -1832,6 +1835,21 @@ extern "C" {
 #define FSB_ENCARTA_MODE	1
 #define FSB_REGULAR_MODE	0
 #endif /* _WIN32_IE >= 0x400 */
+#if (_WIN32_WINNT >= 0x0501)
+#define LIF_ITEMINDEX	0x00000001
+#define LIF_STATE	0x00000002
+#define LIF_ITEMID	0x00000004
+#define LIF_URL	0x00000008
+#define LIS_FOCUSED	0x00000001
+#define LIS_ENABLED	0x00000002
+#define LIS_VISITED	0x00000004
+#define LM_HITTEST	(WM_USER + 768)
+#define LM_GETIDEALHEIGHT	(WM_USER + 769)
+#define LM_SETITEM	(WM_USER + 770)
+#define LM_GETITEM	(WM_USER + 771)
+#define MAX_LINKID_TEXT	48
+#define L_MAX_URL_LENGTH	2084
+#endif
 
 #ifndef RC_INVOKED
 typedef struct tagCOMBOBOXEXITEMA{
@@ -2895,6 +2913,22 @@ typedef INT (CALLBACK *PFNDSAENUMCALLBACK)(PVOID,PVOID);
 typedef INT (CALLBACK *PFNDPACOMPARE)(PVOID,PVOID,LPARAM);
 #if (_WIN32_WINNT >= 0x0501)
 typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_PTR);
+typedef struct tagLITEM {
+	UINT mask;
+	int iLink;
+	UINT state;
+	UINT stateMask;
+	WCHAR szID[MAX_LINKID_TEXT];
+	WCHAR szUrl[L_MAX_URL_LENGTH];
+} LITEM,*PLITEM;
+typedef struct tagLHITTESTINFO {
+	POINT pt;
+	LITEM item;
+} LHITTESTINFO,*PLHITTESTINFO;
+typedef struct tagNMLINK {
+	NMHDR hdr;
+	LITEM item;
+} NMLINK,*PNMLINK;
 #endif /* _WIN32_WINNT >= 0x0501 */
 
 #define INDEXTOOVERLAYMASK(i) ((i)<<8)
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 0157b7be6..8cd44f7ac 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -267,21 +267,23 @@ extern "C" {
 #define SP_OUTOFMEMORY	(-5)
 #define SP_USERABORT	(-3)
 #define SP_APPABORT	(-2)
-#define BLACKNESS	0x42
-#define NOTSRCERASE	0x1100A6
-#define NOTSRCCOPY	0x330008
-#define SRCERASE	0x440328
-#define DSTINVERT	0x550009
-#define PATINVERT	0x5A0049
-#define SRCINVERT	0x660046
-#define SRCAND	0x8800C6
-#define MERGEPAINT	0xBB0226
-#define MERGECOPY	0xC000CA
-#define SRCCOPY 0xCC0020
-#define SRCPAINT	0xEE0086
-#define PATCOPY	0xF00021
-#define PATPAINT	0xFB0A09
-#define WHITENESS	0xFF0062
+#define BLACKNESS	0x00000042
+#define NOTSRCERASE	0x001100A6
+#define NOTSRCCOPY	0x00330008
+#define SRCERASE	0x00440328
+#define DSTINVERT	0x00550009
+#define PATINVERT	0x005A0049
+#define SRCINVERT	0x00660046
+#define SRCAND	0x008800C6
+#define MERGEPAINT	0x00BB0226
+#define MERGECOPY	0x00C000CA
+#define SRCCOPY 0x00CC0020
+#define SRCPAINT	0x00EE0086
+#define PATCOPY	0x00F00021
+#define PATPAINT	0x00FB0A09
+#define WHITENESS	0x00FF0062
+#define CAPTUREBLT	0x40000000
+#define NOMIRRORBITMAP	0x80000000
 #define R2_BLACK	1
 #define R2_COPYPEN	13
 #define R2_MASKNOTPEN	3