From 7291616d83374229a1ada54e4711b3324526a710 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 22 Dec 2013 18:01:43 +0000
Subject: [PATCH] [OBJSEL] * Improve header inclusions. * Move some inclusions
 to the main header. * Set the default debugging channel globally through the
 main header. * Remove inclusions and definitions that already exist in the
 main header. CORE-7716

svn path=/trunk/; revision=61339
---
 reactos/dll/win32/objsel/factory.c        |  5 -----
 reactos/dll/win32/objsel/objsel.c         |  4 ----
 reactos/dll/win32/objsel/objsel_private.h | 24 ++++++++---------------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/reactos/dll/win32/objsel/factory.c b/reactos/dll/win32/objsel/factory.c
index 29db0c31224..af4e8cc3931 100644
--- a/reactos/dll/win32/objsel/factory.c
+++ b/reactos/dll/win32/objsel/factory.c
@@ -21,11 +21,6 @@
 
 #include "objsel_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);
-
-
 static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
 {
     return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface);
diff --git a/reactos/dll/win32/objsel/objsel.c b/reactos/dll/win32/objsel/objsel.c
index 3d065a29d89..15f2664b8ed 100644
--- a/reactos/dll/win32/objsel/objsel.c
+++ b/reactos/dll/win32/objsel/objsel.c
@@ -21,10 +21,6 @@
 #include "objsel_private.h"
 #include <rpcproxy.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);
-
 LONG dll_refs = 0;
 static HINSTANCE hInstance;
 
diff --git a/reactos/dll/win32/objsel/objsel_private.h b/reactos/dll/win32/objsel/objsel_private.h
index 615c9215639..845cd64b8e1 100644
--- a/reactos/dll/win32/objsel/objsel_private.h
+++ b/reactos/dll/win32/objsel/objsel_private.h
@@ -18,29 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-//#include <string.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-
 #define COBJMACROS
 
-#include <ole2.h>
-//#include "strmif.h"
-//#include "olectl.h"
-//#include "unknwn.h"
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
 #include <objsel.h>
-//#include "wine/unicode.h"
-//#include "uuids.h"
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(objsel);
 
 /**********************************************************************
  * Dll lifetime tracking declaration for objsel.dll