From da60fde74476b9b27760f4b62898334cb54a92a1 Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sourceforge.net>
Date: Tue, 4 Jun 2013 16:55:39 -0400
Subject: [PATCH] Header file dependencies required inclusions to be above the
 file guard.

---
 ChangeLog         |  3 +++
 include/objbase.h | 20 ++++++++++----------
 include/rpc.h     | 14 ++++++++------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe71f0f..7ad82cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@
 	* include/wchar.h (_wctime32): Create _CRTALIAS when MSVCRT_VERSION
 	< 800.
 	(_wfindfirst32, _wfindnext32): Create _CRTALIAS.
+	* include/objdump.h: Move include of rpc.h and rpcndr.h due to
+	dependencies.
+	* include/rpc.h: Move include of windows.h due to dependencies.
 
 2013-05-28  Earnie Boyd  <earnie@users.sourceforge.net>
 
diff --git a/include/objbase.h b/include/objbase.h
index 0d94117..6b89d48 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -8,11 +8,11 @@
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,16 +21,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+/* Include here to prevent circular dependencies if windows.h not already
+ * included. ** DO NOT MOVE TO GUARD ** */
+#include <rpc.h>
+#include <rpcndr.h>
+
 #ifndef _OBJBASE_H
 #define _OBJBASE_H
 #pragma GCC system_header
 #include <_mingw.h>
 
-/* Include here to prevent circular dependencies if windows.h
-   not already included */
-#include <rpc.h>
-#include <rpcndr.h>
-
 #include <stdlib.h>
 #pragma pack(push,8)
 #include <basetyps.h>
@@ -74,9 +74,9 @@
 #define COM_RIGHTS_SAFE_FOR_SCRIPTING 2
 #define STGOPTIONS_VERSION 2
 typedef enum tagSTGFMT {
-	STGFMT_STORAGE = 0, 
-	STGFMT_FILE = 3, 
-	STGFMT_ANY = 4, 
+	STGFMT_STORAGE = 0,
+	STGFMT_FILE = 3,
+	STGFMT_ANY = 4,
 	STGFMT_DOCFILE = 5
 } STGFMT;
 typedef struct tagSTGOPTIONS {
diff --git a/include/rpc.h b/include/rpc.h
index b963fdd..e7a5637 100644
--- a/include/rpc.h
+++ b/include/rpc.h
@@ -8,11 +8,11 @@
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,15 +21,17 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+/* Include here to prevent circular dependencies if windows.h not already
+ * included. ** DO NOT MOVE TO GUARD ** */
+#ifndef RPC_NO_WINDOWS_H
+#include <windows.h>
+#endif
+
 #ifndef _RPC_H
 #define _RPC_H
 #pragma GCC system_header
 #include <_mingw.h>
 
-#ifndef RPC_NO_WINDOWS_H
-#include <windows.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
2.11.0