diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index b570e66db..dc863fb23 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-04  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/rpc.h: Add whitespace.
+	* include/winnt.h (C_ASSERT): Define.
+
+2006-10-04  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	[mingw-Bugs-1568067]
+	* include/winuser.h: (DISP_CHANGE_BADDUALVIEW): Define.
+	* include/wingdi.h: (DM_POSITION): Define.
+
 2006-10-03  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* lib/rpcrt4.def: Remove "_imp__"-prefixed export symbols.
@@ -26,6 +37,7 @@
 	TMT_SHADOWCOLOR, TMT_GLOWCOLOR, TMT_TEXTBORDERCOLOR,
 	TMT_TEXTSHADOWCOLOR, TMT_GLYPHTEXTCOLOR, TMT_GLYPHTRANSPARENTCOLOR,
 	TMT_FILLCOLORHINT, TMT_BORDERCOLORHINT, TMT_ACCENTCOLORHINT):
+
 	Increase each constant by 1.
 
 2006-09-07  Danny Smith  <dannysmith@users.sourceforge.net>
diff --git a/winsup/w32api/include/rpc.h b/winsup/w32api/include/rpc.h
index 3ca74e9cd..659d90948 100644
--- a/winsup/w32api/include/rpc.h
+++ b/winsup/w32api/include/rpc.h
@@ -4,7 +4,7 @@
 
 #ifndef _RPC_H
 #define _RPC_H
-#if __GNUC__ >=3
+#if __GNUC__ >= 3
 #pragma GCC system_header
 #endif
 
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 6a0a541e9..f50e69888 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -1166,6 +1166,7 @@ extern "C" {
 #define DM_PAPERLENGTH 0x00000004
 #define DM_PAPERWIDTH 0x00000008
 #define DM_SCALE 0x00000010
+#define DM_POSITION 0x00000020
 #define DM_COPIES 0x00000100
 #define DM_DEFAULTSOURCE 0x00000200
 #define DM_PRINTQUALITY 0x00000400
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 2f53a7733..7168a28ed 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -67,6 +67,9 @@ extern "C" {
 #endif
 #endif
 
+#ifndef C_ASSERT
+#define C_ASSERT(expr) typedef char __C_ASSERT__[(expr)?1:-1]
+#endif
 
 #ifndef VOID
 #define VOID void
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 983f69c65..e7c106b13 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -161,11 +161,12 @@ extern "C" {
 #define CDS_NORESET	0x10000000
 #define DISP_CHANGE_SUCCESSFUL	0
 #define DISP_CHANGE_RESTART	1
-#define DISP_CHANGE_BADFLAGS	(-4)
-#define DISP_CHANGE_BADPARAM	(-5)
 #define DISP_CHANGE_FAILED	(-1)
 #define DISP_CHANGE_BADMODE	(-2)
 #define DISP_CHANGE_NOTUPDATED	(-3)
+#define DISP_CHANGE_BADFLAGS	(-4)
+#define DISP_CHANGE_BADPARAM	(-5)
+#define DISP_CHANGE_BADDUALVIEW	(-6)
 #define BST_CHECKED	1
 #define BST_INDETERMINATE	2
 #define BST_UNCHECKED	0