From 5cafa3aa1a57a1c1931b8df90ecb0aca91b1eb6d Mon Sep 17 00:00:00 2001
From: Danny Smith <dannysmith@users.sourceforge.net>
Date: Sun, 13 Oct 2002 03:11:58 +0000
Subject: [PATCH] 	* include/objbase.h: Include rpc.h and rpcndr.h 
 before header guard.

---
 winsup/w32api/ChangeLog         | 5 +++++
 winsup/w32api/include/objbase.h | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 28a668a03..58d91f630 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-13  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/objbase.h: Include rpc.h and rpcndr.h
+	before header guard.
+
 2002-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/olectl.h (PROPPAGEINFO): Change type of
diff --git a/winsup/w32api/include/objbase.h b/winsup/w32api/include/objbase.h
index a1b0e571d..0af2b2181 100644
--- a/winsup/w32api/include/objbase.h
+++ b/winsup/w32api/include/objbase.h
@@ -1,11 +1,14 @@
+/* Include here to prevent circular dependencies if windows.h
+   not already included */
+#include <rpc.h>
+#include <rpcndr.h>
+
 #ifndef _OBJBASE_H
 #define _OBJBASE_H
 #if __GNUC__ >=3
 #pragma GCC system_header
 #endif
 
-#include <rpc.h>
-#include <rpcndr.h>
 #include <stdlib.h>
 #pragma pack(push,8)
 #include <basetyps.h>