From 7ecf0e3e1d9b122ebe6e9e30cb59dbc284fe971b Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 3 Sep 2003 00:14:12 +0000
Subject: [PATCH] shlobj.h must include wine/obj_dragdrophelper.h (reported by
 Martin Fuchs).

---
 dlls/shell32/dragdrophelper.c | 2 +-
 dlls/shell32/shellole.c       | 1 -
 include/shlobj.h              | 1 +
 libs/uuid/uuid.c              | 2 --
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c
index ad622905294..308f4879334 100644
--- a/dlls/shell32/dragdrophelper.c
+++ b/dlls/shell32/dragdrophelper.c
@@ -30,8 +30,8 @@
 #include "objbase.h"
 #include "ole2.h"
 #include "shlguid.h"
+#include "shlobj.h"
 
-#include "wine/obj_dragdrophelper.h"
 #include "wine/debug.h"
 #include "debughlp.h"
 
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index fe8f402aeed..8a14f4c199e 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -38,7 +38,6 @@
 #include "shlwapi.h"
 #include "winuser.h"
 #include "debughlp.h"
-#include "wine/obj_dragdrophelper.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/include/shlobj.h b/include/shlobj.h
index c01709cd070..52de06c7e3c 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -66,6 +66,7 @@ BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
 #include <wine/obj_extracticon.h>
 #include <wine/obj_commdlgbrowser.h>
 #include <wine/obj_dockingwindowframe.h>
+#include <wine/obj_dragdrophelper.h>
 
 /*****************************************************************************
  * Predeclare interfaces
diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c
index a6d89d153d6..86351e0f7dc 100644
--- a/libs/uuid/uuid.c
+++ b/libs/uuid/uuid.c
@@ -45,8 +45,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 #include "shlguid.h"
 #include "shlobj.h"
-#include "wine/obj_dragdrophelper.h"
-
 #include "comcat.h"
 #include "urlmon.h"