diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 9bebbe46c..440d75414 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* Makefile.common (CFLAGS_COMMON): Add temporary define to work around
+	w32api problem.
+
 2012-07-06  Corinna Vinschen  <corinna@vinschen.de>
 
 	* Makefile.common (ALL_CFLAGS): Change := to = to allow overriding in
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index 569b2a3fc..1917e3d21 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -1,6 +1,6 @@
 # Makefile.common - common definitions for the winsup directory
 #
-# Copyright 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
+# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2012 Red Hat, Inc.
 #
 # This file is part of Cygwin.
 #
@@ -10,7 +10,7 @@
 
 # This makefile requires GNU make.
 
-CFLAGS_COMMON:=-Wall -Wstrict-aliasing -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0# -finline-functions
+CFLAGS_COMMON:=-Wall -Wstrict-aliasing -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0 -D_SDKDDKVER_H
 MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/uberbaum/winsup/cygwin/dlmalloc
 MALLOC_OBJ:=#/cygnus/src/uberbaum/winsup/cygwin/dlmalloc/malloc.o
 
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 53743163e..81d0989d8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-30  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* winlean.h: Define constant which will be needed eventually.  Remove
+	hack in favor of another hack.
+	* lib/crt0.h: Use "winlean.h".
+
 2012-07-30  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
 	* winlean.h: Add temporary define.
diff --git a/winsup/cygwin/lib/crt0.h b/winsup/cygwin/lib/crt0.h
index 461ea9b2e..878db05ed 100644
--- a/winsup/cygwin/lib/crt0.h
+++ b/winsup/cygwin/lib/crt0.h
@@ -12,7 +12,7 @@ details. */
 extern "C" {
 #endif
 
-#include <windows.h>
+#include "winlean.h"
 struct per_process;
 typedef int (*MainFunc) (int argc, char *argv[], char **env);
 int __stdcall _cygwin_crt0_common (MainFunc, struct per_process *);
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h
index 8779711ce..aa092ee53 100644
--- a/winsup/cygwin/winlean.h
+++ b/winsup/cygwin/winlean.h
@@ -34,7 +34,8 @@ details. */
 #define _WINMM_
 #define WINIMPM
 #define WINSOCK_API_LINKAGE
-#define _SDKDDKVER_H	/* temporary until sdkddkver.h problems are worked out */
+#define NTDDI_VERSION 0x6020000	/* Probably should just be derived from our
+				   _WIN32_WINNT setting in winsup.h */
 
 /* Windows headers define a couple of annoyingly intrusive macros for the
    sole purpose of inline documentation.  Since they are defined without