From aeec575e5a53c5a03edffc9a9e9760888b81992d Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 25 Jan 2014 20:24:12 +0000
Subject: [PATCH] [URLMON] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61819
---
 reactos/dll/win32/urlmon/umon.c        | 1 +
 reactos/dll/win32/urlmon/urlmon_main.c | 2 ++
 reactos/dll/win32/urlmon/urlmon_main.h | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/reactos/dll/win32/urlmon/umon.c b/reactos/dll/win32/urlmon/umon.c
index ffedf647334..132e97ede49 100644
--- a/reactos/dll/win32/urlmon/umon.c
+++ b/reactos/dll/win32/urlmon/umon.c
@@ -22,6 +22,7 @@
 
 #include "urlmon_main.h"
 
+#include <shellapi.h>
 #include <hlink.h>
 
 typedef struct {
diff --git a/reactos/dll/win32/urlmon/urlmon_main.c b/reactos/dll/win32/urlmon/urlmon_main.c
index 3610b635852..50167187dfb 100644
--- a/reactos/dll/win32/urlmon/urlmon_main.c
+++ b/reactos/dll/win32/urlmon/urlmon_main.c
@@ -20,6 +20,8 @@
 
 #include "urlmon_main.h"
 
+#include <ole2.h>
+
 #include <initguid.h>
 DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C);
 
diff --git a/reactos/dll/win32/urlmon/urlmon_main.h b/reactos/dll/win32/urlmon/urlmon_main.h
index 59bca7e9c0a..e93c80b1457 100644
--- a/reactos/dll/win32/urlmon/urlmon_main.h
+++ b/reactos/dll/win32/urlmon/urlmon_main.h
@@ -33,18 +33,18 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <ole2.h>
+#include <objbase.h>
+#include <oleauto.h>
 #include <urlmon.h>
 #include <wininet.h>
-#include <shellapi.h>
 #include <advpub.h>
 #define NO_SHLWAPI_REG
 #include <shlwapi.h>
 
+#include <wine/debug.h>
 #include <wine/list.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;