diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6a99fd451..4dc23f1df 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-14  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/rpcndr.h (boolean): Add typedef.
+	Thanks to:    James du Russel <ephelon at users dot sf dot net>
+	* include/rpcndr.h (_RPCNDR_H): Define.
+	Define in addition to __RPCNDR_H__, this is the w32api standard.
+
 2006-04-14  Chris Sutcliffe  <ir0nh34d@users.sf.net>
 
 	* include/w32api.h: Increment version to 3.7.
@@ -6,7 +13,7 @@
 2006-04-13  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
 	* include/winbase.h (GET_MODULE_HANDLE_EX_FLAG_*): Define.
-	Thanks to:	Brandon Sneed <brandon at redf dot net>
+	Thanks to:    Brandon Sneed <brandon at redf dot net>
 
 2006-04-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
@@ -34,7 +41,7 @@
 	* include/shlobj.h: Ditto.
 	* include/unknwn.h: Ditto.
 	* include/vfw.h: Ditto.
-	Thanks to:  Brandon Sneed <brandon at redf dot net>
+	Thanks to:    Brandon Sneed <brandon at redf dot net>
 
 2006-04-11  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
diff --git a/winsup/w32api/include/rpcndr.h b/winsup/w32api/include/rpcndr.h
index d1c4eec72..ca3acfb52 100644
--- a/winsup/w32api/include/rpcndr.h
+++ b/winsup/w32api/include/rpcndr.h
@@ -1,4 +1,5 @@
-#ifndef __RPCNDR_H__
+#ifndef _RPCNDR_H
+#define _RPCNDR_H
 #define __RPCNDR_H__
 #if __GNUC__ >=3
 #pragma GCC system_header
@@ -48,6 +49,7 @@ extern "C" {
 #endif
 #define small char
 typedef unsigned char byte;
+typedef unsigned char boolean;
 #define NDRSContextValue(hContext) (&(hContext)->userContext)
 #define cbNDRContext 20
 #define byte_from_ndr(source, target) { *(target) = *(*(char**)&(source)->Buffer)++; }