diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 58d91f630..5fd4749d5 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-14  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/windows.h: Don't include basetyps.h.
+	* include/objfwd.h: Do include basetyps.h.
+
 2002-10-13  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/objbase.h: Include rpc.h and rpcndr.h
diff --git a/winsup/w32api/include/objfwd.h b/winsup/w32api/include/objfwd.h
index 17b8a8111..8fede73aa 100644
--- a/winsup/w32api/include/objfwd.h
+++ b/winsup/w32api/include/objfwd.h
@@ -4,6 +4,8 @@
 #pragma GCC system_header
 #endif
 
+#include <basetyps.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index b5dfc7b93..e7d00b423 100644
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -47,7 +47,6 @@
 #include <stdarg.h>
 #include <windef.h>
 #include <wincon.h>
-#include <basetyps.h>
 #include <winbase.h>
 #ifndef _WINGDI_H
 #include <wingdi.h>