diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 37292c00b..1104df0fc 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-29  David Robinow  <drobinow@yahoo.com>
+
+	* include/wingdi.h (SetPixelFormat): Correct prototype.
+
+2002-03-29  Phil Krylov  <likewolf@users.sourceforge.net>
+
+	* include/richedit.h (EM_SHOWSCROLLBAR): Add define.
+
 2002-03-26  Phil Krylov  <likewolf@users.sourceforge.net>
 
 	* include/richedit.h (EM_GETSCROLLPOS, EM_SETSCROLLPSPOS):
diff --git a/winsup/w32api/include/richedit.h b/winsup/w32api/include/richedit.h
index 2fcd464e5..f96991aa2 100644
--- a/winsup/w32api/include/richedit.h
+++ b/winsup/w32api/include/richedit.h
@@ -139,8 +139,9 @@ extern "C" {
 #define EM_GETUNDONAME	(WM_USER+86)
 #define EM_GETREDONAME	(WM_USER+87)
 #define EM_STOPGROUPTYPING	(WM_USER+88)
-#define EM_GETTEXTLENGTHEX	(WM_USER+95)
 #define EM_AUTOURLDETECT	(WM_USER+91)
+#define EM_GETTEXTLENGTHEX	(WM_USER+95)
+#define EM_SHOWSCROLLBAR	(WM_USER+96)
 #define EM_SETLANGOPTIONS	(WM_USER+120)
 #define EM_GETLANGOPTIONS	(WM_USER+121)
 #define EM_GETIMECOMPMODE	(WM_USER+122)
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 1a9b5c966..b0af5adeb 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -2659,7 +2659,7 @@ int WINAPI SetMetaRgn(HDC);
 BOOL WINAPI SetMiterLimit(HDC,FLOAT,PFLOAT);
 UINT WINAPI SetPaletteEntries(HPALETTE,UINT,UINT,const PALETTEENTRY*);
 COLORREF WINAPI SetPixel(HDC,int,int,COLORREF);
-BOOL WINAPI SetPixelFormat(HDC,int,PIXELFORMATDESCRIPTOR*);
+BOOL WINAPI SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*);
 BOOL WINAPI SetPixelV(HDC,int,int,COLORREF);
 int WINAPI SetPolyFillMode(HDC,int);
 BOOL WINAPI SetRectRgn(HRGN,int,int,int,int);